Add onchain gas cost to trades and orders APIs

crates/autopilot/src/infra/persistence/mod.rs

@@ -799,6 +799,15 @@ impl Persistence {
             )
             .await?;
 
+            database::settlements::update_settlement_gas(
+                &mut ex,
+                block_number,
+                log_index,
+                u256_to_big_decimal(&gas.0),
+                u256_to_big_decimal(&gas_price.0.0),
+            )
+            .await?;
+
             store_order_events(
                 &mut ex,
                 fee_breakdown.keys().cloned().collect(),

crates/database/src/jit_orders.rs

@@ -48,6 +48,7 @@ pub async fn get_by_id(
         const QUERY: &str = const_format::concatcp!(
 "SELECT ",
 SELECT,
+crate::trades::ORDER_GAS_COST_COLUMN,
 " FROM ", FROM,
 " WHERE o.uid = $1 ",
         );
@@ -59,8 +60,14 @@ pub async fn get_many_by_uid<'a>(
     ex: &'a mut PgConnection,
     order_uids: &'a [OrderUid],
 ) -> Result<Vec<orders::FullOrder>, sqlx::Error> {
-    const QUERY: &str =
-        const_format::concatcp!("SELECT ", SELECT, " FROM ", FROM, " WHERE o.uid = ANY($1)");
+    const QUERY: &str = const_format::concatcp!(
+        "SELECT ",
+        SELECT,
+        crate::trades::ORDER_GAS_COST_COLUMN,
+        " FROM ",
+        FROM,
+        " WHERE o.uid = ANY($1)"
+    );
     sqlx::query_as(QUERY).bind(order_uids).fetch_all(ex).await
 }
 
@@ -73,6 +80,7 @@ pub async fn get_by_tx(
         orders::SETTLEMENT_LOG_INDICES,
         "SELECT ",
         SELECT,
+        crate::trades::ORDER_GAS_COST_COLUMN,
         " FROM ",
         FROM,
         " JOIN trades t ON t.order_uid = o.uid",

crates/database/src/order_history.rs

@@ -69,13 +69,13 @@ pub fn user_orders<'a>(
         ") ",
         // Phase 2: fetch full rows for the relevant UIDs only
         " (",
-        "  SELECT ", orders::SELECT,
+        "  SELECT ", orders::SELECT, crate::trades::ORDER_GAS_COST_COLUMN,
         "  FROM ", orders::FROM,
         "  WHERE o.uid IN (SELECT uid FROM page_uids)",
         " )",
         " UNION ALL",
         " (",
-        "  SELECT ", jit_orders::SELECT,
+        "  SELECT ", jit_orders::SELECT, crate::trades::ORDER_GAS_COST_COLUMN,
         "  FROM ", jit_orders::FROM,
         "  WHERE o.uid IN (SELECT uid FROM page_uids)",
         // despite already handling duplicates in phase 1 we need to handle

crates/database/src/orders.rs

@@ -526,6 +526,12 @@ pub struct FullOrder {
     pub executed_fee: BigDecimal,
     pub executed_fee_token: Address,
     pub full_app_data: Option<Vec<u8>>,
+    /// Total on-chain gas cost (native token wei) attributed to the order,
+    /// summed across its fills. Populated by the order-detail queries that
+    /// select it (see [`crate::trades::ORDER_GAS_COST`]); `None` for queries
+    /// that don't, such as the solvable-orders queries.
+    #[sqlx(default)]
+    pub gas_cost: Option<BigDecimal>,
 }
 
 impl FullOrder {
@@ -648,6 +654,7 @@ pub const FROM: &str = "orders o";
 const FULL_ORDER_WITH_QUOTE: &str = const_format::concatcp!(
     "SELECT ",
     SELECT,
+    crate::trades::ORDER_GAS_COST_COLUMN,
     ", o_quotes.sell_amount as quote_sell_amount",
     ", o_quotes.buy_amount as quote_buy_amount",
     ", o_quotes.gas_amount as quote_gas_amount",
@@ -713,10 +720,11 @@ pub fn full_orders_in_tx<'a>(
     ex: &'a mut PgConnection,
     tx_hash: &'a TransactionHash,
 ) -> BoxStream<'a, Result<FullOrder, sqlx::Error>> {
+    use crate::trades::ORDER_GAS_COST_COLUMN;
     const QUERY: &str = const_format::formatcp!(
         r#"
 {SETTLEMENT_LOG_INDICES}
-SELECT {SELECT}
+SELECT {SELECT}{ORDER_GAS_COST_COLUMN}
 FROM {FROM}
 JOIN trades t ON t.order_uid = o.uid
 WHERE

crates/database/src/settlements.rs

@@ -1,5 +1,6 @@
 use {
     crate::{Address, PgTransaction, TransactionHash},
+    bigdecimal::BigDecimal,
     sqlx::{Executor, PgConnection},
     tracing::instrument,
 };
@@ -89,6 +90,31 @@ WHERE block_number = $3 AND log_index = $4
         .map(|_| ())
 }
 
+/// Stores the actual gas cost (read from the transaction receipt) of a settled
+/// transaction. See migration `V115`.
+#[instrument(skip_all)]
+pub async fn update_settlement_gas(
+    ex: &mut PgConnection,
+    block_number: i64,
+    log_index: i64,
+    gas_used: BigDecimal,
+    effective_gas_price: BigDecimal,
+) -> Result<(), sqlx::Error> {
+    const QUERY: &str = r#"
+UPDATE settlements
+SET gas_used = $1, effective_gas_price = $2
+WHERE block_number = $3 AND log_index = $4
+    ;"#;
+    sqlx::query(QUERY)
+        .bind(gas_used)
+        .bind(effective_gas_price)
+        .bind(block_number)
+        .bind(log_index)
+        .execute(ex)
+        .await?;
+    Ok(())
+}
+
 /// Deletes all database data that referenced the deleted settlement events.
 #[instrument(skip_all)]
 pub async fn delete(