slashing updates

marlinprotocol · Nov 1, 2024 · d20a69a · d20a69a
1 parent 9e64219
commit d20a69a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/matching_engine/src/generator_lib/generator_store.rs b/matching_engine/src/generator_lib/generator_store.rs
@@ -79,6 +79,7 @@ pub struct GeneratorStore {
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd)]
 pub struct SlashingRecord {
     pub ask_id: U256,
+    pub slashing_timestamp: U64,
     pub market_id: U256,
     pub slashing_tx: String,
     pub price_offered: U256,
@@ -482,6 +483,7 @@ impl GeneratorStore {
         slashing_tx: String,
         price_offered: &U256,
         deadline: &U256,
+        slashing_timestamp: &U64,
     ) {
         if let Some(generator_market) = self
             .generator_markets
@@ -521,6 +523,7 @@ impl GeneratorStore {
                 price_offered: price_offered.clone(),
                 expected_time: deadline.clone(),
                 slashing_penalty: (token_address.clone(), slashing.clone()),
+                slashing_timestamp: slashing_timestamp.clone(),
             });
     }
 

diff --git a/matching_engine/src/log_processor/pm.rs b/matching_engine/src/log_processor/pm.rs
@@ -440,6 +440,7 @@ pub async fn process_proof_market_place_logs(
                     tx_to_string(&log.transaction_hash.unwrap()),
                     &ask.reward,
                     &ask.deadline,
+                    &log.block_number.unwrap_or_default(),
                 );
             }
         }

diff --git a/matching_engine/src/routes/ui_routes/single_generator.rs b/matching_engine/src/routes/ui_routes/single_generator.rs
@@ -116,7 +116,6 @@ struct Slash {
     market: MarketInfo,
     request: String, // Transaction Hash
     price_offered: String,
-    expected_time: String,
     slashing_penalty: TokenAmount,
 }
 
@@ -432,7 +431,7 @@ async fn recompute_single_generator_response<'a>(
             .get_slashing_records(&generator_id)
             .into_iter()
             .map(|record| Slash {
-                timestamp: record.expected_time.to_string(),
+                timestamp: record.slashing_timestamp.to_string(),
                 market: MarketInfo {
                     name: None,
                     id: record.market_id.to_string(),
@@ -443,7 +442,6 @@ async fn recompute_single_generator_response<'a>(
                 },
                 request: record.slashing_tx,
                 price_offered: record.price_offered.to_string(),
-                expected_time: record.expected_time.to_string(),
                 slashing_penalty: address_token_pair_to_token_amount(record.slashing_penalty),
             })
             .collect(),