Ocean: fix outdated pool

lib/ain-cpp-imports/src/bridge.rs

@@ -8,6 +8,14 @@ pub mod ffi {
         pub rbf_fee_increment: u64,
     }
 
+    #[derive(Debug, Clone)]
+    pub struct PoolPairCreationHeight {
+        pub id: u32,
+        pub id_token_a: u32,
+        pub id_token_b: u32,
+        pub creation_height: u32,
+    }
+
     #[derive(Debug, Clone)]
     pub struct DST20Token {
         pub id: u64,
@@ -49,6 +57,7 @@ pub mod ffi {
     unsafe extern "C++" {
         include!("ffi/ffiexports.h");
         type Attributes;
+        type PoolPairCreationHeight;
         type DST20Token;
         type TransactionData;
         type SystemTxType;
@@ -79,6 +88,7 @@ pub mod ffi {
         fn getEthSyncStatus() -> [i64; 2];
         fn getAttributeValues(mnview_ptr: usize) -> Attributes;
         fn CppLogPrintf(message: String);
+        fn getPoolPairs() -> Vec<PoolPairCreationHeight>;
         #[allow(clippy::ptr_arg)]
         fn getDST20Tokens(mnview_ptr: usize, tokens: &mut Vec<DST20Token>) -> bool;
         fn getClientVersion() -> String;

lib/ain-cpp-imports/src/lib.rs

@@ -16,6 +16,13 @@ mod ffi {
         pub rbf_fee_increment: u64,
     }
 
+    pub struct PoolPairCreationHeight {
+        pub id: u32,
+        pub id_token_a: u32,
+        pub id_token_b: u32,
+        pub creation_height: u32,
+    }
+
     pub struct DST20Token {
         pub id: u64,
         pub name: String,
@@ -125,6 +132,10 @@ mod ffi {
         // Just the logs are skipped.
     }
 
+    pub fn getPoolPairs() -> Vec<PoolPairCreationHeight> {
+        unimplemented!("{}", UNIMPL_MSG)
+    }
+
     #[allow(clippy::ptr_arg)]
     pub fn getDST20Tokens(_mnview_ptr: usize, _tokens: &mut Vec<DST20Token>) -> bool {
         unimplemented!("{}", UNIMPL_MSG)
@@ -175,6 +186,7 @@ mod ffi {
 }
 
 pub use ffi::Attributes;
+pub use ffi::PoolPairCreationHeight;
 pub use ffi::SystemTxData;
 pub use ffi::SystemTxType;
 pub use ffi::TokenAmount;
@@ -339,6 +351,10 @@ pub fn log_print(message: &str) {
     ffi::CppLogPrintf(message.to_owned());
 }
 
+pub fn get_pool_pairs() -> Vec<ffi::PoolPairCreationHeight> {
+    ffi::getPoolPairs()
+}
+
 /// Fetches all DST20 tokens in view, returns the result of the migration
 #[allow(clippy::ptr_arg)]
 pub fn get_dst20_tokens(mnview_ptr: usize, tokens: &mut Vec<ffi::DST20Token>) -> bool {

lib/ain-ocean/src/api/address.rs

@@ -432,7 +432,7 @@ async fn list_transaction_unspent(
         .skip(usize::from(query.next.is_some()))
         .take(query.size)
         .take_while(|item| match item {
-            Ok((k, _)) => k.0 == hid.clone(),
+            Ok((k, _)) => k.0 == hid,
             _ => true,
         })
         .map(|item| {

lib/ain-ocean/src/indexer/mod.rs

@@ -3,7 +3,6 @@ pub mod loan_token;
 mod masternode;
 pub mod oracle;
 pub mod oracle_test;
-pub mod poolpair;
 pub mod poolswap;
 pub mod transaction;
 pub mod tx_result;
@@ -20,7 +19,7 @@ use ain_dftx::{deserialize, is_skipped_tx, DfTx, Stack};
 use defichain_rpc::json::blockchain::{Block, Transaction, Vin, VinStandard};
 use helper::check_if_evm_tx;
 use log::trace;
-pub use poolswap::{PoolCreationHeight, PoolSwapAggregatedInterval, AGGREGATED_INTERVALS};
+pub use poolswap::{PoolSwapAggregatedInterval, AGGREGATED_INTERVALS};
 use rust_decimal::{prelude::FromPrimitive, Decimal};
 use snafu::OptionExt;
 
@@ -64,7 +63,8 @@ fn get_bucket(block: &Block<Transaction>, interval: i64) -> i64 {
 }
 
 fn index_block_start(services: &Arc<Services>, block: &Block<Transaction>) -> Result<()> {
-    let pool_pairs = list_pool_pairs_by_height(services)?;
+    let mut pool_pairs = ain_cpp_imports::get_pool_pairs();
+    pool_pairs.sort_by(|a, b| b.creation_height.cmp(&a.creation_height));
 
     for interval in AGGREGATED_INTERVALS {
         for pool_pair in &pool_pairs {
@@ -120,25 +120,9 @@ fn index_block_start(services: &Arc<Services>, block: &Block<Transaction>) -> Re
     Ok(())
 }
 
-fn list_pool_pairs_by_height(services: &Arc<Services>) -> Result<Vec<PoolCreationHeight>> {
-    services
-        .poolpair
-        .by_height
-        .list(None, SortOrder::Descending)?
-        .map(|el| {
-            let ((k, _), (pool_id, id_token_a, id_token_b)) = el?;
-            Ok(PoolCreationHeight {
-                id: pool_id,
-                id_token_a,
-                id_token_b,
-                creation_height: k,
-            })
-        })
-        .collect::<Result<Vec<_>>>()
-}
-
 fn invalidate_block_start(services: &Arc<Services>, block: &Block<Transaction>) -> Result<()> {
-    let pool_pairs = list_pool_pairs_by_height(services)?;
+    let mut pool_pairs = ain_cpp_imports::get_pool_pairs();
+    pool_pairs.sort_by(|a, b| b.creation_height.cmp(&a.creation_height));
 
     for interval in AGGREGATED_INTERVALS {
         for pool_pair in &pool_pairs {
@@ -764,7 +748,6 @@ pub fn index_block(services: &Arc<Services>, block: Block<Transaction>) -> Resul
                     DfTx::PoolSwap(data) => data.index(services, &ctx)?,
                     DfTx::SetLoanToken(data) => data.index(services, &ctx)?,
                     DfTx::CompositeSwap(data) => data.index(services, &ctx)?,
-                    DfTx::CreatePoolPair(data) => data.index(services, &ctx)?,
                     DfTx::PlaceAuctionBid(data) => data.index(services, &ctx)?,
                     _ => (),
                 }
@@ -862,7 +845,6 @@ pub fn invalidate_block(services: &Arc<Services>, block: Block<Transaction>) ->
                     DfTx::PoolSwap(data) => data.invalidate(services, &ctx)?, // check
                     DfTx::SetLoanToken(data) => data.invalidate(services, &ctx)?,
                     DfTx::CompositeSwap(data) => data.invalidate(services, &ctx)?,
-                    DfTx::CreatePoolPair(data) => data.invalidate(services, &ctx)?,
                     DfTx::PlaceAuctionBid(data) => data.invalidate(services, &ctx)?,
                     _ => (),
                 }

lib/ain-ocean/src/indexer/poolswap.rs

@@ -27,14 +27,6 @@ pub enum PoolSwapAggregatedInterval {
     OneHour = 60 * 60,
 }
 
-#[derive(Debug, Clone)]
-pub struct PoolCreationHeight {
-    pub id: u32,
-    pub id_token_a: u32,
-    pub id_token_b: u32,
-    pub creation_height: u32,
-}
-
 fn index_swap_aggregated(
     services: &Arc<Services>,
     pool_id: u32,
@@ -248,7 +240,7 @@ impl Index for CompositeSwap {
         let from_amount = self.pool_swap.from_amount;
         let to_token_id = self.pool_swap.to_token_id.0;
 
-        let Some(TxResult::PoolSwap(PoolSwapResult { to_amount, .. })) =
+        let Some(TxResult::PoolSwap(PoolSwapResult { to_amount, pool_id })) =
             services.result.get(&txid)?
         else {
             trace!("Missing swap result for {}", txid.to_string());
@@ -260,13 +252,7 @@ impl Index for CompositeSwap {
         let pools = self.pools.as_ref();
 
         let pool_ids = if pools.is_empty() {
-            let Some(pool_id) = services
-                .poolpair
-                .by_id
-                .get(&(from_token_id as u32, to_token_id as u32))?
-            else {
-                return Err("Missing pool_id".into());
-            };
+            // the pool_id from finals wap is the only swap while pools is empty
             Vec::from([pool_id])
         } else {
             pools.iter().map(|pool| pool.id.0 as u32).collect()

lib/ain-ocean/src/lib.rs

@@ -12,7 +12,7 @@ pub use indexer::{
     index_block, invalidate_block,
     oracle::invalidate_oracle_interval,
     transaction::{index_transaction, invalidate_transaction},
-    tx_result, PoolCreationHeight,
+    tx_result,
 };
 use parking_lot::Mutex;
 use petgraph::graphmap::UnGraphMap;
@@ -55,11 +55,6 @@ pub struct PoolService {
     by_id: PoolSwap,
 }
 
-pub struct PoolPairService {
-    by_height: PoolPairByHeight,
-    by_id: PoolPair,
-}
-
 pub struct PoolSwapAggregatedService {
     by_id: PoolSwapAggregated,
     by_key: PoolSwapAggregatedKey,
@@ -135,7 +130,6 @@ pub struct Services {
     pub auction: AuctionService,
     pub result: TxResult,
     pub pool: PoolService,
-    pub poolpair: PoolPairService,
     pub pool_swap_aggregated: PoolSwapAggregatedService,
     pub transaction: TransactionService,
     pub oracle: OracleService,
@@ -171,10 +165,6 @@ impl Services {
                 by_height: VaultAuctionHistoryByHeight::new(Arc::clone(&store)),
             },
             result: TxResult::new(Arc::clone(&store)),
-            poolpair: PoolPairService {
-                by_height: PoolPairByHeight::new(Arc::clone(&store)),
-                by_id: PoolPair::new(Arc::clone(&store)),
-            },
             pool: PoolService {
                 by_id: PoolSwap::new(Arc::clone(&store)),
             },

lib/ain-ocean/src/model/tx_result.rs

@@ -11,7 +11,6 @@ pub struct PoolSwapResult {
 #[derive(Serialize, Deserialize, Debug)]
 pub enum TxResult {
     PoolSwap(PoolSwapResult),
-    CreatePoolPair(u32),
     None,
 }
 
@@ -23,9 +22,6 @@ impl From<(u8, usize)> for TxResult {
             CustomTxType::PoolSwap | CustomTxType::PoolSwapV2 => {
                 Self::PoolSwap(unsafe { *(result_ptr as *const PoolSwapResult) })
             }
-            CustomTxType::CreatePoolPair => {
-                Self::CreatePoolPair(unsafe { *(result_ptr as *const u32) })
-            }
             _ => Self::None,
         }
     }

lib/ain-ocean/src/storage/mod.rs

@@ -308,22 +308,6 @@ define_table! {
     SecondaryIndex = PoolSwapAggregated
 }
 
-define_table! {
-    #[derive(Debug)]
-    pub struct PoolPair {
-        key_type = (u32, u32),
-        value_type = u32,
-    }
-}
-
-define_table! {
-    #[derive(Debug)]
-    pub struct PoolPairByHeight {
-        key_type = (u32, usize),
-        value_type = (u32, u32, u32),
-    }
-}
-
 define_table! {
     #[derive(Debug)]
     pub struct PriceTicker {
@@ -486,7 +470,7 @@ define_table! {
     SecondaryIndex = VaultAuctionHistory
 }
 
-pub const COLUMN_NAMES: [&str; 37] = [
+pub const COLUMN_NAMES: [&str; 35] = [
     Block::NAME,
     BlockByHeight::NAME,
     MasternodeStats::NAME,
@@ -508,8 +492,6 @@ pub const COLUMN_NAMES: [&str; 37] = [
     PoolSwapAggregated::NAME,
     PoolSwapAggregatedKey::NAME,
     PoolSwap::NAME,
-    PoolPair::NAME,
-    PoolPairByHeight::NAME,
     PriceTicker::NAME,
     PriceTickerKey::NAME,
     RawBlock::NAME,

lib/ain-rs-exports/src/lib.rs

@@ -167,13 +167,6 @@ pub mod ffi {
         pub tx_hash: [u8; 32],
     }
 
-    pub struct PoolCreationHeight {
-        pub id: u32,
-        pub id_token_a: u32,
-        pub id_token_b: u32,
-        pub creation_height: u32,
-    }
-
     extern "Rust" {
         type BlockTemplateWrapper;
         // In-fallible functions

src/dfi/consensus/poolpairs.cpp

@@ -98,12 +98,7 @@ Res CPoolPairsConsensus::operator()(const CCreatePoolPairMessage &obj) const {
         }
     }
 
-    if (auto res = mnview.SetPoolPair(tokenId, height, poolPair); !res) {
-        return res;
-    }
-
-    return OceanSetTxResult(std::make_pair(CustomTxType::CreatePoolPair, tx.GetHash()),
-                            static_cast<std::size_t>(reinterpret_cast<uintptr_t>(&tokenId->v)));
+    return mnview.SetPoolPair(tokenId, height, poolPair);
 }
 
 Res CPoolPairsConsensus::operator()(const CUpdatePoolPairMessage &obj) const {