Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ocean: poolswap fallback handling #2932

Merged
merged 4 commits into from
Jun 11, 2024
Merged

Ocean: poolswap fallback handling #2932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1320e2b
handle compositeswap empty pools
canonbrother Jun 7, 2024
f437e02
fmt
canonbrother Jun 8, 2024
0638ac8
fallback
canonbrother Jun 8, 2024
7d3e6b2
fmt
canonbrother Jun 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib/ain-ocean/src/api/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use bitcoin::{Address, Network, ScriptBuf};
use defichain_rpc::json::token::TokenInfo;
use rust_decimal::Decimal;
use rust_decimal_macros::dec;
Expand Down Expand Up @@ -39,6 +40,12 @@ pub fn format_number(v: Decimal) -> String {
}
}

pub fn from_script(script: ScriptBuf, network: Network) -> crate::Result<String> {
let script = script.as_script();
let address = Address::from_script(script, network)?.to_string();
Ok(address)
}

/// Finds the balance of a specified token symbol within a list of token strings.
///
/// This function iterates through a vector of token strings, where each string
Expand Down
22 changes: 13 additions & 9 deletions lib/ain-ocean/src/api/pool_pair/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ use serde::{Deserialize, Serialize};
use serde_json::json;
use serde_with::skip_serializing_none;
use service::{
check_swap_type, find_swap_from_to, get_aggregated_in_usd, get_apr, get_total_liquidity_usd,
get_usd_volume, PoolPairVolumeResponse, PoolSwapFromTo, PoolSwapFromToData, SwapType,
check_swap_type, find_swap_from, find_swap_to, get_aggregated_in_usd, get_apr,
get_total_liquidity_usd, get_usd_volume, PoolPairVolumeResponse, PoolSwapFromToData, SwapType,
};

use super::{
Expand Down Expand Up @@ -84,7 +84,12 @@ pub struct PoolSwapVerboseResponse {
}

impl PoolSwapVerboseResponse {
fn map(v: PoolSwap, from_to: Option<PoolSwapFromTo>, swap_type: Option<SwapType>) -> Self {
fn map(
v: PoolSwap,
from: Option<PoolSwapFromToData>,
to: Option<PoolSwapFromToData>,
swap_type: Option<SwapType>,
) -> Self {
Self {
id: v.id,
sort: v.sort,
Expand All @@ -93,8 +98,8 @@ impl PoolSwapVerboseResponse {
pool_pair_id: v.pool_id.to_string(),
from_amount: Decimal::new(v.from_amount, 8).to_string(),
from_token_id: v.from_token_id,
from: from_to.clone().and_then(|item| item.from),
to: from_to.and_then(|item| item.to),
from,
to,
block: v.block,
r#type: swap_type,
}
Expand Down Expand Up @@ -454,13 +459,12 @@ async fn list_pool_swaps_verbose(
})
.map(|item| async {
let (_, swap) = item?;
let from_to =
find_swap_from_to(&ctx, swap.block.height, swap.txid, swap.txno.try_into()?)
.await?;
let from = find_swap_from(&ctx, swap.clone()).await?;
let to = find_swap_to(&ctx, swap.clone()).await?;

let swap_type = check_swap_type(&ctx, swap.clone()).await?;

let res = PoolSwapVerboseResponse::map(swap, from_to, swap_type);
let res = PoolSwapVerboseResponse::map(swap, from, to, swap_type);
Ok::<PoolSwapVerboseResponse, Error>(res)
})
.collect::<Vec<_>>();
Expand Down
170 changes: 75 additions & 95 deletions lib/ain-ocean/src/api/pool_pair/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
use std::{collections::HashMap, str::FromStr, sync::Arc};

use anyhow::{format_err, Context};
use bitcoin::{Address, Txid};
use defichain_rpc::{
json::{account::AccountHistory, poolpair::PoolPairInfo},
AccountRPC, BlockchainRPC,
};
use bitcoin::Txid;
use defichain_rpc::{json::poolpair::PoolPairInfo, AccountRPC, BlockchainRPC};
use rust_decimal::{prelude::FromPrimitive, Decimal};
use rust_decimal_macros::dec;
use serde::{Deserialize, Serialize};
Expand All @@ -14,21 +11,17 @@ use super::{AppContext, PoolPairAprResponse};
use crate::{
api::{
cache::{get_gov_cached, get_pool_pair_cached, get_token_cached},
common::parse_display_symbol,
common::{from_script, parse_display_symbol},
pool_pair::path::{get_best_path, BestSwapPathResponse},
},
error::{Error, NotFoundKind},
indexer::PoolSwapAggregatedInterval,
model::PoolSwapAggregatedAggregated,
model::{BlockContext, PoolSwapAggregatedAggregated},
repository::{RepositoryOps, SecondaryIndex},
storage::SortOrder,
Result,
};
use ain_dftx::{
deserialize,
pool::{CompositeSwap, PoolSwap},
DfTx, Stack,
};
use ain_dftx::{deserialize, pool::CompositeSwap, DfTx, Stack};

#[allow(clippy::upper_case_acronyms)]
#[derive(Serialize, Deserialize, Debug, Clone)]
Expand Down Expand Up @@ -607,30 +600,85 @@ fn find_composite_swap_dftx(ctx: &Arc<AppContext>, txid: Txid) -> Result<Option<
DfTx::CompositeSwap(data) => Some(data),
_ => None,
};
// let pool_swap_dftx = match dftx {
// DfTx::PoolSwap(data) => Some(data),
// DfTx::CompositeSwap(data) => Some(data.pool_swap),
// _ => None,
// };;

Ok(composite_swap_dftx)
}

fn find_pool_swap_dftx(ctx: &Arc<AppContext>, txid: Txid) -> Result<Option<PoolSwap>> {
let dftx = call_dftx(ctx, txid)?;
if dftx.is_none() {
pub async fn find_swap_from(
ctx: &Arc<AppContext>,
swap: crate::model::PoolSwap,
) -> Result<Option<PoolSwapFromToData>> {
let crate::model::PoolSwap {
from,
from_amount,
from_token_id,
..
} = swap;
let from_address = from_script(from, ctx.network.into())?;

let from_token = get_token_cached(ctx, &from_token_id.to_string()).await?;
if from_token.is_none() {
return Ok(None);
}
let dftx = dftx.unwrap();
let pool_swap_dftx = match dftx {
DfTx::PoolSwap(data) => Some(data),
DfTx::CompositeSwap(data) => Some(data.pool_swap),
_ => None,
};
let (_, from_token) = from_token.unwrap();

Ok(pool_swap_dftx)
Ok(Some(PoolSwapFromToData {
address: from_address,
amount: Decimal::new(from_amount, 8).to_string(),
display_symbol: parse_display_symbol(&from_token),
symbol: from_token.symbol,
}))
}

fn find_pool_swap_from_to(
history: AccountHistory,
from: bool,
display_symbol: String,
pub async fn find_swap_to(
ctx: &Arc<AppContext>,
swap: crate::model::PoolSwap,
) -> Result<Option<PoolSwapFromToData>> {
let crate::model::PoolSwap {
to,
to_token_id,
to_amount,
block,
txno,
..
} = swap;
let BlockContext { height, .. } = block;
let txno = txno.try_into()?;

let to_address = from_script(to, ctx.network.into())?;

let to_token = get_token_cached(ctx, &to_token_id.to_string()).await?;
if to_token.is_none() {
return Ok(None);
}
let (_, to_token) = to_token.unwrap();

let display_symbol = parse_display_symbol(&to_token);

// NOTE(canonbrother): fallback to API layer to calculate `to_amount`
// context: to_amount has been calculated while indexing with ocean archive
// `to_amount` None indicates the node is not running with ocean archive
// get the `to_amount` via `getaccounthistory`
if to_amount.is_some() {
let amount = to_amount.unwrap().abs();
return Ok(Some(PoolSwapFromToData {
address: to_address,
amount: Decimal::new(amount, 8).to_string(),
symbol: to_token.symbol,
display_symbol,
}));
}

let history = ctx
.client
.get_account_history(&to_address.to_string(), height, txno)
.await?;

for account in history.amounts {
let parts = account.split('@').collect::<Vec<&str>>();
let [value, symbol] = parts
Expand All @@ -640,16 +688,7 @@ fn find_pool_swap_from_to(

let value = Decimal::from_str(value)?;

if value.is_sign_negative() && from {
return Ok(Some(PoolSwapFromToData {
address: history.owner,
amount: format!("{:.8}", value.abs()),
symbol: symbol.to_string(),
display_symbol,
}));
}

if value.is_sign_positive() && !from {
if value.is_sign_positive() {
return Ok(Some(PoolSwapFromToData {
address: history.owner,
amount: format!("{:.8}", value.abs()),
Expand All @@ -662,65 +701,6 @@ fn find_pool_swap_from_to(
Ok(None)
}

pub async fn find_swap_from_to(
ctx: &Arc<AppContext>,
height: u32,
txid: Txid,
txno: u32,
) -> Result<Option<PoolSwapFromTo>> {
let dftx = find_pool_swap_dftx(ctx, txid)?;
if dftx.is_none() {
return Ok(None);
}
let dftx = dftx.unwrap();

let from_script = dftx.from_script.as_script();

let from_address = Address::from_script(from_script, ctx.network.into());
if from_address.is_err() {
return Ok(None);
}
let from_address = from_address.unwrap().to_string();

let to_script = dftx.to_script.as_script();
let to_address = Address::from_script(to_script, ctx.network.into());
if to_address.is_err() {
return Ok(None);
}
let to_address = to_address.unwrap().to_string();

let from_token = get_token_cached(ctx, &dftx.from_token_id.0.to_string()).await?;
if from_token.is_none() {
return Ok(None);
}
let (_, from_token) = from_token.unwrap();

let to_token = get_token_cached(ctx, &dftx.to_token_id.0.to_string()).await?;
if to_token.is_none() {
return Ok(None);
}
let (_, to_token) = to_token.unwrap();

let from = PoolSwapFromToData {
address: from_address,
amount: Decimal::new(dftx.from_amount, 8).to_string(),
display_symbol: parse_display_symbol(&from_token),
symbol: from_token.symbol,
};

let history = ctx
.client
.get_account_history(&to_address.to_string(), height, txno)
.await?;

let to = find_pool_swap_from_to(history, false, parse_display_symbol(&to_token))?;

Ok(Some(PoolSwapFromTo {
from: Some(from),
to,
}))
}

async fn get_pool_swap_type(
ctx: &Arc<AppContext>,
swap: crate::model::PoolSwap,
Expand Down
13 changes: 9 additions & 4 deletions lib/ain-ocean/src/bin/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,16 @@ async fn main() -> Result<()> {
.await?
.0
.into_iter()
.map(|(id, info)| PoolCreationHeight {
id: id.parse::<u32>().unwrap(),
creation_height: info.creation_height as u32,
.map(|(id, info)| {
let pool = PoolCreationHeight {
id: id.parse::<u32>()?,
id_token_a: info.id_token_a.parse::<u32>()?,
id_token_b: info.id_token_b.parse::<u32>()?,
creation_height: info.creation_height as u32,
};
Ok(pool)
})
.collect::<Vec<_>>();
.collect::<Result<Vec<_>>>()?;

next_block_hash = block.nextblockhash;
match index_block(&services, block, pools) {
Expand Down
12 changes: 5 additions & 7 deletions lib/ain-ocean/src/indexer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ use ain_dftx::{deserialize, DfTx, Stack};
use bitcoin::hashes::Hash;
use defichain_rpc::json::blockchain::{Block, Transaction};
use log::debug;
pub use pool::{PoolSwapAggregatedInterval, AGGREGATED_INTERVALS};
pub use pool::{
update_mapping, PoolCreationHeight, PoolSwapAggregatedInterval, AGGREGATED_INTERVALS,
};

use crate::{
index_transaction,
Expand All @@ -31,12 +33,6 @@ pub(crate) trait Index {
fn invalidate(&self, services: &Arc<Services>, ctx: &Context) -> Result<()>;
}

#[derive(Debug, Clone)]
pub struct PoolCreationHeight {
pub id: u32,
pub creation_height: u32,
}

#[derive(Debug)]
pub struct Context {
block: BlockContext,
Expand Down Expand Up @@ -131,6 +127,8 @@ pub fn index_block(
median_time: block.mediantime,
};

update_mapping(&pools);

index_block_start(services, &block, pools)?;

for (tx_idx, tx) in block.tx.into_iter().enumerate() {
Expand Down
Loading
Loading