diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index bc4e010b1..39d60c49f 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -42,9 +42,9 @@ on: merge_group: types: ["checks_requested"] push: - branches: ["nightly", "stable"] + branches: ["nightly", "main"] pull_request: - branches: ["nightly", "stable"] + branches: ["nightly", "main"] types: [opened, synchronize, reopened, ready_for_review] env: @@ -58,7 +58,7 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} # Except in `nightly` and `stable` branches! Any cancelled job will cause the # CI run to fail, and we want to keep a clean history for major branches. - cancel-in-progress: ${{ (github.ref != 'refs/heads/nightly') && (github.ref != 'refs/heads/stable') }} + cancel-in-progress: ${{ (github.ref != 'refs/heads/nightly') && (github.ref != 'refs/heads/main') }} jobs: check: diff --git a/.github/workflows/docker_hive.yml b/.github/workflows/docker_hive.yml index fb225c977..fc2c43544 100644 --- a/.github/workflows/docker_hive.yml +++ b/.github/workflows/docker_hive.yml @@ -15,7 +15,7 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} # Except in `nightly` and `stable` branches! Any cancelled job will cause the # CI run to fail, and we want to keep a clean history for major branches. - cancel-in-progress: ${{ (github.ref != 'refs/heads/nightly') && (github.ref != 'refs/heads/stable') }} + cancel-in-progress: ${{ (github.ref != 'refs/heads/nightly') && (github.ref != 'refs/heads/main') }} jobs: docker: diff --git a/.github/workflows/hive.yml b/.github/workflows/hive.yml index 273e04064..68f2ea233 100644 --- a/.github/workflows/hive.yml +++ b/.github/workflows/hive.yml @@ -16,7 +16,7 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} # Except in `nightly` and `stable` branches! Any cancelled job will cause the # CI run to fail, and we want to keep a clean history for major branches. - cancel-in-progress: ${{ (github.ref != 'refs/heads/nightly') && (github.ref != 'refs/heads/stable') }} + cancel-in-progress: ${{ (github.ref != 'refs/heads/nightly') && (github.ref != 'refs/heads/main') }} jobs: prepare: diff --git a/configs/devnet/rollup_config.toml b/configs/devnet/rollup_config.toml index d2f07b3c4..cba331666 100644 --- a/configs/devnet/rollup_config.toml +++ b/configs/devnet/rollup_config.toml @@ -22,6 +22,6 @@ bind_host = "0.0.0.0" bind_port = 12346 [runner] -sequencer_client_url = "" +sequencer_client_url = "https://rpc.devnet.citrea.xyz" # set this to true if you want to include soft confirmation tx bodies include_tx_body = false diff --git a/crates/ethereum-rpc/src/gas_price/gas_oracle.rs b/crates/ethereum-rpc/src/gas_price/gas_oracle.rs index 4593762ef..3c88a7e5e 100644 --- a/crates/ethereum-rpc/src/gas_price/gas_oracle.rs +++ b/crates/ethereum-rpc/src/gas_price/gas_oracle.rs @@ -8,7 +8,7 @@ use std::sync::Arc; use citrea_evm::Evm; use reth_primitives::basefee::calc_next_block_base_fee; use reth_primitives::constants::GWEI_TO_WEI; -use reth_primitives::{BlockNumberOrTag, B256, U256}; +use reth_primitives::{address, BlockNumberOrTag, B256, U256}; use reth_rpc::eth::error::{EthApiError, EthResult, RpcInvalidTransactionError}; use reth_rpc_types::{BlockTransactions, FeeHistory}; use serde::{Deserialize, Serialize}; @@ -363,6 +363,7 @@ impl GasPriceOracle { // check if coinbase let sender = tx.from; sender != block.header.miner + && sender != address!("deaddeaddeaddeaddeaddeaddeaddeaddeaddead") }) // map all values to effective_gas_tip because we will be returning those values // anyways