fix comments

Author: OBorce

api-server/api-server-common/src/storage/impls/in_memory/mod.rs

@@ -22,6 +22,8 @@ use std::{
     sync::Arc,
 };
 
+use itertools::Itertools as _;
+
 use common::{
     address::Address,
     chain::{
@@ -40,8 +42,6 @@ use crate::storage::storage_api::{
     TokenTransaction, TransactionInfo, TransactionWithBlockInfo, Utxo, UtxoLock, UtxoWithExtraInfo,
 };
 
-use itertools::Itertools as _;
-
 use super::CURRENT_STORAGE_VERSION;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -207,7 +207,11 @@ impl ApiServerInMemoryStorage {
                 transactions
                     .iter()
                     .rev()
-                    .flat_map(|(_, txs)| txs.iter().map(|tx| &tx.0))
+                    .flat_map(|(_, txs)| {
+                        let mut txs: Vec<_> = txs.iter().map(|tx| &tx.0).collect();
+                        txs.sort_by_key(|tx| std::cmp::Reverse(tx.tx_global_index));
+                        txs
+                    })
                     .flat_map(|tx| (tx.tx_global_index < tx_global_index).then_some(tx))
                     .cloned()
                     .take(len as usize)

api-server/api-server-common/src/storage/impls/postgres/queries.rs

@@ -616,8 +616,8 @@ impl<'a, 'b> QueryFromConnection<'a, 'b> {
                 r#"
                     INSERT INTO ml.token_transactions (token_id, block_height, transaction_id, tx_global_index)
                     VALUES ($1, $2, $3, $4)
-                    ON CONFLICT (token_id, transaction_id, block_height)
-                    DO NOTHING;
+                    ON CONFLICT (token_id, transaction_id, block_height) DO UPDATE
+                    SET tx_global_index = $4;
                 "#,
                 &[&token_id.encode(), &height, &transaction_id.encode(), &tx_global_index],
             )

api-server/api-server-common/src/storage/storage_api/mod.rs

@@ -68,7 +68,7 @@ pub enum ApiServerStorageError {
     AddressableError,
     #[error("Block timestamp too high: {0}")]
     TimestampTooHigh(BlockTimestamp),
-    #[error("Tx global index too hight: {0}")]
+    #[error("Tx global index too high: {0}")]
     TxGlobalIndexTooHigh(u64),
     #[error("Id creation error: {0}")]
     IdCreationError(#[from] IdCreationError),
@@ -619,7 +619,7 @@ pub trait ApiServerStorageRead: Sync {
 
     /// Returns a page of transaction IDs that reference this `token_id`, limited to `len` entries
     /// and with a `tx_global_index` older than the specified value.
-    /// The `tx_global_index` and is not continuous for a specific `token_id`.
+    /// The `tx_global_index` is not continuous for a specific `token_id`.
     async fn get_token_transactions(
         &self,
         token_id: TokenId,

api-server/scanner-lib/src/blockchain_state/mod.rs

@@ -201,11 +201,11 @@ impl<S: ApiServerStorage + Send + Sync> LocalBlockchainState for BlockchainState
                 .await
                 .expect("Unable to set block");
 
-            for (i, tx_info) in transactions.iter().enumerate() {
+            for (idx, tx_info) in transactions.iter().enumerate() {
                 db_tx
                     .set_transaction(
                         tx_info.tx.transaction().get_id(),
-                        next_order_number + i as u64,
+                        next_order_number + idx as u64,
                         block_id,
                         tx_info,
                     )
@@ -1054,7 +1054,7 @@ async fn update_tables_from_transaction_inputs<T: ApiServerStorageWrite>(
         BTreeMap::new();
     let mut transaction_tokens: BTreeSet<TokenId> = BTreeSet::new();
 
-    let update_tokens_in_transaction = |order: &Order, tokens_in_transaction: &mut BTreeSet<_>| {
+    let update_tokens_for_order = |order: &Order, tokens_in_transaction: &mut BTreeSet<_>| {
         match order.give_currency {
             CoinOrTokenId::TokenId(token_id) => {
                 tokens_in_transaction.insert(token_id);
@@ -1265,15 +1265,15 @@ async fn update_tables_from_transaction_inputs<T: ApiServerStorageWrite>(
 
                     db_tx.set_order_at_height(*order_id, &order, block_height).await?;
 
-                    update_tokens_in_transaction(&order, &mut transaction_tokens);
+                    update_tokens_for_order(&order, &mut transaction_tokens);
                 }
                 AccountCommand::ConcludeOrder(order_id) => {
                     let order = db_tx.get_order(*order_id).await?.expect("must exist");
                     let order = order.conclude();
 
                     db_tx.set_order_at_height(*order_id, &order, block_height).await?;
 
-                    update_tokens_in_transaction(&order, &mut transaction_tokens);
+                    update_tokens_for_order(&order, &mut transaction_tokens);
                 }
             },
             TxInput::OrderAccountCommand(cmd) => match cmd {
@@ -1283,20 +1283,21 @@ async fn update_tables_from_transaction_inputs<T: ApiServerStorageWrite>(
                         order.fill(&chain_config, block_height, *fill_amount_in_ask_currency);
 
                     db_tx.set_order_at_height(*order_id, &order, block_height).await?;
-                    update_tokens_in_transaction(&order, &mut transaction_tokens);
+                    update_tokens_for_order(&order, &mut transaction_tokens);
                 }
                 OrderAccountCommand::ConcludeOrder(order_id) => {
                     let order = db_tx.get_order(*order_id).await?.expect("must exist");
                     let order = order.conclude();
 
                     db_tx.set_order_at_height(*order_id, &order, block_height).await?;
-                    update_tokens_in_transaction(&order, &mut transaction_tokens);
+                    update_tokens_for_order(&order, &mut transaction_tokens);
                 }
                 OrderAccountCommand::FreezeOrder(order_id) => {
                     let order = db_tx.get_order(*order_id).await?.expect("must exist");
                     let order = order.freeze();
 
                     db_tx.set_order_at_height(*order_id, &order, block_height).await?;
+                    update_tokens_for_order(&order, &mut transaction_tokens);
                 }
             },
             TxInput::Account(outpoint) => {