Skip to content

Commit

Permalink
exclude system transactions from tip cap calc. (#674) (#676)
Browse files Browse the repository at this point in the history
* exclude system transactions from tip cap calc.

* ci runs on prs to main
  • Loading branch information
eyusufatik authored Jun 6, 2024
1 parent d70af38 commit 9dc4cd0
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_hive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion configs/devnet/rollup_config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion crates/ethereum-rpc/src/gas_price/gas_oracle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -363,6 +363,7 @@ impl<C: sov_modules_api::Context> GasPriceOracle<C> {
// 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
Expand Down

0 comments on commit 9dc4cd0

Please sign in to comment.