Skip to content

Commit 3db3479

Browse files
Revert "Add a timeout for the get receipt final calls as alloy does not provide one"
This reverts commit c0aafb2.
1 parent c0aafb2 commit 3db3479

File tree

4 files changed

+10
-26
lines changed

4 files changed

+10
-26
lines changed

aggregation_mode/proof_aggregator/src/backend/config.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ pub struct Config {
2626
pub base_bump_percentage: u64,
2727
pub max_fee_bump_percentage: u64,
2828
pub priority_fee_wei: u128,
29-
pub final_receipt_check_timeout_seconds: u64,
3029
}
3130

3231
impl Config {

aggregation_mode/proof_aggregator/src/backend/mod.rs

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -423,46 +423,33 @@ impl ProofAggregator {
423423
}
424424
}
425425

426-
let receipt_timeout = Duration::from_secs(self.config.final_receipt_check_timeout_seconds);
427-
428426
// After exhausting all retry attempts, we iterate over every pending transaction hash
429427
// that was previously submitted with the same nonce but different gas parameters.
430428
// One of these transactions may have been included in a block while we were still
431429
// retrying and waiting on others. By explicitly checking the receipt for each hash,
432430
// we ensure we don't "lose" a transaction that was actually mined but whose receipt
433431
// we never observed due to timeouts during earlier attempts.
434432
for (i, tx_hash) in pending_hashes.into_iter().enumerate() {
435-
// NOTE: `get_transaction_receipt` has no built-in timeout, so we guard it to
436-
// avoid hanging the aggregator on a stuck RPC call.
437-
match tokio::time::timeout(
438-
receipt_timeout,
439-
self.proof_aggregation_service
440-
.provider()
441-
.get_transaction_receipt(tx_hash),
442-
)
443-
.await
433+
match self
434+
.proof_aggregation_service
435+
.provider()
436+
.get_transaction_receipt(tx_hash)
437+
.await
444438
{
445-
Ok(Ok(Some(receipt))) => {
439+
Ok(Some(receipt)) => {
446440
info!("Pending tx #{} confirmed; returning receipt", i + 1);
447441
return Ok(receipt);
448442
}
449-
Ok(Ok(None)) => {
443+
Ok(None) => {
450444
warn!(
451445
"Pending tx #{} still no receipt yet (hash {})",
452446
i + 1,
453447
tx_hash
454448
);
455449
}
456-
Ok(Err(err)) => {
450+
Err(err) => {
457451
warn!("Pending tx #{} receipt query failed: {:?}", i + 1, err);
458452
}
459-
Err(_) => {
460-
warn!(
461-
"Pending tx #{} receipt query timed out after {:?}",
462-
i + 1,
463-
receipt_timeout
464-
);
465-
}
466453
}
467454
}
468455

config-files/config-proof-aggregator-ethereum-package.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ max_bump_retries: 5
3232
bump_retry_interval_seconds: 120
3333
base_bump_percentage: 10
3434
max_fee_bump_percentage: 100
35-
priority_fee_wei: 3000000000 # 3 Gwei
36-
final_receipt_check_timeout_seconds: 5
35+
priority_fee_wei: 3000000000 // 3 Gwei
3736

3837
ecdsa:
3938
private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

config-files/config-proof-aggregator.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ max_bump_retries: 5
3232
bump_retry_interval_seconds: 120
3333
base_bump_percentage: 10
3434
max_fee_bump_percentage: 100
35-
priority_fee_wei: 3000000000 # 3 Gwei
36-
final_receipt_check_timeout_seconds: 5
35+
priority_fee_wei: 3000000000 // 3 Gwei
3736

3837
ecdsa:
3938
private_key_store_path: "config-files/anvil.proof-aggregator.ecdsa.key.json"

0 commit comments

Comments
 (0)