Merge branch 'main' into add-claude-github-actions-1754123263062

Author: tac0turtle

Cargo.lock

@@ -95,7 +95,6 @@ alloy-rpc-types-engine = { version = "1.0.23", default-features = false }
 alloy-signer-local = { version = "1.0.23", features = ["mnemonic"] }
 alloy-primitives = { version = "1.2.0", default-features = false }
 alloy-consensus = { version = "1.0.23", default-features = false }
-alloy-rlp = { version = "0.3", default-features = false }
 alloy-genesis = { version = "1.0.23", default-features = false }
 alloy-rpc-types-txpool = { version = "1.0.23", default-features = false }
 

Cargo.toml

@@ -29,7 +29,6 @@ alloy-rpc-types-engine.workspace = true
 alloy-primitives.workspace = true
 alloy-eips.workspace = true
 alloy-consensus.workspace = true
-alloy-rlp.workspace = true
 alloy-rpc-types-txpool.workspace = true
 
 # Core dependencies

crates/evolve/Cargo.toml

@@ -1,9 +1,8 @@
 use alloy_primitives::Bytes;
-use alloy_rlp::Encodable;
 use async_trait::async_trait;
 use jsonrpsee_core::RpcResult;
 use jsonrpsee_proc_macros::rpc;
-use reth_transaction_pool::{TransactionPool, ValidPoolTransaction};
+use reth_transaction_pool::{PoolTransaction, TransactionPool};
 
 /// Rollkit txpool RPC API trait
 #[rpc(server, namespace = "txpoolExt")]
@@ -48,31 +47,30 @@ where
     /// Returns a Geth-style `TxpoolContent` with raw RLP hex strings.
     async fn get_txs(&self) -> RpcResult<Vec<Bytes>> {
         //------------------------------------------------------------------//
-        // 1. Iterate pending txs and stop once we hit the byte cap         //
+        // 1. Iterate best txs (sorted by priority) and stop once we hit    //
+        //    the byte cap                                                   //
         //------------------------------------------------------------------//
         let mut total = 0u64;
-        let mut pending_map: Vec<Bytes> = Vec::new();
+        let mut selected_txs: Vec<Bytes> = Vec::new();
 
-        for arc_tx in self.pool.pending_transactions() {
-            // deref Arc<ValidPoolTransaction<_>>
-            let pooled: &ValidPoolTransaction<_> = &arc_tx;
-
-            let sz = pooled.encoded_length() as u64;
+        // Use best_transactions() which returns an iterator of transactions
+        // ordered by their priority (gas price/priority fee)
+        for best_tx in self.pool.best_transactions() {
+            let sz = best_tx.encoded_length() as u64;
             if total + sz > self.max_bytes {
                 break;
             }
 
-            // inside the loop
-            let tx = pooled.to_consensus();
-            let mut rlp_bytes = Vec::new();
-            tx.encode(&mut rlp_bytes);
+            // Convert to consensus transaction and encode to RLP
+            let tx = best_tx.transaction.clone().into_consensus_with2718();
+            let bz = tx.encoded_bytes();
 
-            pending_map.push(Bytes::from(rlp_bytes));
+            selected_txs.push(bz.clone());
 
             total += sz;
         }
 
-        Ok(pending_map)
+        Ok(selected_txs)
     }
 }
 

crates/evolve/src/rpc/txpool.rs

@@ -48,7 +48,6 @@ alloy-rpc-types-engine.workspace = true
 alloy-primitives.workspace = true
 alloy-eips.workspace = true
 alloy-consensus.workspace = true
-alloy-rlp.workspace = true
 
 # Core dependencies
 eyre.workspace = true

crates/node/Cargo.toml

@@ -48,7 +48,6 @@ alloy-rpc-types-engine.workspace = true
 alloy-primitives.workspace = true
 alloy-eips.workspace = true
 alloy-consensus.workspace = true
-alloy-rlp.workspace = true
 
 # Core dependencies
 tempfile.workspace = true

crates/tests/Cargo.toml

@@ -8,8 +8,8 @@
 
 use crate::common;
 
+use alloy_eips::eip2718::Encodable2718;
 use alloy_primitives::{Address, Bytes, B256};
-use alloy_rlp::Encodable;
 use alloy_rpc_types::engine::{ForkchoiceState, PayloadId};
 use eyre::Result;
 use reth_primitives::TransactionSigned;
@@ -190,7 +190,7 @@ impl EngineApiTestNode {
 /// Encodes a transaction to bytes for Engine API
 fn encode_transaction(tx: &TransactionSigned) -> Result<Bytes> {
     let mut buf = Vec::new();
-    tx.encode(&mut buf);
+    tx.encode_2718(&mut buf);
     Ok(Bytes::from(buf))
 }