Skip to content
Merged
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
51 changes: 51 additions & 0 deletions src/modules/usdt/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@ struct ChainState {
block_timestamps: std::collections::BTreeMap<u64, alloy_primitives::U256>,
reject_broadcast: bool,
delay_gas_estimate: bool,
send_read_barrier: Option<(std::sync::Arc<tokio::sync::Barrier>, usize)>,
bridge_messages: std::collections::HashMap<String, serde_json::Value>,
bridge_requests: Vec<String>,
bridge_delay: std::time::Duration,
Expand Down Expand Up @@ -517,6 +518,7 @@ impl MockChain {
block_timestamps: Default::default(),
reject_broadcast: false,
delay_gas_estimate: false,
send_read_barrier: None,
bridge_messages: Default::default(),
bridge_requests: vec![],
bridge_delay: std::time::Duration::ZERO,
Expand Down Expand Up @@ -633,6 +635,28 @@ impl MockChain {
} else {
std::time::Duration::ZERO
};
let send_read_barrier = {
let mut state = server_state.lock().unwrap();
let barrier = if matches!(method, "eth_call" | "eth_getCode") {
state
.send_read_barrier
.as_mut()
.map(|(barrier, remaining)| {
*remaining -= 1;
barrier.clone()
})
} else {
None
};
if state
.send_read_barrier
.as_ref()
.is_some_and(|(_, remaining)| *remaining == 0)
{
state.send_read_barrier = None;
}
barrier
};
let mut response = if http_method == "GET" {
serde_json::json!({"networks":["ethereum", "polygon", "plasma", "base", "bsc", "solana", "tron", "unknown-network"]})
} else {
Expand All @@ -658,6 +682,9 @@ impl MockChain {
let response=format!("HTTP/1.1 200 OK\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{response}",response.len());
while requests.try_join_next().is_some() {}
requests.spawn(async move {
if let Some(barrier) = send_read_barrier {
barrier.wait().await;
}
tokio::time::sleep(bridge_delay).await;
let _ = socket.write_all(response.as_bytes()).await;
});
Expand Down Expand Up @@ -1244,6 +1271,30 @@ async fn fluctuating_gas_estimates_preserve_the_reviewed_operation() {
assert!(signed.pre_verification_gas < U256::from(100_000));
}

#[tokio::test]
async fn send_preflight_reads_overlap_before_signing() {
let chain = MockChain::start().await;
let dir = tempfile::tempdir().unwrap();
let wallet = chain.wallet(&dir);
let quote = wallet
.quote_transfer(RECIPIENT.into(), 1_000_000, UsdtDestination::Arbitrum)
.await
.unwrap();
chain.state.lock().unwrap().send_read_barrier =
Some((std::sync::Arc::new(tokio::sync::Barrier::new(3)), 3));
let sent = tokio::time::timeout(
std::time::Duration::from_secs(10),
wallet.send(quote.id, TEST_PHRASE.into(), None),
)
.await
.expect("nonce, delegation and balance reads must run concurrently")
.unwrap();
assert_eq!(sent.status, UsdtTransferStatus::Pending);
let state = chain.state.lock().unwrap();
assert!(state.send_read_barrier.is_none());
assert_eq!(state.operations.len(), 1);
}

#[tokio::test]
async fn wrong_network_owner_nonce_balance_and_paymaster_cannot_sign() {
use alloy_primitives::{Address, U256};
Expand Down
10 changes: 6 additions & 4 deletions src/modules/usdt/wallet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,17 @@ impl UsdtWallet {
return Err(UsdtError::QuoteExpired);
}
self.rpc.verify_chain().await?;
if self.nonce("latest").await? != data.plan.operation.nonce {
let (nonce, authorization, ()) = tokio::try_join!(
self.nonce("latest"),
self.authorization(),
self.require_balance(data.quote.amount, data.quote.maximum_fee),
)?;
if nonce != data.plan.operation.nonce {
return Err(UsdtError::QuoteExpired);
}
let authorization = self.authorization().await?;
if authorization.nonce != data.plan.operation.eip7702_auth.nonce {
return Err(UsdtError::QuoteExpired);
}
self.require_balance(data.quote.amount, data.quote.maximum_fee)
.await?;
self.validate_bridge(&data.plan).await?;
self.paymaster.validate_gas(&data.plan.operation).await?;
let block = self.block_number().await?;
Expand Down
Loading