chore: Bump Dependencies (#880)

op-rs · Jan 7, 2025 · 992b1a1 · 992b1a1
1 parent 0c61750
commit 992b1a1
Show file tree

Hide file tree

Showing 10 changed files with 297 additions and 343 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -73,45 +73,45 @@ kona-preimage = { path = "crates/proof-sdk/preimage", version = "0.2.0", default
 kona-std-fpvm-proc = { path = "crates/proof-sdk/std-fpvm-proc", version = "0.1.1", default-features = false }
 
 # Alloy
-alloy-rlp = { version = "0.3.9", default-features = false }
-alloy-trie = { version = "0.7.4", default-features = false }
-alloy-eips = { version = "0.8.0", default-features = false }
-alloy-serde = { version = "0.8.0", default-features = false }
-alloy-provider = { version = "0.8.0", default-features = false }
-alloy-consensus = { version = "0.8.0", default-features = false }
-alloy-transport = { version = "0.8.0", default-features = false }
-alloy-rpc-types = { version = "0.8.0", default-features = false }
-alloy-rpc-client = { version = "0.8.0", default-features = false }
+alloy-rlp = { version = "0.3.10", default-features = false }
+alloy-trie = { version = "0.7.8", default-features = false }
+alloy-eips = { version = "0.9.2", default-features = false }
+alloy-serde = { version = "0.9.2", default-features = false }
+alloy-provider = { version = "0.9.2", default-features = false }
+alloy-consensus = { version = "0.9.2", default-features = false }
+alloy-transport = { version = "0.9.2", default-features = false }
+alloy-rpc-types = { version = "0.9.2", default-features = false }
+alloy-rpc-client = { version = "0.9.2", default-features = false }
 alloy-primitives = { version = "0.8.14", default-features = false }
-alloy-node-bindings = { version = "0.8.0", default-features = false }
-alloy-transport-http = { version = "0.8.0", default-features = false }
-alloy-rpc-types-engine = { version = "0.8.0", default-features = false }
-alloy-rpc-types-beacon = { version = "0.8.0", default-features = false }
+alloy-node-bindings = { version = "0.9.2", default-features = false }
+alloy-transport-http = { version = "0.9.2", default-features = false }
+alloy-rpc-types-engine = { version = "0.9.2", default-features = false }
+alloy-rpc-types-beacon = { version = "0.9.2", default-features = false }
 
 # OP Alloy
-op-alloy-genesis = { version = "0.8.2", default-features = false }
-op-alloy-registry = { version = "0.8.2", default-features = false }
-op-alloy-protocol = { version = "0.8.2", default-features = false }
-op-alloy-consensus = { version = "0.8.2", default-features = false }
-op-alloy-rpc-types-engine = { version = "0.8.2", default-features = false }
+op-alloy-genesis = { version = "0.9.1", default-features = false }
+op-alloy-registry = { version = "0.9.1", default-features = false }
+op-alloy-protocol = { version = "0.9.1", default-features = false }
+op-alloy-consensus = { version = "0.9.1", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.9.1", default-features = false }
 
 # General
-lru = "0.12.4"
+lru = "0.12.5"
 spin = "0.9.8"
 rand = "0.8.5"
-clap = "4.5.19"
+clap = "4.5.24"
 tokio = "1.42.0"
 async-channel = "2.3.1"
 cfg-if = "1.0.0"
-reqwest = "0.12.9"
-async-trait = "0.1.83"
+reqwest = "0.12.12"
+async-trait = "0.1.85"
 linked_list_allocator = "0.10.5"
 
 # General
 sha2 = { version = "0.10.8", default-features = false }
 c-kzg = { version = "2.0.0", default-features = false }
-anyhow = { version = "1.0.93", default-features = false }
-thiserror = { version = "2.0.4", default-features = false }
+anyhow = { version = "1.0.95", default-features = false }
+thiserror = { version = "2.0.9", default-features = false }
 
 # Tracing
 tracing-loki = "0.2.5"
@@ -120,13 +120,13 @@ tracing = { version = "0.1.41", default-features = false }
 
 # Testing
 pprof = "0.14.0"
-proptest = "1.5.0"
+proptest = "1.6.0"
 criterion = "0.5.1"
 
 # Serialization
 rkyv = "0.8.9"
-serde = { version = "1.0.215", default-features = false }
-serde_json = { version = "1.0.133", default-features = false }
+serde = { version = "1.0.217", default-features = false }
+serde_json = { version = "1.0.135", default-features = false }
 
 # Ethereum
 unsigned-varint = "0.8.0"

diff --git a/crates/derive/src/attributes/stateful.rs b/crates/derive/src/attributes/stateful.rs
@@ -179,8 +179,6 @@ where
                 suggested_fee_recipient: SEQUENCER_FEE_VAULT_ADDRESS,
                 parent_beacon_block_root: parent_beacon_root,
                 withdrawals,
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             transactions: Some(txs),
             no_tx_pool: Some(true),
@@ -453,8 +451,6 @@ mod tests {
                 suggested_fee_recipient: SEQUENCER_FEE_VAULT_ADDRESS,
                 parent_beacon_block_root: None,
                 withdrawals: None,
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             transactions: payload.transactions.clone(),
             no_tx_pool: Some(true),
@@ -501,8 +497,6 @@ mod tests {
                 suggested_fee_recipient: SEQUENCER_FEE_VAULT_ADDRESS,
                 parent_beacon_block_root: None,
                 withdrawals: Some(Vec::default()),
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             transactions: payload.transactions.clone(),
             no_tx_pool: Some(true),
@@ -551,8 +545,6 @@ mod tests {
                 suggested_fee_recipient: SEQUENCER_FEE_VAULT_ADDRESS,
                 parent_beacon_block_root,
                 withdrawals: Some(vec![]),
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             transactions: payload.transactions.clone(),
             no_tx_pool: Some(true),
@@ -600,8 +592,6 @@ mod tests {
                 suggested_fee_recipient: SEQUENCER_FEE_VAULT_ADDRESS,
                 parent_beacon_block_root: Some(B256::ZERO),
                 withdrawals: Some(vec![]),
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             transactions: payload.transactions.clone(),
             no_tx_pool: Some(true),

diff --git a/crates/derive/src/pipeline/core.rs b/crates/derive/src/pipeline/core.rs
@@ -204,8 +204,6 @@ mod tests {
                     suggested_fee_recipient: Default::default(),
                     withdrawals: None,
                     parent_beacon_block_root: None,
-                    target_blobs_per_block: None,
-                    max_blobs_per_block: None,
                 },
                 transactions: None,
                 no_tx_pool: None,

diff --git a/crates/derive/src/stages/attributes_queue.rs b/crates/derive/src/stages/attributes_queue.rs
@@ -212,8 +212,6 @@ mod tests {
                 prev_randao: B256::default(),
                 withdrawals: None,
                 parent_beacon_block_root: None,
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             no_tx_pool: Some(false),
             transactions: None,

diff --git a/crates/executor/benches/execution.rs b/crates/executor/benches/execution.rs
@@ -129,8 +129,6 @@ fn execution(c: &mut Criterion) {
                 parent_beacon_block_root: Some(b256!(
                     "a4414c4984ce7285b82bd9b21c642af30f0f648fb6f4929b67753e7345a06bab"
                 )),
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             gas_limit: Some(30_000_000),
             transactions: Some(raw_txs),
@@ -173,8 +171,6 @@ fn execution(c: &mut Criterion) {
                 parent_beacon_block_root: Some(b256!(
                     "8ab0d68c0fc4fe40d31baf01bcf73de45ddf15ab58e66738ca6c60648676f9af"
                 )),
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             gas_limit: Some(30_000_000),
             transactions: Some(raw_txs),

diff --git a/crates/executor/src/executor/env.rs b/crates/executor/src/executor/env.rs
@@ -3,7 +3,7 @@
 use super::{util::decode_holocene_eip_1559_params, StatelessL2BlockExecutor};
 use crate::{constants::FEE_RECIPIENT, ExecutorError, ExecutorResult, TrieDBProvider};
 use alloy_consensus::Header;
-use alloy_eips::eip1559::BaseFeeParams;
+use alloy_eips::{eip1559::BaseFeeParams, eip7840::BlobParams};
 use alloy_primitives::{TxKind, U256};
 use kona_mpt::TrieHinter;
 use op_alloy_consensus::OpTxEnvelope;
@@ -71,7 +71,7 @@ where
         base_fee_params: &BaseFeeParams,
     ) -> ExecutorResult<BlockEnv> {
         let blob_excess_gas_and_price = parent_header
-            .next_block_excess_blob_gas()
+            .next_block_excess_blob_gas(BlobParams::cancun())
             .or_else(|| spec_id.is_enabled_in(SpecId::ECOTONE).then_some(0))
             .map(BlobExcessGasAndPrice::new);
         let next_block_base_fee =

diff --git a/crates/executor/src/executor/mod.rs b/crates/executor/src/executor/mod.rs
@@ -219,7 +219,7 @@ where
             // Create receipt envelope.
             let receipt = OpReceiptEnvelope::<Log>::from_parts(
                 result.is_success(),
-                cumulative_gas_used as u128,
+                cumulative_gas_used,
                 result.logs(),
                 transaction.tx_type(),
                 depositor
@@ -344,7 +344,6 @@ where
             excess_blob_gas: excess_blob_gas.and_then(|x| x.try_into().ok()),
             parent_beacon_block_root: payload.payload_attributes.parent_beacon_block_root,
             extra_data: encoded_base_fee_params,
-            target_blobs_per_block: None,
         }
         .seal_slow();
 
@@ -567,8 +566,6 @@ mod test {
                     "edba75784acf3165bffd96df8b78ffdb3781db91f886f22b4bee0a6f722df939"
                 ),
                 suggested_fee_recipient: FEE_RECIPIENT,
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             gas_limit: Some(0x1c9c380),
             transactions: Some(alloc::vec![raw_tx.into()]),
@@ -632,8 +629,6 @@ mod test {
                 parent_beacon_block_root: Some(b256!(
                     "5e7da14ac6b18e62306c84d9d555387d4b4a6c3d122df22a2af2b68bf219860d"
                 )),
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             gas_limit: Some(30000000),
             transactions: Some(raw_txs),
@@ -704,8 +699,6 @@ mod test {
                 parent_beacon_block_root: Some(b256!(
                     "50f4a35e2f059621cba649e719d23a2a9d030189fd19172a689c76d3adf39fec"
                 )),
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             gas_limit: Some(0x1c9c380),
             transactions: Some(raw_txs),
@@ -770,8 +763,6 @@ mod test {
                 parent_beacon_block_root: Some(b256!(
                     "fa918fbee01a47f475d70995e78b4505bd8714962012720cab27f7e66ec4ea5b"
                 )),
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             gas_limit: Some(30_000_000),
             transactions: Some(raw_txs),
@@ -845,8 +836,6 @@ mod test {
                 parent_beacon_block_root: Some(b256!(
                     "a4414c4984ce7285b82bd9b21c642af30f0f648fb6f4929b67753e7345a06bab"
                 )),
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             gas_limit: Some(30_000_000),
             transactions: Some(raw_txs),
@@ -925,8 +914,6 @@ mod test {
                 parent_beacon_block_root: Some(b256!(
                     "8ab0d68c0fc4fe40d31baf01bcf73de45ddf15ab58e66738ca6c60648676f9af"
                 )),
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             gas_limit: Some(30_000_000),
             transactions: Some(raw_txs),

diff --git a/crates/executor/src/executor/util.rs b/crates/executor/src/executor/util.rs
@@ -101,8 +101,6 @@ mod test {
                 suggested_fee_recipient: Default::default(),
                 withdrawals: Default::default(),
                 parent_beacon_block_root: Default::default(),
-                target_blobs_per_block: None,
-                max_blobs_per_block: None,
             },
             transactions: None,
             no_tx_pool: None,

diff --git a/crates/mpt/src/node.rs b/crates/mpt/src/node.rs
@@ -375,13 +375,13 @@ impl TrieNode {
             Self::Leaf { prefix, value } => {
                 // Encode the leaf node's header and key-value pair.
                 Header { list: true, payload_length }.encode(out);
-                prefix.encode_path_leaf(true).as_slice().encode(out);
+                alloy_trie::nodes::encode_path_leaf(prefix, true).as_slice().encode(out);
                 value.encode(out);
             }
             Self::Extension { prefix, node } => {
                 // Encode the extension node's header, prefix, and pointer node.
                 Header { list: true, payload_length }.encode(out);
-                prefix.encode_path_leaf(false).as_slice().encode(out);
+                alloy_trie::nodes::encode_path_leaf(prefix, false).as_slice().encode(out);
                 node.blind();
                 node.encode_in_place(out);
             }
@@ -578,13 +578,13 @@ impl Encodable for TrieNode {
             Self::Leaf { prefix, value } => {
                 // Encode the leaf node's header and key-value pair.
                 Header { list: true, payload_length: self.payload_length() }.encode(out);
-                prefix.encode_path_leaf(true).as_slice().encode(out);
+                alloy_trie::nodes::encode_path_leaf(prefix, true).as_slice().encode(out);
                 value.encode(out);
             }
             Self::Extension { prefix, node } => {
                 // Encode the extension node's header, prefix, and pointer node.
                 Header { list: true, payload_length: self.payload_length() }.encode(out);
-                prefix.encode_path_leaf(false).as_slice().encode(out);
+                alloy_trie::nodes::encode_path_leaf(prefix, false).as_slice().encode(out);
                 let mut blinded = node.clone();
                 blinded.blind();
                 blinded.encode(out);