diff --git a/Cargo.lock b/Cargo.lock index 921ceda4..9b4eb084 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -399,6 +399,7 @@ dependencies = [ "mesh-apis", "mesh-native-staking", "mesh-native-staking-proxy", + "mesh-sync", "mesh-vault", "schemars", "serde", diff --git a/contracts/provider/external-staking/Cargo.toml b/contracts/provider/external-staking/Cargo.toml index 12c4591f..424ddbfc 100644 --- a/contracts/provider/external-staking/Cargo.toml +++ b/contracts/provider/external-staking/Cargo.toml @@ -39,6 +39,7 @@ anyhow = { workspace = true } mesh-vault = { workspace = true, features = ["mt"] } mesh-native-staking-proxy = { workspace = true, features = ["mt"] } mesh-native-staking = { workspace = true, features = ["mt"] } +mesh-sync = { workspace = true } [[bin]] name = "schema" diff --git a/contracts/provider/external-staking/src/multitest.rs b/contracts/provider/external-staking/src/multitest.rs index 0d57f8d2..c93a0d80 100644 --- a/contracts/provider/external-staking/src/multitest.rs +++ b/contracts/provider/external-staking/src/multitest.rs @@ -1,3 +1,5 @@ +use anyhow::Result as AnyResult; + use cosmwasm_std::{coin, coins, to_binary, Addr, Decimal}; use mesh_native_staking::contract::multitest_utils::CodeId as NativeStakingCodeId; use mesh_native_staking::contract::InstantiateMsg as NativeStakingInstantiateMsg; @@ -6,6 +8,8 @@ use mesh_vault::contract::multitest_utils::{CodeId as VaultCodeId, VaultContract use mesh_vault::contract::test_utils::VaultApi; use mesh_vault::msg::StakingInitInfo; +use mesh_sync::Tx; + use cw_multi_test::App as MtApp; use sylvia::multitest::App; @@ -14,8 +18,6 @@ use crate::contract::multitest_utils::{CodeId, ExternalStakingContractProxy}; use crate::error::ContractError; use crate::msg::{ReceiveVirtualStake, StakeInfo}; -use anyhow::Result as AnyResult; - const OSMO: &str = "osmo"; const STAR: &str = "star"; @@ -285,7 +287,9 @@ fn staking() { #[track_caller] fn get_last_pending_tx_id(vault: &VaultContractProxy) -> Option { let txs = vault.all_pending_txs(None, None).unwrap().txs; - txs.first().map(|tx| tx.id) + txs.first().map(|tx| match tx { + Tx::InFlightStaking { id, .. } => *id, + }) } #[test]