Skip to content

feat: balance change for swap overflow #358

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.

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
84 changes: 28 additions & 56 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ axum-extra = { version = "0.9.3", features = ["query"] }
chrono = { version = "0.4.30", features = ["serde"] }
anyhow = "1.0.75"
num-bigint = "0.4.6"
namada_core = { version = "0.149.1" }
namada_events = { version = "0.149.1" }
namada_sdk = { version = "0.149.1", default-features = false, features = ["std", "async-send", "download-params"] }
namada_tx = { version = "0.149.1" }
namada_governance = { version = "0.149.1" }
namada_ibc = { version = "0.149.1" }
namada_token = { version = "0.149.1" }
namada_parameters = { version = "0.149.1" }
namada_proof_of_stake = { version = "0.149.1" }
namada_core = { git = "https://github.com/anoma/namada", rev = "c7c04353b285c1437c9351501b702376db437072" }
namada_events = { git = "https://github.com/anoma/namada", rev = "c7c04353b285c1437c9351501b702376db437072" }
namada_sdk = { git = "https://github.com/anoma/namada", rev = "c7c04353b285c1437c9351501b702376db437072", default-features = false, features = ["std", "async-send", "download-params"] }
namada_tx = { git = "https://github.com/anoma/namada", rev = "c7c04353b285c1437c9351501b702376db437072" }
namada_governance = { git = "https://github.com/anoma/namada", rev = "c7c04353b285c1437c9351501b702376db437072" }
namada_ibc = { git = "https://github.com/anoma/namada", rev = "c7c04353b285c1437c9351501b702376db437072" }
namada_token = { git = "https://github.com/anoma/namada", rev = "c7c04353b285c1437c9351501b702376db437072" }
namada_parameters = { git = "https://github.com/anoma/namada", rev = "c7c04353b285c1437c9351501b702376db437072" }
namada_proof_of_stake = { git = "https://github.com/anoma/namada", rev = "c7c04353b285c1437c9351501b702376db437072" }
tendermint = "0.40.1"
tendermint-rpc = { version = "0.40.1", features = ["http-client"] }
subtle-encoding = "0.5.1"
Expand Down
49 changes: 48 additions & 1 deletion shared/src/utils.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use anyhow::Context;
use namada_ibc::OsmosisSwapMemoDataInner;
use namada_ibc::apps::nft_transfer::types::PORT_ID_STR as NFT_PORT_ID_STR;
use namada_ibc::apps::transfer::types::packet::PacketData as FtPacketData;
use namada_ibc::apps::transfer::types::{
Expand All @@ -10,6 +11,7 @@
use namada_ibc::core::channel::types::packet::Packet;
use namada_ibc::core::handler::types::msgs::MsgEnvelope;
use namada_ibc::core::host::types::identifiers::{ChannelId, PortId};
use namada_ibc::trace::convert_to_address;
use namada_sdk::address::Address;
use namada_sdk::token::Transfer;

Expand Down Expand Up @@ -100,7 +102,49 @@
native_token: Id,
packet_msg: PacketMsg,
) -> anyhow::Result<Option<BalanceChange>> {
let try_extract_swap_overflow = |packet: Packet| -> anyhow::Result<
Option<BalanceChange>,
> {
let native_token = native_token.clone();
let packet_data = serde_json::from_slice::<FtPacketData>(&packet.data)

Check warning on line 109 in shared/src/utils.rs

View workflow job for this annotation

GitHub Actions / Format

Diff in /home/runner/work/namada-indexer/namada-indexer/shared/src/utils.rs
.context("Could not deserialize IBC fungible token packet")?;

let memo_data =
serde_json::from_str::<serde_json::Value>(packet_data.memo.as_ref())
.context("Invalid JSON")?
.pointer("/forward/next/wasm/msg/osmosis_swap/final_memo/namada/osmosis_swap")
.map(|swap| {
serde_json::from_value::<OsmosisSwapMemoDataInner>(swap.clone())
.context("Failed to deserialize Osmosis swap memo")
})
.transpose()?;

if let Some(memo_data) = memo_data {
let trace = memo_data.overflow_trace;

let token =
// For nam overflow_trace should be nam's tnam address
if Id::Account(trace.clone()) == native_token {
Token::Native(native_token)
// For ibc overflow_trace should be /transfer/channel-x/denom
} else {
Token::Ibc(crate::token::IbcToken {
address: convert_to_address(&trace)
.context("Failed to convert IBC trace to address")?
.into(),
trace: Id::IbcTrace(trace),
})
};
let source = Id::from(memo_data.overflow_receiver);

return Ok(Some(BalanceChange::new(source, token)));
};

Ok(None)
};

let extract = |packet: Packet| -> anyhow::Result<BalanceChange> {
let native_token = native_token.clone();
let packet_data = serde_json::from_slice::<FtPacketData>(&packet.data)
.context("Could not deserialize IBC fungible token packet")?;

Expand All @@ -126,9 +170,12 @@
msg.acknowledgement.as_bytes(),
)
.context("Could not deserialize IBC acknowledgement")?;

Check warning on line 173 in shared/src/utils.rs

View workflow job for this annotation

GitHub Actions / Format

Diff in /home/runner/work/namada-indexer/namada-indexer/shared/src/utils.rs
match ack {
AcknowledgementStatus::Success(_) => Ok(None),
AcknowledgementStatus::Success(_) => {
// Needed to update the balance of overflow receiver when doing shielded swaps
try_extract_swap_overflow(msg.packet)
}
AcknowledgementStatus::Error(_) => {
extract(msg.packet).map(Some)
}
Expand Down
Loading