Chore/more quote instrument (#471)

Author: danimhr

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "auction-server"
-version = "0.21.1"
+version = "0.22.0"
 edition = "2021"
 license-file = "license.txt"
 

auction-server/Cargo.toml

@@ -66,6 +66,7 @@ pub trait BidStatus:
     fn is_pending(&self) -> bool;
     fn is_awaiting_signature(&self) -> bool;
     fn is_submitted(&self) -> bool;
+    fn is_cancelled(&self) -> bool;
     fn is_finalized(&self) -> bool;
 
     fn new_lost() -> Self;
@@ -137,6 +138,10 @@ impl BidStatus for BidStatusSvm {
         matches!(self, BidStatusSvm::Submitted { .. })
     }
 
+    fn is_cancelled(&self) -> bool {
+        matches!(self, BidStatusSvm::Cancelled { .. })
+    }
+
     fn is_finalized(&self) -> bool {
         matches!(
             self,
@@ -181,6 +186,10 @@ impl BidStatus for BidStatusEvm {
         matches!(self, BidStatusEvm::Submitted { .. })
     }
 
+    fn is_cancelled(&self) -> bool {
+        false
+    }
+
     fn is_finalized(&self) -> bool {
         matches!(self, BidStatusEvm::Lost { .. } | BidStatusEvm::Won { .. })
     }

auction-server/src/auction/entities/bid.rs

@@ -7,6 +7,7 @@ use {
 };
 
 impl<T: ChainTrait> Repository<T> {
+    #[tracing::instrument(skip_all)]
     pub async fn get_or_create_in_memory_bid_lock(
         &self,
         key: entities::BidId,

auction-server/src/auction/repository/get_or_create_in_memory_bid_lock.rs

@@ -58,7 +58,7 @@ impl Service<Svm> {
         }
     }
 
-    #[tracing::instrument(skip_all, err)]
+    #[tracing::instrument(skip_all, err, fields(bid_id = %input.bid_id))]
     pub async fn cancel_bid(&self, input: CancelBidInput) -> Result<(), RestError> {
         // Lock the bid to prevent submission
         let bid_lock = self

auction-server/src/auction/service/cancel_bid.rs

@@ -23,7 +23,7 @@ where
 {
     #[tracing::instrument(
         skip_all,
-        fields(bid_id, profile_name, simulation_error, permission_key),
+        fields(bid_id, profile_name, permission_key, opportunity_id),
         err
     )]
     pub async fn handle_bid(
@@ -33,17 +33,11 @@ where
         if let Some(profile) = &input.bid_create.profile {
             tracing::Span::current().record("profile_name", &profile.name);
         }
-        let verification = self
+        let (chain_data, amount) = self
             .verify_bid(VerifyBidInput {
                 bid_create: input.bid_create.clone(),
             })
-            .await;
-        if let Err(RestError::SimulationError { result: _, reason }) = &verification {
-            // Long values are truncated and the errors are at the end of the simulation logs
-            let error = reason.split('\n').rev().collect::<Vec<_>>().join("\n");
-            tracing::Span::current().record("simulation_error", error);
-        }
-        let (chain_data, amount) = verification?;
+            .await?;
         let bid = self
             .repo
             .add_bid(input.bid_create, &chain_data, &amount)

auction-server/src/auction/service/handle_bid.rs

@@ -41,11 +41,15 @@ impl Service<Svm> {
         let winner_bid = auction
             .bids
             .iter()
-            .find(|bid| bid.status.is_awaiting_signature() || bid.status.is_submitted())
+            .find(|bid| bid.status.is_awaiting_signature() || bid.status.is_submitted() || bid.status.is_cancelled())
             .cloned()
             .ok_or(RestError::BadParameters("This quote has already been submitted and finalized on-chain. No further changes are allowed.".to_string()))?;
 
-        if winner_bid.status.is_submitted() {
+        if winner_bid.status.is_cancelled() {
+            Err(RestError::BadParameters(
+                "This quote has already been cancelled.".to_string(),
+            ))
+        } else if winner_bid.status.is_submitted() {
             Err(RestError::BadParameters(
                 "Quote is already submitted on-chain.".to_string(),
             ))
@@ -54,6 +58,7 @@ impl Service<Svm> {
         }
     }
 
+    #[tracing::instrument(skip_all, err)]
     async fn submit_auction_bid_for_lock(
         &self,
         bid: entities::Bid<Svm>,
@@ -92,14 +97,15 @@ impl Service<Svm> {
         Ok(())
     }
 
-    #[tracing::instrument(skip_all, err)]
+    #[tracing::instrument(skip_all, err, fields(bid_id, auction_id = %input.auction_id))]
     pub async fn submit_quote(
         &self,
         input: SubmitQuoteInput,
     ) -> Result<VersionedTransaction, RestError> {
         let (auction, winner_bid) = self.get_bid_to_submit(input.auction_id).await?;
 
         let mut bid = winner_bid.clone();
+        tracing::Span::current().record("bid_id", bid.id.to_string());
         let (_, swap_instruction) = self
             .extract_express_relay_instruction(
                 bid.chain_data.transaction.clone(),

auction-server/src/auction/service/submit_quote.rs

@@ -1504,6 +1504,7 @@ impl Service<Svm> {
         Ok(())
     }
 
+    #[tracing::instrument(skip_all, err)]
     async fn verify_signatures(
         &self,
         bid: &entities::BidCreate<Svm>,
@@ -1557,6 +1558,7 @@ impl Service<Svm> {
         }
     }
 
+    #[tracing::instrument(skip_all, err)]
     pub async fn simulate_swap_bid(
         &self,
         bid: &entities::BidCreate<Svm>,
@@ -1601,6 +1603,7 @@ impl Service<Svm> {
         }
     }
 
+    #[tracing::instrument(skip_all, err)]
     pub async fn simulate_bid(&self, bid: &entities::BidCreate<Svm>) -> Result<(), RestError> {
         const RETRY_LIMIT: usize = 5;
         const RETRY_DELAY: Duration = Duration::from_millis(100);
@@ -1712,6 +1715,10 @@ impl Verification<Svm> for Service<Svm> {
         input: VerifyBidInput<Svm>,
     ) -> Result<VerificationResult<Svm>, RestError> {
         let bid = input.bid_create;
+        if let BidChainDataCreateSvm::Swap(chain_data) = &bid.chain_data {
+            tracing::Span::current()
+                .record("opportunity_id", chain_data.opportunity_id.to_string());
+        }
         let transaction = bid.chain_data.get_transaction().clone();
         Svm::check_tx_size(&transaction)?;
         self.check_compute_budget(&transaction).await?;

auction-server/src/auction/service/verification.rs

@@ -175,6 +175,7 @@ fn get_fee_token(
 }
 
 impl Service<ChainTypeSvm> {
+    #[tracing::instrument(skip_all, err)]
     async fn get_opportunity_create_for_quote(
         &self,
         quote_create: entities::QuoteCreate,
@@ -377,7 +378,18 @@ impl Service<ChainTypeSvm> {
         }
     }
 
-    #[tracing::instrument(skip_all)]
+    #[tracing::instrument(
+        skip_all,
+        err,
+        fields(
+            opportunity_id,
+            auction_id,
+            searcher_token,
+            user_token,
+            bid_ids,
+            winner_bid
+        )
+    )]
     pub async fn get_quote(&self, input: GetQuoteInput) -> Result<entities::Quote, RestError> {
         let referral_fee_info = self
             .unwrap_referral_fee_info(
@@ -407,8 +419,11 @@ impl Service<ChainTypeSvm> {
                 opportunity: opportunity_create,
             })
             .await?;
+        tracing::Span::current().record("opportunity_id", opportunity.id.to_string());
         let searcher_token = opportunity.sell_tokens[0].clone();
         let user_token = opportunity.buy_tokens[0].clone();
+        tracing::Span::current().record("searcher_token", format!("{:?}", searcher_token));
+        tracing::Span::current().record("user_token", format!("{:?}", user_token));
         if searcher_token.amount == 0 && user_token.amount == 0 {
             return Err(RestError::BadParameters(
                 "Token amount cannot be zero".to_string(),
@@ -432,7 +447,10 @@ impl Service<ChainTypeSvm> {
                 permission_key: permission_key_svm.clone(),
             })
             .await;
-
+        tracing::Span::current().record(
+            "bid_ids",
+            tracing::field::display(crate::auction::entities::BidContainerTracing(&bids)),
+        );
         let total_bids = if bids.len() < 10 {
             bids.len().to_string()
         } else {
@@ -467,6 +485,7 @@ impl Service<ChainTypeSvm> {
             }
         }
         let winner_bid = bids.first().expect("failed to get first bid");
+        tracing::Span::current().record("winner_bid_id", winner_bid.id.to_string());
 
         let (_, swap_instruction) = auction_service
             .extract_express_relay_instruction(
@@ -495,6 +514,7 @@ impl Service<ChainTypeSvm> {
         let auction = auction_service
             .add_auction(AddAuctionInput { auction })
             .await?;
+        tracing::Span::current().record("auction_id", auction.id.to_string());
 
         // Remove opportunity to prevent further bids
         // The handle auction loop will take care of the bids that were submitted late

auction-server/src/opportunity/service/get_quote.rs

@@ -132,6 +132,7 @@ impl QuoteRequestAccountBalances {
 
 
 impl Service<ChainTypeSvm> {
+    #[tracing::instrument(skip_all, err)]
     pub async fn get_quote_request_account_balances(
         &self,
         input: QuoteRequestAccountBalancesInput,