Skip to content

refactor(tx-query): use TxSearchRequest for tx queries #2384

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

Merged
shamardy merged 1 commit into from
Mar 10, 2025
Merged

refactor(tx-query): use TxSearchRequest for tx queries #2384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
104 changes: 38 additions & 66 deletions mm2src/coins/tendermint/tendermint_coin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ use cosmrs::proto::cosmos::base::v1beta1::{Coin as CoinProto, DecCoin};
use cosmrs::proto::cosmos::distribution::v1beta1::{QueryDelegationRewardsRequest, QueryDelegationRewardsResponse};
use cosmrs::proto::cosmos::staking::v1beta1::{QueryDelegationRequest, QueryDelegationResponse, QueryValidatorsRequest,
QueryValidatorsResponse as QueryValidatorsResponseProto};
use cosmrs::proto::cosmos::tx::v1beta1::{GetTxRequest, GetTxResponse, GetTxsEventRequest, GetTxsEventResponse,
SimulateRequest, SimulateResponse, Tx, TxBody, TxRaw};
use cosmrs::proto::cosmos::tx::v1beta1::{GetTxRequest, GetTxResponse, SimulateRequest, SimulateResponse, Tx, TxBody,
TxRaw};
use cosmrs::proto::prost::{DecodeError, Message};
use cosmrs::staking::{MsgDelegate, MsgUndelegate, QueryValidatorsResponse, Validator};
use cosmrs::tendermint::block::Height;
Expand Down Expand Up @@ -93,7 +93,6 @@ const ABCI_SIMULATE_TX_PATH: &str = "/cosmos.tx.v1beta1.Service/Simulate";
const ABCI_QUERY_ACCOUNT_PATH: &str = "/cosmos.auth.v1beta1.Query/Account";
const ABCI_QUERY_BALANCE_PATH: &str = "/cosmos.bank.v1beta1.Query/Balance";
const ABCI_GET_TX_PATH: &str = "/cosmos.tx.v1beta1.Service/GetTx";
const ABCI_GET_TXS_EVENT_PATH: &str = "/cosmos.tx.v1beta1.Service/GetTxsEvent";
const ABCI_VALIDATORS_PATH: &str = "/cosmos.staking.v1beta1.Query/Validators";
const ABCI_DELEGATION_PATH: &str = "/cosmos.staking.v1beta1.Query/Delegation";
const ABCI_DELEGATION_REWARDS_PATH: &str = "/cosmos.distribution.v1beta1.Query/DelegationRewards";
Expand Down Expand Up @@ -2018,37 +2017,29 @@ impl TendermintCoin {
match htlc_state {
HTLC_STATE_OPEN => Ok(None),
HTLC_STATE_COMPLETED => {
let events_string = format!("claim_htlc.id='{}'", htlc_id);
// TODO: Remove deprecated attribute when new version of tendermint-rs is released
#[allow(deprecated)]
let request = GetTxsEventRequest {
events: vec![events_string],
order_by: TendermintResultOrder::Ascending as i32,
let query = format!("claim_htlc.id='{}'", htlc_id);
let request = TxSearchRequest {
query,
order_by: TendermintResultOrder::Ascending.into(),
page: 1,
limit: 1,
pagination: None,
per_page: 1,
prove: false,
};
let encoded_request = request.encode_to_vec();

let response = self
.rpc_client()
.await?
.abci_query(
Some(ABCI_GET_TXS_EVENT_PATH.to_string()),
encoded_request.as_slice(),
ABCI_REQUEST_HEIGHT,
ABCI_REQUEST_PROVE,
)
.perform(request)
.await
.map_to_mm(TendermintCoinRpcError::from)?;
let response = GetTxsEventResponse::decode(response.value.as_slice())?;
match response.txs.first() {
Some(tx) => {
Some(raw_tx) => {
let tx = cosmrs::Tx::from_bytes(&raw_tx.tx)?;
let tx = TransactionEnum::CosmosTransaction(CosmosTransaction {
data: TxRaw {
body_bytes: tx.body.as_ref().map(Message::encode_to_vec).unwrap_or_default(),
auth_info_bytes: tx.auth_info.as_ref().map(Message::encode_to_vec).unwrap_or_default(),
signatures: tx.signatures.clone(),
body_bytes: tx.body.into_bytes()?,
auth_info_bytes: tx.auth_info.into_bytes()?,
signatures: tx.signatures,
},
});
Ok(Some(FoundSwapTxSpend::Spent(tx)))
Expand Down Expand Up @@ -3162,36 +3153,26 @@ impl MarketCoinOps for TendermintCoin {
let htlc = try_tx_s!(CreateHtlcMsg::try_from(htlc_proto));
let htlc_id = self.calculate_htlc_id(htlc.sender(), htlc.to(), htlc.amount(), args.secret_hash);

let events_string = format!("claim_htlc.id='{}'", htlc_id);
// TODO: Remove deprecated attribute when new version of tendermint-rs is released
#[allow(deprecated)]
let request = GetTxsEventRequest {
events: vec![events_string],
order_by: TendermintResultOrder::Ascending as i32,
let query = format!("claim_htlc.id='{}'", htlc_id);
let request = TxSearchRequest {
query,
order_by: TendermintResultOrder::Ascending.into(),
page: 1,
limit: 1,
pagination: None,
per_page: 1,
prove: false,
};
let encoded_request = request.encode_to_vec();

loop {
let response = try_tx_s!(
try_tx_s!(self.rpc_client().await)
.abci_query(
Some(ABCI_GET_TXS_EVENT_PATH.to_string()),
encoded_request.as_slice(),
ABCI_REQUEST_HEIGHT,
ABCI_REQUEST_PROVE
)
.await
);
let response = try_tx_s!(GetTxsEventResponse::decode(response.value.as_slice()));
if let Some(tx) = response.txs.first() {
let response = try_tx_s!(try_tx_s!(self.rpc_client().await).perform(request.clone()).await);

if let Some(raw_tx) = response.txs.first() {
let tx = try_tx_s!(cosmrs::Tx::from_bytes(&raw_tx.tx));

return Ok(TransactionEnum::CosmosTransaction(CosmosTransaction {
data: TxRaw {
body_bytes: tx.body.as_ref().map(Message::encode_to_vec).unwrap_or_default(),
auth_info_bytes: tx.auth_info.as_ref().map(Message::encode_to_vec).unwrap_or_default(),
signatures: tx.signatures.clone(),
body_bytes: try_tx_s!(tx.body.into_bytes()),
auth_info_bytes: try_tx_s!(tx.auth_info.into_bytes()),
signatures: tx.signatures,
},
}));
}
Expand Down Expand Up @@ -3746,7 +3727,7 @@ pub mod tendermint_coin_tests {
use super::*;

use common::{block_on, wait_until_ms, DEX_FEE_ADDR_RAW_PUBKEY};
use cosmrs::proto::cosmos::tx::v1beta1::{GetTxRequest, GetTxResponse, GetTxsEventResponse};
use cosmrs::proto::cosmos::tx::v1beta1::{GetTxRequest, GetTxResponse};
use crypto::privkey::key_pair_from_seed;
use std::mem::discriminant;

Expand Down Expand Up @@ -3967,30 +3948,21 @@ pub mod tendermint_coin_tests {
))
.unwrap();

let events = "claim_htlc.id='2B925FC83A106CC81590B3DB108AC2AE496FFA912F368FE5E29BC1ED2B754F2C'";
// TODO: Remove deprecated attribute when new version of tendermint-rs is released
#[allow(deprecated)]
let request = GetTxsEventRequest {
events: vec![events.into()],
order_by: TendermintResultOrder::Ascending as i32,
let query = "claim_htlc.id='2B925FC83A106CC81590B3DB108AC2AE496FFA912F368FE5E29BC1ED2B754F2C'".to_owned();
let request = TxSearchRequest {
query,
order_by: TendermintResultOrder::Ascending.into(),
page: 1,
limit: 1,
pagination: None,
per_page: 1,
prove: false,
};
let response = block_on(block_on(coin.rpc_client()).unwrap().abci_query(
Some(ABCI_GET_TXS_EVENT_PATH.to_string()),
request.encode_to_vec(),
ABCI_REQUEST_HEIGHT,
ABCI_REQUEST_PROVE,
))
.unwrap();
let response = block_on(block_on(coin.rpc_client()).unwrap().perform(request)).unwrap();
println!("{:?}", response);

let response = GetTxsEventResponse::decode(response.value.as_slice()).unwrap();
let tx = response.txs.first().unwrap();
let tx = cosmrs::Tx::from_bytes(&response.txs.first().unwrap().tx).unwrap();
println!("{:?}", tx);

let first_msg = tx.body.as_ref().unwrap().messages.first().unwrap();
let first_msg = tx.body.messages.first().unwrap();
println!("{:?}", first_msg);

let claim_htlc = ClaimHtlcProto::decode(HtlcType::Iris, first_msg.value.as_slice()).unwrap();
Expand Down
Loading