From e5119fa69aa51d224eb8122e53daad947154ea6d Mon Sep 17 00:00:00 2001 From: crazywriter1 Date: Mon, 27 Jul 2026 19:53:57 +0300 Subject: [PATCH 1/2] fix(committor): propagate tx assembly errors in prepare_for_strategy Replace .expect() with ? so assembly failures return an error instead of panicking the committor worker. Fixes #1018 --- .../src/transaction_preparator/mod.rs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/magicblock-committor-service/src/transaction_preparator/mod.rs b/magicblock-committor-service/src/transaction_preparator/mod.rs index a301e27cf..55680cae7 100644 --- a/magicblock-committor-service/src/transaction_preparator/mod.rs +++ b/magicblock-committor-service/src/transaction_preparator/mod.rs @@ -101,16 +101,14 @@ impl TransactionPreparator for TransactionPreparatorImpl { .await?; metrics::observe_committor_intent_alt_count(lookup_tables.len()); - let message = - TransactionUtils::assemble_tasks_tx_with_uniqueness_nonce( - authority, - &tx_strategy.optimized_tasks, - self.compute_budget_config.compute_unit_price, - &lookup_tables, - tx_strategy.uniqueness_nonce, - ) - .expect("Possibility to assemble checked above") - .message; + let message = TransactionUtils::assemble_tasks_tx_with_uniqueness_nonce( + authority, + &tx_strategy.optimized_tasks, + self.compute_budget_config.compute_unit_price, + &lookup_tables, + tx_strategy.uniqueness_nonce, + )? + .message; Ok(message) } From 8f8d70d7f1821dd12f9b796745dbc33ff62539e9 Mon Sep 17 00:00:00 2001 From: crazywriter1 Date: Wed, 5 Aug 2026 11:36:27 +0300 Subject: [PATCH 2/2] style(committor): fmt transaction_preparator for ci-fmt --- .../src/transaction_preparator/mod.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/magicblock-committor-service/src/transaction_preparator/mod.rs b/magicblock-committor-service/src/transaction_preparator/mod.rs index 55680cae7..d844aa04c 100644 --- a/magicblock-committor-service/src/transaction_preparator/mod.rs +++ b/magicblock-committor-service/src/transaction_preparator/mod.rs @@ -101,14 +101,15 @@ impl TransactionPreparator for TransactionPreparatorImpl { .await?; metrics::observe_committor_intent_alt_count(lookup_tables.len()); - let message = TransactionUtils::assemble_tasks_tx_with_uniqueness_nonce( - authority, - &tx_strategy.optimized_tasks, - self.compute_budget_config.compute_unit_price, - &lookup_tables, - tx_strategy.uniqueness_nonce, - )? - .message; + let message = + TransactionUtils::assemble_tasks_tx_with_uniqueness_nonce( + authority, + &tx_strategy.optimized_tasks, + self.compute_budget_config.compute_unit_price, + &lookup_tables, + tx_strategy.uniqueness_nonce, + )? + .message; Ok(message) }