Skip to content

Fix ethereum gas pricing #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
girazoki merged 6 commits into from
Aug 24, 2023
Merged

Fix ethereum gas pricing #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4884c1b
Fix ethereum gas pricing
girazoki Aug 23, 2023
a9c8085
update comment
girazoki Aug 23, 2023
7f309d0
fmt
girazoki Aug 23, 2023
6ef2f02
Merge remote-tracking branch 'origin/master' into girazoki-fix-gasw-t…
girazoki Aug 23, 2023
9557d1d
increment spec versions
girazoki Aug 24, 2023
87472ad
Merge remote-tracking branch 'origin/master' into girazoki-fix-gasw-t…
girazoki Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 9 additions & 24 deletions container-chains/templates/frontier/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ pub mod xcm_config;

use {
crate::precompiles::FrontierPrecompiles,
core::marker::PhantomData,
cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases,
fp_account::EthereumSignature,
fp_evm::weight_per_gas,
Expand All @@ -43,8 +42,8 @@ use {
dispatch::{DispatchClass, GetDispatchInfo},
parameter_types,
traits::{
ConstU32, ConstU64, ConstU8, Contains, Currency as CurrencyT, FindAuthor, Imbalance,
OnFinalize, OnUnbalanced,
ConstU32, ConstU64, ConstU8, Contains, Currency as CurrencyT, Imbalance, OnFinalize,
OnUnbalanced,
},
weights::{
constants::{
Expand All @@ -54,7 +53,6 @@ use {
ConstantMultiplier, Weight, WeightToFeeCoefficient, WeightToFeeCoefficients,
WeightToFeePolynomial,
},
ConsensusEngineId,
},
frame_system::{
limits::{BlockLength, BlockWeights},
Expand All @@ -71,7 +69,7 @@ use {
parity_scale_codec::{Decode, Encode},
smallvec::smallvec,
sp_api::impl_runtime_apis,
sp_core::{crypto::ByteArray, Get, OpaqueMetadata, H160, H256, U256},
sp_core::{Get, OpaqueMetadata, H160, H256, U256},
sp_runtime::{
create_runtime_str, generic, impl_opaque_keys,
traits::{
Expand Down Expand Up @@ -298,7 +296,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("frontier-template"),
impl_name: create_runtime_str!("frontier-template"),
authoring_version: 1,
spec_version: 100,
spec_version: 101,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand Down Expand Up @@ -344,8 +342,8 @@ const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(
cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64,
);

/// We allow for 2000ms of compute with a 6 second average block time.
pub const WEIGHT_MILLISECS_PER_BLOCK: u64 = 2000;
/// We allow for 500ms of compute with a 12 second average block time.
pub const WEIGHT_MILLISECS_PER_BLOCK: u64 = 500;

/// The version information used to identify this runtime when compiled natively.
#[cfg(feature = "std")]
Expand Down Expand Up @@ -585,24 +583,11 @@ impl pallet_cc_authorities_noting::Config for Runtime {
type WeightInfo = pallet_cc_authorities_noting::weights::SubstrateWeight<Runtime>;
}

const BLOCK_GAS_LIMIT: u64 = 75_000_000;
// To match ethereum expectations
const BLOCK_GAS_LIMIT: u64 = 15_000_000;

impl pallet_evm_chain_id::Config for Runtime {}

pub struct FindAuthorTruncated<F>(PhantomData<F>);
impl<F: FindAuthor<u32>> FindAuthor<H160> for FindAuthorTruncated<F> {
fn find_author<'a, I>(digests: I) -> Option<H160>
where
I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,
{
if let Some(author_index) = F::find_author(digests) {
let authority_id = AuthoritiesNoting::authorities()[author_index as usize].clone();
return Some(H160::from_slice(&authority_id.to_raw_vec()[4..24]));
}
None
}
}

parameter_types! {
pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
pub PrecompilesValue: FrontierPrecompiles<Runtime> = FrontierPrecompiles::<_>::new();
Expand Down Expand Up @@ -654,7 +639,7 @@ impl pallet_dynamic_fee::Config for Runtime {
}

parameter_types! {
pub DefaultBaseFeePerGas: U256 = U256::from(1_000_000_000);
pub DefaultBaseFeePerGas: U256 = U256::from(2_000_000_000);
Copy link
Copy Markdown
Contributor Author

@girazoki girazoki Aug 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This internal gets multiplied by the ideal target fullness (50%) to calculate the minimum gas price below which we cannot drop

Copy link
Copy Markdown
Contributor Author

@girazoki girazoki Aug 23, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In short, at most the minimum gas price can drop to 1gWei

pub DefaultElasticity: Permill = Permill::from_parts(125_000);
}

Expand Down
2 changes: 1 addition & 1 deletion container-chains/templates/simple/runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("container-chain-template"),
impl_name: create_runtime_str!("container-chain-template"),
authoring_version: 1,
spec_version: 100,
spec_version: 101,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand Down
3 changes: 2 additions & 1 deletion test/suites/dev-frontier-template/test-eth-block/test-eth-block-pending.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ describeSuite({
test: async function () {
let nonce = 0;
let sendTransaction = async () => {
const gasPrice = (await context.polkadotJs().rpc.eth.gasPrice()).toBigInt();
const tx = await context.web3().eth.accounts.signTransaction(
{
from: ALITH_ADDRESS,
to: TEST_ACCOUNT,
value: "0x200", // Must be higher than ExistentialDeposit
gasPrice: "0x3B9ACA00",
gasPrice: gasPrice,
gas: "0x100000",
nonce: nonce,
},
Expand Down