diff --git a/crates/astria-sequencer-relayer/local.env.example b/crates/astria-sequencer-relayer/local.env.example index 26204a2fe1..504d76773c 100644 --- a/crates/astria-sequencer-relayer/local.env.example +++ b/crates/astria-sequencer-relayer/local.env.example @@ -12,9 +12,6 @@ ASTRIA_SEQUENCER_RELAYER_CELESTIA_ENDPOINT="http://127.0.0.1:26659" # on the host running the celestia node. ASTRIA_SEQUENCER_RELAYER_CELESTIA_BEARER_TOKEN="" -# The gas limit when paying for submitting blobs to celestia -ASTRIA_SEQUENCER_RELAYER_GAS_LIMIT=1000000 - # The duration in milliseconds that sequencer-relayer sleeps before # requesting a new block from sequencer. ASTRIA_SEQUENCER_RELAYER_BLOCK_TIME=1000 diff --git a/crates/astria-sequencer-relayer/src/config.rs b/crates/astria-sequencer-relayer/src/config.rs index 7c62411662..9052a8501f 100644 --- a/crates/astria-sequencer-relayer/src/config.rs +++ b/crates/astria-sequencer-relayer/src/config.rs @@ -10,7 +10,6 @@ pub struct Config { pub sequencer_endpoint: String, pub celestia_endpoint: String, pub celestia_bearer_token: String, - pub gas_limit: u64, pub block_time: u64, pub relay_only_validator_key_blocks: bool, pub validator_key_file: Option, diff --git a/crates/astria-sequencer-relayer/src/relayer.rs b/crates/astria-sequencer-relayer/src/relayer.rs index 76ee8fd641..1d004e8c9b 100644 --- a/crates/astria-sequencer-relayer/src/relayer.rs +++ b/crates/astria-sequencer-relayer/src/relayer.rs @@ -34,12 +34,6 @@ pub(crate) struct Relayer { // The http client for submitting sequencer blocks to celestia. data_availability: celestia_client::jsonrpsee::http_client::HttpClient, - // The fee that relayer will pay for submitting sequencer blocks to the DA. - fee: u64, - - // The limit that relayer will pay for submitting sequencer blocks to the DA. - gas_limit: u64, - // If this is set, only relay blocks to DA which are proposed by the same validator key. validator: Option, @@ -116,9 +110,6 @@ impl Relayer { sequencer, sequencer_poll_period: Duration::from_millis(cfg.block_time), data_availability, - // FIXME (https://github.com/astriaorg/astria/issues/509): allow configuring this - fee: 100_000, - gas_limit: cfg.gas_limit, validator, state_tx, queued_blocks: Vec::new(), @@ -251,6 +242,10 @@ impl Relayer { // Then report update the internal state or report if submission failed match submission_result { Ok(height) => self.state_tx.send_modify(|state| { + debug!( + celestia_height=%height, + "successfully submitted blocks to data availability layer" + ); state.current_data_availability_height.replace(height); }), // TODO: add more context to this error, maybe inject a span? @@ -414,8 +409,6 @@ impl Relayer { let client = self.data_availability.clone(); self.submission_task = Some(task::spawn(submit_blocks_to_celestia( client, - self.fee, - self.gas_limit, self.queued_blocks.clone(), ))); self.queued_blocks.clear(); @@ -465,8 +458,6 @@ fn convert_block_response_to_sequencer_block_data( #[instrument(skip_all)] async fn submit_blocks_to_celestia( client: celestia_client::jsonrpsee::http_client::HttpClient, - fee: u64, - gas_limit: u64, sequencer_block_data: Vec, ) -> eyre::Result { use celestia_client::{ @@ -483,8 +474,8 @@ async fn submit_blocks_to_celestia( .submit_sequencer_blocks( sequencer_block_data, SubmitOptions { - fee: Some(fee), - gas_limit: Some(gas_limit), + fee: None, + gas_limit: None, }, ) .await diff --git a/crates/astria-sequencer-relayer/tests/blackbox/helper.rs b/crates/astria-sequencer-relayer/tests/blackbox/helper.rs index f17292a7f6..13ded8494c 100644 --- a/crates/astria-sequencer-relayer/tests/blackbox/helper.rs +++ b/crates/astria-sequencer-relayer/tests/blackbox/helper.rs @@ -183,7 +183,6 @@ pub async fn spawn_sequencer_relayer( sequencer_endpoint: sequencer.uri(), celestia_endpoint: format!("http://{celestia_addr}"), celestia_bearer_token: String::new(), - gas_limit: 100_000, block_time: 1000, relay_only_validator_key_blocks, validator_key_file: Some(keyfile.path().to_string_lossy().to_string()),