Remove auction_transaction

crates/autopilot/src/database.rs

@@ -6,7 +6,6 @@ use {
 
 mod auction;
 pub mod auction_prices;
-pub mod auction_transaction;
 pub mod competition;
 pub mod ethflow_events;
 mod events;

crates/autopilot/src/database/on_settlement_event_updater.rs

@@ -1,7 +1,7 @@
 use {
     anyhow::{Context, Result},
     database::{byte_array::ByteArray, settlement_observations::Observation},
-    ethcontract::{H160, U256},
+    ethcontract::U256,
     model::order::OrderUid,
     number::conversions::u256_to_big_decimal,
     sqlx::PgConnection,
@@ -13,20 +13,19 @@ pub type AuctionId = i64;
 
 #[derive(Debug, Default, Clone)]
 pub struct AuctionData {
-    pub auction_id: AuctionId,
     pub gas_used: U256,
     pub effective_gas_price: U256,
     pub surplus: U256,
     pub fee: U256,
     pub order_executions: Vec<(OrderUid, ExecutedFee)>,
 }
 
-#[derive(Debug, Default, Clone)]
+#[derive(Debug, Clone)]
 pub struct SettlementUpdate {
     pub block_number: i64,
     pub log_index: i64,
-    pub tx_from: H160,
-    pub tx_nonce: i64,
+    pub auction_id: AuctionId,
+    /// Only set if the auction is for this environment.
     pub auction_data: Option<AuctionData>,
 }
 
@@ -41,31 +40,16 @@ impl super::Postgres {
             .start_timer();
 
         // update settlements
-        database::auction_transaction::insert_settlement_tx_info(
+        database::settlements::update_settlement_auction(
             ex,
             settlement_update.block_number,
             settlement_update.log_index,
-            &ByteArray(settlement_update.tx_from.0),
-            settlement_update.tx_nonce,
+            settlement_update.auction_id,
         )
         .await
         .context("insert_settlement_tx_info")?;
 
         if let Some(auction_data) = settlement_update.auction_data {
-            // Link the `auction_id` to the settlement tx. This is needed for
-            // colocated solutions and is a no-op for centralized
-            // solutions.
-            let insert_succesful = database::auction_transaction::try_insert_auction_transaction(
-                ex,
-                auction_data.auction_id,
-                &ByteArray(settlement_update.tx_from.0),
-                settlement_update.tx_nonce,
-            )
-            .await
-            .context("failed to insert auction_transaction")?;
-
-            // in case of deep reindexing we might already have the observation, so just
-            // overwrite it
             database::settlement_observations::upsert(
                 ex,
                 Observation {
@@ -80,17 +64,15 @@ impl super::Postgres {
             .await
             .context("insert_settlement_observations")?;
 
-            if insert_succesful {
-                for (order, executed_fee) in auction_data.order_executions {
-                    database::order_execution::save(
-                        ex,
-                        &ByteArray(order.0),
-                        auction_data.auction_id,
-                        &u256_to_big_decimal(&executed_fee),
-                    )
-                    .await
-                    .context("save_order_executions")?;
-                }
+            for (order, executed_fee) in auction_data.order_executions {
+                database::order_execution::save(
+                    ex,
+                    &ByteArray(order.0),
+                    settlement_update.auction_id,
+                    &u256_to_big_decimal(&executed_fee),
+                )
+                .await
+                .context("save_order_executions")?;
             }
         }
         Ok(())