spike

Author: wlawt

crates/bundle-pool/src/lib.rs

@@ -8,7 +8,7 @@ use tracing::error;
 
 pub use pool::{BundleStore, InMemoryBundlePool};
 pub use source::KafkaBundleSource;
-pub use tips_core::{Bundle, BundleHash, BundleWithMetadata, CancelBundle};
+pub use tips_core::{Bundle, BundleWithMetadata, CancelBundle};
 
 pub fn connect_sources_to_pool<S, P>(
     sources: Vec<S>,

crates/core/src/lib.rs

@@ -6,5 +6,6 @@ pub mod types;
 pub mod test_utils;
 
 pub use types::{
-    BLOCK_TIME, Bundle, BundleHash, BundleWithMetadata, CancelBundle, MeterBundleResponse,
+    BLOCK_TIME, Bundle, BundleHash, BundleProperties, BundleWithMetadata, CancelBundle,
+    MeterBundleResponse,
 };

crates/core/src/types.rs

@@ -10,6 +10,10 @@ use uuid::Uuid;
 /// Block time in microseconds
 pub const BLOCK_TIME: u128 = 2_000_000;
 
+pub trait BundleProperties {
+    fn bundle_hash(&self) -> B256;
+}
+
 #[derive(Default, Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 pub struct Bundle {
@@ -56,6 +60,26 @@ pub struct Bundle {
     pub dropping_tx_hashes: Vec<TxHash>,
 }
 
+impl BundleProperties for Bundle {
+    fn bundle_hash(&self) -> B256 {
+        let transactions: Vec<OpTxEnvelope> = self
+            .txs
+            .iter()
+            .map(|b| {
+                OpTxEnvelope::decode_2718_exact(b)
+                    .map_err(|e| format!("failed to decode transaction: {e}"))
+            })
+            .collect::<Result<Vec<_>, _>>()
+            .expect("failed to decode transactions");
+
+        let mut concatenated = Vec::new();
+        for tx in transactions {
+            concatenated.extend_from_slice(tx.tx_hash().as_slice());
+        }
+        keccak256(&concatenated)
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct BundleHash {
@@ -115,14 +139,6 @@ impl BundleWithMetadata {
         &self.uuid
     }
 
-    pub fn bundle_hash(&self) -> B256 {
-        let mut concatenated = Vec::new();
-        for tx in self.transactions() {
-            concatenated.extend_from_slice(tx.tx_hash().as_slice());
-        }
-        keccak256(&concatenated)
-    }
-
     pub fn txn_hashes(&self) -> Vec<TxHash> {
         self.transactions().iter().map(|t| t.tx_hash()).collect()
     }
@@ -150,6 +166,12 @@ impl BundleWithMetadata {
     }
 }
 
+impl BundleProperties for BundleWithMetadata {
+    fn bundle_hash(&self) -> B256 {
+        self.bundle.bundle_hash()
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct TransactionResult {

crates/ingress-rpc/src/queue.rs

@@ -75,7 +75,9 @@ impl QueuePublisher for KafkaQueuePublisher {
 mod tests {
     use super::*;
     use rdkafka::config::ClientConfig;
-    use tips_core::{Bundle, BundleWithMetadata, test_utils::create_test_meter_bundle_response};
+    use tips_core::{
+        Bundle, BundleProperties, BundleWithMetadata, test_utils::create_test_meter_bundle_response,
+    };
     use tokio::time::{Duration, Instant};
 
     fn create_test_bundle() -> Bundle {

crates/ingress-rpc/src/service.rs

@@ -12,7 +12,8 @@ use reth_rpc_eth_types::EthApiError;
 use std::time::{SystemTime, UNIX_EPOCH};
 use tips_audit::{BundleEvent, BundleEventPublisher};
 use tips_core::{
-    BLOCK_TIME, Bundle, BundleHash, BundleWithMetadata, CancelBundle, MeterBundleResponse,
+    BLOCK_TIME, Bundle, BundleHash, BundleProperties, BundleWithMetadata, CancelBundle,
+    MeterBundleResponse,
 };
 use tracing::{info, warn};