fix: remove blob from payload attributes

op-rs · Jan 7, 2025 · ce56781 · ce56781
1 parent 92757cb
commit ce56781
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 48 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -99,12 +99,12 @@ op-alloy-rpc-types-engine = { version = "0.9.0", default-features = false }
 lru = "0.12.5"
 spin = "0.9.8"
 rand = "0.8.5"
-clap = "4.5.23"
+clap = "4.5.24"
 tokio = "1.42.0"
 async-channel = "2.3.1"
 cfg-if = "1.0.0"
 reqwest = "0.12.12"
-async-trait = "0.1.84"
+async-trait = "0.1.85"
 linked_list_allocator = "0.10.5"
 
 # General
@@ -126,11 +126,11 @@ criterion = "0.5.1"
 # Serialization
 rkyv = "0.8.9"
 serde = { version = "1.0.217", default-features = false }
-serde_json = { version = "1.0.134", default-features = false }
+serde_json = { version = "1.0.135", default-features = false }
 
 # Ethereum
 unsigned-varint = "0.8.0"
 revm = { version = "16.0.0", default-features = false }
 
 # K/V database
-rocksdb = { version = "0.23.0", default-features = false }
+rocksdb = { version = "0.22.0", default-features = false }
diff --git a/crates/derive/src/attributes/stateful.rs b/crates/derive/src/attributes/stateful.rs
@@ -451,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),
@@ -499,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),
@@ -549,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),
@@ -598,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/mod.rs b/crates/executor/src/executor/mod.rs
@@ -566,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()]),
@@ -631,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),
@@ -703,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),
@@ -769,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),
@@ -844,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),
@@ -924,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,