Skip to content

Commit 2b661cd

Browse files
committed
edge case + msg
1 parent f2ba206 commit 2b661cd

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

batcher/aligned-sdk/src/communication/messaging.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,15 @@ pub async fn receive(
137137
info!("last_proof_nonce: {}", last_proof_nonce);
138138
info!("last_valid_nonce: {}", last_valid_nonce);
139139
// In the case all proofs are insufficient balance we go over them.
140-
last_proof_nonce -= U256::from(1);
141-
if last_proof_nonce <= first_nonce {
140+
//last_proof_nonce -= U256::from(1);
141+
if last_valid_nonce < last_proof_nonce {
142+
last_proof_nonce = last_valid_nonce;
143+
}
144+
145+
if last_proof_nonce < first_nonce {
142146
break;
143147
}
148+
144149
continue;
145150
}
146151
aligned_submitted_data.push(Err(e));

batcher/aligned/src/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ async fn main() -> Result<(), AlignedError> {
393393
Err(e) => {
394394
warn!("Error while submitting proof: {:?}", e);
395395
handle_submit_err(&e).await;
396-
// In the case of an InsufficientBalance error we record and process the entire msg queue.
396+
// In the case of an InsufficientBalance error we record and continue processing the entire msg queue.
397397
// This covers the case of multiple submissions that succeed but fail for a comulative balance of all max_fee's.
398398
if let SubmitError::InsufficientBalance(_,_) = e {
399399
continue;
@@ -406,6 +406,8 @@ async fn main() -> Result<(), AlignedError> {
406406

407407
match unique_batch_merkle_roots.len() {
408408
1 => info!("Proofs submitted to aligned. See the batch in the explorer:"),
409+
// If no verification data we do not log the msg.
410+
0 => (),
409411
_ => info!("Proofs submitted to aligned. See the batches in the explorer:"),
410412
}
411413

0 commit comments

Comments
 (0)