Skip to content

Commit 38f68db

Browse files
authored
refactor(katana): make gas oracle a critical task (#2859)
1 parent 3ccea4b commit 38f68db

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

crates/katana/core/src/backend/gas_oracle.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use katana_primitives::block::GasPrices;
99
use katana_tasks::TaskSpawner;
1010
use parking_lot::Mutex;
1111
use tokio::time::Duration;
12-
use tracing::info;
12+
use tracing::error;
1313
use url::Url;
1414

1515
const BUFFER_SIZE: usize = 60;
@@ -83,10 +83,13 @@ impl L1GasOracle {
8383
let prices = oracle.prices.clone();
8484
let l1_provider = oracle.l1_provider.clone();
8585

86-
task_spawner.build_task().graceful_shutdown().name("L1 Gas Oracle worker").spawn(
86+
task_spawner.build_task().critical().name("L1 Gas Oracle worker").spawn(
8787
async move {
8888
let mut worker = GasOracleWorker::new(prices, l1_provider);
89-
worker.run().await
89+
worker
90+
.run()
91+
.await
92+
.inspect_err(|error| error!(target: "gas_oracle", %error, "Gas oracle worker failed."))
9093
},
9194
);
9295
}
@@ -174,13 +177,13 @@ impl GasOracleWorker {
174177

175178
let mut prices = self.prices.lock();
176179

177-
if let Err(e) = update_gas_price(
180+
if let Err(error) = update_gas_price(
178181
&mut prices,
179182
&mut self.gas_price_buffer,
180183
&mut self.data_gas_price_buffer,
181184
fee_history,
182185
) {
183-
info!(%e, "Error running the gas oracle");
186+
error!(target: "gas_oracle", %error, "Error updating gas prices.");
184187
}
185188
}
186189
}

crates/katana/node/src/exit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ impl<'a> NodeStoppedFuture<'a> {
1818
pub(crate) fn new(handle: &'a LaunchedNode) -> Self {
1919
let fut = Box::pin(async {
2020
handle.node.task_manager.wait_for_shutdown().await;
21-
handle.rpc.clone().stopped().await;
21+
handle.rpc.stop()?;
2222
Ok(())
2323
});
2424
Self { fut }

0 commit comments

Comments
 (0)