Skip to content

Commit

Permalink
Update stacks integration to use the new message_id from events.
Browse files Browse the repository at this point in the history
  • Loading branch information
@raress96
raress96 committed Nov 8, 2024
1 parent 66f2d90 commit 9693d4e
Show file tree
Hide file tree
Showing 5 changed files with 149 additions and 143 deletions.
102 changes: 61 additions & 41 deletions ampd/src/handlers/stacks_verify_msg.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use std::collections::HashSet;
use std::convert::TryInto;

use async_trait::async_trait;
use axelar_wasm_std::msg_id::HexTxHashAndEventIndex;
use axelar_wasm_std::voting::{PollId, Vote};
use cosmrs::cosmwasm::MsgExecuteContract;
use cosmrs::tx::Msg;
Expand All @@ -14,23 +15,23 @@ use futures::future;
use router_api::ChainName;
use serde::Deserialize;
use tokio::sync::watch::Receiver;
use tracing::info;
use tracing::{info, info_span};
use valuable::Valuable;
use voting_verifier::msg::ExecuteMsg;

use crate::event_processor::EventHandler;
use crate::handlers::errors::Error;
use crate::stacks::http_client::{Client, Transaction};
use crate::stacks::http_client::Client;
use crate::stacks::verifier::verify_message;
use crate::types::{Hash, TMAddress};

type Result<T> = error_stack::Result<T, Error>;

#[derive(Deserialize, Debug)]
pub struct Message {
pub tx_id: Hash,
pub event_index: u32,
pub message_id: HexTxHashAndEventIndex,
pub destination_address: String,
pub destination_chain: router_api::ChainName,
pub destination_chain: ChainName,
pub source_address: String,
pub payload_hash: Hash,
}
Expand Down Expand Up @@ -132,29 +133,55 @@ impl EventHandler for Handler {
return Ok(vec![]);
}

let tx_hashes: HashSet<_> = messages.iter().map(|message| message.tx_id).collect();
let tx_hashes: HashSet<Hash> = messages
.iter()
.map(|message| message.message_id.tx_hash.into())
.collect();
let transactions = self.http_client.get_transactions(tx_hashes).await;

let futures = messages.iter().map(|msg| async {
match transactions.get(&msg.tx_id) {
Some(transaction) => {
verify_message(
&source_chain,
&source_gateway_address,
&self.its_address,
transaction,
msg,
&self.http_client,
&self.reference_native_interchain_token_code,
&self.reference_token_manager_code,
)
.await
let message_ids = messages
.iter()
.map(|message| message.message_id.to_string())
.collect::<Vec<_>>();

let votes = info_span!(
"verify messages in poll",
poll_id = poll_id.to_string(),
source_chain = source_chain.to_string(),
message_ids = message_ids.as_value()
)
.in_scope(|| async {
info!("ready to verify messages in poll",);

let futures = messages.iter().map(|msg| async {
match transactions.get(&msg.message_id.tx_hash.into()) {
Some(transaction) => {
verify_message(
&source_chain,
&source_gateway_address,
&self.its_address,
transaction,
msg,
&self.http_client,
&self.reference_native_interchain_token_code,
&self.reference_token_manager_code,
)
.await
}
None => Vote::NotFound,
}
None => Vote::NotFound,
}
});
});

let votes: Vec<Vote> = future::join_all(futures).await;
let votes: Vec<Vote> = future::join_all(futures).await;

info!(
votes = votes.as_value(),
"ready to vote for messages in poll"
);

votes
})
.await;

Ok(vec![self
.vote_msg(poll_id, votes)
Expand All @@ -168,6 +195,7 @@ mod tests {
use std::collections::HashMap;
use std::convert::TryInto;

use axelar_wasm_std::msg_id::HexTxHashAndEventIndex;
use cosmrs::cosmwasm::MsgExecuteContract;
use cosmrs::tx::Msg;
use cosmwasm_std;
Expand All @@ -176,7 +204,7 @@ mod tests {
use tokio::test as async_test;
use voting_verifier::events::{PollMetadata, PollStarted, TxEventConfirmation};

use super::{Handler, PollStartedEvent};
use super::{Handler, Message, PollStartedEvent};
use crate::event_processor::EventHandler;
use crate::handlers::tests::into_structured_event;
use crate::stacks::http_client::{Client, ContractInfo};
Expand All @@ -201,15 +229,9 @@ mod tests {
== "SP2N959SER36FZ5QT1CX9BR63W3E8X35WQCMBYYWC.axelar-gateway"
);

let message = event.messages.first().unwrap();
let message: &Message = event.messages.first().unwrap();

assert!(
message.tx_id
== "0xee0049faf8dde5507418140ed72bd64f73cc001b08de98e0c16a3a8d9f2c38cf"
.parse()
.unwrap(),
);
assert!(message.event_index == 1u32);
assert!(message.message_id.event_index == 1u64);
assert!(message.destination_chain == "ethereum");
assert!(message.source_address == "ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM");
}
Expand Down Expand Up @@ -369,6 +391,8 @@ mod tests {
}

fn poll_started_event(participants: Vec<TMAddress>) -> PollStarted {
let msg_id = HexTxHashAndEventIndex::new(Hash::random(), 1u64);

PollStarted::Messages {
metadata: PollMetadata {
poll_id: "100".parse().unwrap(),
Expand All @@ -383,15 +407,11 @@ mod tests {
.map(|addr| cosmwasm_std::Addr::unchecked(addr.to_string()))
.collect(),
},
#[allow(deprecated)] // TODO: The below events use the deprecated tx_id and event_index fields. Remove this attribute when those fields are removed
messages: vec![TxEventConfirmation {
tx_id: "0xee0049faf8dde5507418140ed72bd64f73cc001b08de98e0c16a3a8d9f2c38cf"
.parse()
.unwrap(),
event_index: 1,
message_id: "0xdfaf64de66510723f2efbacd7ead3c4f8c856aed1afc2cb30254552aeda47312-1"
.to_string()
.parse()
.unwrap(),
tx_id: msg_id.tx_hash_as_hex(),
event_index: u32::try_from(msg_id.event_index).unwrap(),
message_id: msg_id.to_string().parse().unwrap(),
source_address: "ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM".parse().unwrap(),
destination_chain: "ethereum".parse().unwrap(),
destination_address: format!("0x{:x}", EVMAddress::random()).parse().unwrap(),
Expand Down
35 changes: 14 additions & 21 deletions ampd/src/handlers/stacks_verify_verifier_set.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::convert::TryInto;

use async_trait::async_trait;
use axelar_wasm_std::msg_id::HexTxHashAndEventIndex;
use axelar_wasm_std::voting::{PollId, Vote};
use cosmrs::cosmwasm::MsgExecuteContract;
use cosmrs::tx::Msg;
Expand All @@ -20,12 +21,11 @@ use crate::event_processor::EventHandler;
use crate::handlers::errors::Error;
use crate::stacks::http_client::Client;
use crate::stacks::verifier::verify_verifier_set;
use crate::types::{Hash, TMAddress};
use crate::types::TMAddress;

#[derive(Deserialize, Debug)]
pub struct VerifierSetConfirmation {
pub tx_id: Hash,
pub event_index: u32,
pub message_id: HexTxHashAndEventIndex,
pub verifier_set: VerifierSet,
}

Expand Down Expand Up @@ -110,13 +110,13 @@ impl EventHandler for Handler {

let transaction = self
.http_client
.get_valid_transaction(&verifier_set.tx_id)
.get_valid_transaction(&verifier_set.message_id.tx_hash.into())
.await;

let vote = info_span!(
"verify a new verifier set for Stacks",
poll_id = poll_id.to_string(),
id = format!("{}_{}", verifier_set.tx_id, verifier_set.event_index)
id = verifier_set.message_id.to_string(),
)
.in_scope(|| {
info!("ready to verify a new worker set in poll");
Expand All @@ -143,6 +143,7 @@ impl EventHandler for Handler {
mod tests {
use std::convert::TryInto;

use axelar_wasm_std::msg_id::HexTxHashAndEventIndex;
use cosmrs::cosmwasm::MsgExecuteContract;
use cosmrs::tx::Msg;
use cosmwasm_std;
Expand All @@ -158,7 +159,7 @@ mod tests {
use crate::event_processor::EventHandler;
use crate::handlers::tests::into_structured_event;
use crate::stacks::http_client::Client;
use crate::types::TMAddress;
use crate::types::{Hash, TMAddress};
use crate::PREFIX;

#[test]
Expand All @@ -181,13 +182,7 @@ mod tests {

let verifier_set = event.verifier_set;

assert!(
verifier_set.tx_id
== "0xee0049faf8dde5507418140ed72bd64f73cc001b08de98e0c16a3a8d9f2c38cf"
.parse()
.unwrap()
);
assert!(verifier_set.event_index == 1u32);
assert!(verifier_set.message_id.event_index == 1u64);
assert!(verifier_set.verifier_set.signers.len() == 3);
assert_eq!(verifier_set.verifier_set.threshold, Uint128::from(2u128));

Expand Down Expand Up @@ -322,6 +317,8 @@ mod tests {
participants: Vec<TMAddress>,
expires_at: u64,
) -> PollStarted {
let msg_id = HexTxHashAndEventIndex::new(Hash::random(), 1u64);

PollStarted::VerifierSet {
metadata: PollMetadata {
poll_id: "100".parse().unwrap(),
Expand All @@ -336,15 +333,11 @@ mod tests {
.map(|addr| cosmwasm_std::Addr::unchecked(addr.to_string()))
.collect(),
},
#[allow(deprecated)] // TODO: The below events use the deprecated tx_id and event_index fields. Remove this attribute when those fields are removed
verifier_set: VerifierSetConfirmation {
tx_id: "0xee0049faf8dde5507418140ed72bd64f73cc001b08de98e0c16a3a8d9f2c38cf"
.parse()
.unwrap(),
event_index: 1,
message_id: "0xdfaf64de66510723f2efbacd7ead3c4f8c856aed1afc2cb30254552aeda47312-1"
.to_string()
.parse()
.unwrap(),
tx_id: msg_id.tx_hash_as_hex(),
event_index: u32::try_from(msg_id.event_index).unwrap(),
message_id: msg_id.to_string().parse().unwrap(),
verifier_set: build_verifier_set(KeyType::Ecdsa, &ecdsa_test_data::signers()),
},
}
Expand Down
2 changes: 1 addition & 1 deletion ampd/src/stacks/http_client.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pub struct ContractLog {

#[derive(Debug, Deserialize, Default)]
pub struct TransactionEvents {
pub event_index: u32,
pub event_index: u64,
pub tx_id: String,
pub contract_log: Option<ContractLog>,
}
Expand Down
Loading

0 comments on commit 9693d4e

Please sign in to comment.