Merge branch 'paritytech:master' into master

Author: jimjbrettj

crates/anvil-polkadot/src/api_server/server.rs

@@ -67,12 +67,12 @@ use polkadot_sdk::{
     sp_api::{Metadata as _, ProvideRuntimeApi},
     sp_blockchain::Info,
     sp_core::{self, Hasher, keccak_256},
-    sp_runtime::traits::BlakeTwo256,
+    sp_runtime::{FixedU128, traits::BlakeTwo256},
 };
 use revm::primitives::hardfork::SpecId;
 use sqlx::sqlite::SqlitePoolOptions;
 use std::{collections::HashSet, sync::Arc, time::Duration};
-use substrate_runtime::Balance;
+use substrate_runtime::{Balance, constants::NATIVE_TO_ETH_RATIO};
 use subxt::{
     Metadata as SubxtMetadata, OnlineClient, backend::rpc::RpcClient,
     client::RuntimeVersion as SubxtRuntimeVersion, config::substrate::H256,
@@ -119,6 +119,7 @@ impl ApiServer {
             substrate_service.spawn_handle.clone(),
         )
         .await?;
+
         Ok(Self {
             block_provider,
             req_receiver,
@@ -149,6 +150,17 @@ impl ApiServer {
     pub async fn execute(&mut self, req: EthRequest) -> ResponseResult {
         let res = match req.clone() {
             EthRequest::SetLogging(enabled) => self.set_logging(enabled).to_rpc_result(),
+            //------- Gas -----------
+            EthRequest::SetNextBlockBaseFeePerGas(base_fee) => {
+                let latest_block = self.latest_block();
+                // We inject in substrate storage an 1e18 denominated value after transforming it
+                // to a 1e12.
+                self.backend.inject_next_fee_multiplier(
+                    latest_block,
+                    FixedU128::from_rational(base_fee.to::<u128>(), NATIVE_TO_ETH_RATIO.into()),
+                );
+                Ok(()).to_rpc_result()
+            }
 
             //------- Mining---------
             EthRequest::Mine(blocks, interval) => self.mine(blocks, interval).await.to_rpc_result(),
@@ -727,9 +739,11 @@ impl ApiServer {
         if transaction.gas_price.is_none() {
             transaction.gas_price = Some(self.gas_price().await?);
         }
+
         if transaction.nonce.is_none() {
             transaction.nonce = Some(self.get_transaction_count(from, latest_block_id).await?);
         }
+
         if transaction.chain_id.is_none() {
             transaction.chain_id =
                 Some(sp_core::U256::from_big_endian(&self.chain_id(latest_block).to_be_bytes()));

crates/anvil-polkadot/src/cmd.rs

@@ -109,7 +109,6 @@ impl NodeArgs {
         let anvil_config = AnvilNodeConfig::default()
             .with_gas_limit(self.evm.gas_limit)
             .disable_block_gas_limit(self.evm.disable_block_gas_limit)
-            .with_gas_price(self.evm.gas_price)
             .with_blocktime(self.block_time)
             .with_no_mining(self.no_mining)
             .with_mixed_mining(self.mixed_mining, self.block_time)
@@ -198,10 +197,6 @@ pub struct AnvilEvmArgs {
     )]
     pub disable_code_size_limit: bool,
 
-    /// The gas price.
-    #[arg(long, help_heading = "Environment config")]
-    pub gas_price: Option<u128>,
-
     /// The base fee in a block.
     #[arg(
         long,

crates/anvil-polkadot/src/config.rs

@@ -48,11 +48,9 @@ pub const DEFAULT_MNEMONIC: &str = "test test test test test test test test test
 pub const DEFAULT_IPC_ENDPOINT: &str =
     if cfg!(unix) { "/tmp/anvil.ipc" } else { r"\\.\pipe\anvil.ipc" };
 
-/// Initial base fee for EIP-1559 blocks.
-pub const INITIAL_BASE_FEE: u64 = 1_000_000_000;
-
-/// Initial default gas price for the first block
-pub const INITIAL_GAS_PRICE: u128 = 1_875_000_000;
+/// In anvil this is `1_000_000_000`, in 1e18 denomination. However,
+/// asset-hub-westend runtime sets it to `1_000_000`.
+pub const INITIAL_BASE_FEE: u128 = 1_000_000;
 
 const BANNER: &str = r"
                              _   _
@@ -272,10 +270,8 @@ pub struct AnvilNodeConfig {
     pub gas_limit: Option<u128>,
     /// If set to `true`, disables the block gas limit
     pub disable_block_gas_limit: bool,
-    /// Default gas price for all txs
-    pub gas_price: Option<u128>,
     /// Default base fee
-    pub base_fee: Option<u64>,
+    pub base_fee: Option<u128>,
     /// If set to `true`, disables the enforcement of a minimum suggested priority fee
     pub disable_min_priority_fee: bool,
     /// Signer accounts that will be initialised with `genesis_balance` in the genesis block
@@ -482,7 +478,6 @@ Genesis Number
           "private_keys": private_keys,
           "wallet": wallet_description,
           "base_fee": format!("{}", self.get_base_fee()),
-          "gas_price": format!("{}", self.get_gas_price()),
           "gas_limit": gas_limit,
           "genesis_timestamp": format!("{}", self.get_genesis_timestamp()),
         })
@@ -521,7 +516,6 @@ impl Default for AnvilNodeConfig {
             chain_id: None,
             gas_limit: None,
             disable_block_gas_limit: false,
-            gas_price: None,
             signer_accounts: genesis_accounts.clone(),
             genesis_timestamp: None,
             genesis_block_number: None,
@@ -562,18 +556,19 @@ impl AnvilNodeConfig {
         self.memory_limit = mems_value;
         self
     }
+
     /// Returns the base fee to use
-    pub fn get_base_fee(&self) -> u64 {
+    pub fn get_base_fee(&self) -> u128 {
         self.base_fee
-            .or_else(|| self.genesis.as_ref().and_then(|g| g.base_fee_per_gas.map(|g| g as u64)))
+            .or_else(|| {
+                self.genesis.as_ref().and_then(|g| {
+                    // The base fee received via CLI will be transformed to 1e-12.
+                    g.base_fee_per_gas
+                })
+            })
             .unwrap_or(INITIAL_BASE_FEE)
     }
 
-    /// Returns the base fee to use
-    pub fn get_gas_price(&self) -> u128 {
-        self.gas_price.unwrap_or(INITIAL_GAS_PRICE)
-    }
-
     /// Sets a custom code size limit
     #[must_use]
     pub fn with_code_size_limit(mut self, code_size_limit: Option<usize>) -> Self {
@@ -624,17 +619,10 @@ impl AnvilNodeConfig {
         self
     }
 
-    /// Sets the gas price
-    #[must_use]
-    pub fn with_gas_price(mut self, gas_price: Option<u128>) -> Self {
-        self.gas_price = gas_price;
-        self
-    }
-
     /// Sets the base fee
     #[must_use]
     pub fn with_base_fee(mut self, base_fee: Option<u64>) -> Self {
-        self.base_fee = base_fee;
+        self.base_fee = base_fee.map(|bf| bf.into());
         self
     }
 

crates/anvil-polkadot/src/substrate_node/genesis.rs

@@ -15,14 +15,14 @@ use polkadot_sdk::{
     sp_blockchain,
     sp_core::{self, H160, storage::Storage},
     sp_runtime::{
-        BuildStorage,
+        BuildStorage, FixedU128,
         traits::{Block as BlockT, Hash as HashT, HashingFor, Header as HeaderT},
     },
 };
 use serde::{Deserialize, Serialize};
 use serde_json::{Value, json};
 use std::{collections::BTreeMap, marker::PhantomData, sync::Arc};
-use substrate_runtime::WASM_BINARY;
+use substrate_runtime::{WASM_BINARY, constants::NATIVE_TO_ETH_RATIO};
 use subxt_signer::eth::Keypair;
 
 /// Genesis settings
@@ -38,7 +38,7 @@ pub struct GenesisConfig {
     /// The initial number for the genesis block
     pub number: u32,
     /// The genesis header base fee
-    pub base_fee_per_gas: u64,
+    pub base_fee_per_gas: FixedU128,
     /// The genesis header gas limit.
     pub gas_limit: Option<u128>,
     /// Signer accounts from account_generator
@@ -65,7 +65,10 @@ impl<'a> From<&'a AnvilNodeConfig> for GenesisConfig {
                 .get_genesis_number()
                 .try_into()
                 .expect("Genesis block number overflow"),
-            base_fee_per_gas: anvil_config.get_base_fee(),
+            base_fee_per_gas: FixedU128::from_rational(
+                anvil_config.get_base_fee(),
+                NATIVE_TO_ETH_RATIO.into(),
+            ),
             gas_limit: anvil_config.gas_limit,
             genesis_accounts: anvil_config.genesis_accounts.clone(),
             genesis_balance: anvil_config.genesis_balance,
@@ -155,6 +158,9 @@ impl GenesisConfig {
             "revive": {
                 "accounts": revive_genesis_accounts,
             },
+            "transactionPayment": {
+                "multiplier": self.base_fee_per_gas.into_inner().to_string(),
+            }
         })
     }
 }
@@ -265,11 +271,13 @@ mod tests {
         let timestamp: u64 = 10;
         let chain_id: u64 = 42;
         let authority_id: [u8; 32] = [0xEE; 32];
+        let base_fee_per_gas = FixedU128::from_rational(6_000_000, NATIVE_TO_ETH_RATIO.into());
         let genesis_config = GenesisConfig {
             number: block_number,
             timestamp,
             chain_id,
             coinbase: Some(Address::from([0xEE; 20])),
+            base_fee_per_gas,
             ..Default::default()
         };
         let genesis_storage = genesis_config.as_storage_key_value();

crates/anvil-polkadot/src/substrate_node/service/backend.rs

@@ -13,6 +13,7 @@ use polkadot_sdk::{
     sp_blockchain,
     sp_core::{H160, H256},
     sp_io::hashing::blake2_256,
+    sp_runtime::FixedU128,
     sp_state_machine::{StorageKey, StorageValue},
 };
 use std::{collections::HashMap, num::NonZeroUsize, sync::Arc};
@@ -30,6 +31,8 @@ pub enum BackendError {
     MissingAuraAuthorities,
     #[error("Could not find timestamp in the state")]
     MissingTimestamp,
+    #[error("Could not find the next fee multiplier in the state")]
+    MissingNextFeeMultiplier,
     #[error("Could not find block number in the state")]
     MissingBlockNumber,
     #[error("Unable to decode total issuance {0}")]
@@ -50,6 +53,8 @@ pub enum BackendError {
     DecodeBlockNumber(codec::Error),
     #[error("Unable to decode aura authorities: {0}")]
     DecodeAuraAuthorities(codec::Error),
+    #[error("Unable to decode the next fee multiplier: {0}")]
+    DecodeNextFeeMultiplier(codec::Error),
 }
 
 type Result<T> = std::result::Result<T, BackendError>;
@@ -175,6 +180,11 @@ impl BackendWithOverlay {
         overrides.set_coinbase(at, aura_authority);
     }
 
+    pub fn inject_next_fee_multiplier(&self, at: Hash, next_fee_multiplier: FixedU128) {
+        let mut overrides = self.overrides.lock();
+        overrides.set_next_fee_multiplier(at, next_fee_multiplier);
+    }
+
     pub fn inject_total_issuance(&self, at: Hash, value: Balance) {
         let mut overrides = self.overrides.lock();
         overrides.set_total_issuance(at, value);
@@ -274,6 +284,16 @@ impl StorageOverrides {
         self.add(latest_block, changeset);
     }
 
+    fn set_next_fee_multiplier(&mut self, latest_block: Hash, next_fee_multiplier: FixedU128) {
+        let mut changeset = BlockOverrides::default();
+        changeset.top.insert(
+            well_known_keys::NEXT_FEE_MULTIPLIER.to_vec(),
+            Some(next_fee_multiplier.encode()),
+        );
+
+        self.add(latest_block, changeset);
+    }
+
     fn set_system_account_info(
         &mut self,
         latest_block: Hash,

crates/anvil-polkadot/src/substrate_node/service/storage.rs

@@ -48,6 +48,12 @@ pub mod well_known_keys {
         154, 166, 12, 2, 190, 154, 220, 201, 138, 13, 29,
     ];
 
+    //twox_128(b"TransactionPayment" + b"NextFeeMultiplier")
+    pub const NEXT_FEE_MULTIPLIER: [u8; 32] = [
+        63, 20, 103, 160, 150, 188, 215, 26, 91, 106, 12, 129, 85, 226, 8, 16, 63, 46, 223, 59,
+        223, 56, 29, 235, 227, 49, 171, 116, 70, 173, 223, 220,
+    ];
+
     pub fn system_account_info(account_id: AccountId) -> Vec<u8> {
         let mut key = Vec::new();
         key.extend_from_slice(&twox_128("System".as_bytes()));

crates/anvil-polkadot/substrate-runtime/Cargo.toml

@@ -21,6 +21,7 @@ polkadot-sdk = { git = "https://github.com/paritytech/polkadot-sdk.git", branch
 	"pallet-transaction-payment",
 	"pallet-transaction-payment-rpc-runtime-api",
 	"parachains-common",
+	"polkadot-runtime-common",
 	"runtime",
 	"sp-consensus-aura",
 	"with-tracing",

crates/anvil-polkadot/substrate-runtime/src/lib.rs

@@ -22,12 +22,13 @@ use pallet_revive::{
         runtime::EthExtra,
     },
 };
-use pallet_transaction_payment::{ConstFeeMultiplier, FeeDetails, Multiplier, RuntimeDispatchInfo};
+use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo};
 use polkadot_sdk::{
     parachains_common::{
         AccountId, AssetHubPolkadotAuraId as AuraId, BlockNumber, Hash as CommonHash, Header,
         Nonce, Signature,
     },
+    polkadot_runtime_common::SlowAdjustingFeeUpdate,
     polkadot_sdk_frame::{
         deps::sp_genesis_builder,
         runtime::{apis, prelude::*},
@@ -41,6 +42,11 @@ use polkadot_sdk::{
 pub use polkadot_sdk::parachains_common::Balance;
 use sp_weights::ConstantMultiplier;
 
+pub mod constants {
+    /// DOT precision (1e12) to ETH precision (1e18) ratio.
+    pub const NATIVE_TO_ETH_RATIO: u32 = 1_000_000;
+}
+
 pub mod currency {
     use super::Balance;
     pub const DOLLARS: Balance = 1_000_000_000_000;
@@ -257,17 +263,27 @@ impl pallet_sudo::Config for Runtime {}
 impl pallet_timestamp::Config for Runtime {}
 
 parameter_types! {
-    pub const TransactionByteFee: Balance = 10 * MILLICENTS;
-    pub FeeMultiplier: Multiplier = Multiplier::one();
+    // That's how asset-hub-westend sets this.
+    pub const TransactionByteFee: Balance = MILLICENTS;
 }
 
+// That's how asset-hub-westend sets this.
+pub type WeightToFee = BlockRatioFee<
+    // p
+    CENTS,
+    // q
+    { 100 * ExtrinsicBaseWeight::get().ref_time() as u128 },
+    Runtime,
+>;
+
 // Implements the types required for the transaction payment pallet.
 #[derive_impl(pallet_transaction_payment::config_preludes::TestDefaultConfig)]
 impl pallet_transaction_payment::Config for Runtime {
     type OnChargeTransaction = pallet_transaction_payment::FungibleAdapter<Balances, ()>;
-    type WeightToFee = BlockRatioFee<1, 1, Self>;
+    type WeightToFee = WeightToFee;
     type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
-    type FeeMultiplierUpdate = ConstFeeMultiplier<FeeMultiplier>;
+    // That's how asset-hub-westend sets this.
+    type FeeMultiplierUpdate = SlowAdjustingFeeUpdate<Self>;
 }
 
 parameter_types! {
@@ -299,7 +315,7 @@ impl pallet_revive::Config for Runtime {
     // `forking` feature.
     type FindAuthor = BlockAuthor;
     type Balance = Balance;
-    type NativeToEthRatio = ConstU32<1_000_000>;
+    type NativeToEthRatio = ConstU32<{ constants::NATIVE_TO_ETH_RATIO }>;
     type UploadOrigin = EnsureSigned<Self::AccountId>;
     type InstantiateOrigin = EnsureSigned<Self::AccountId>;
     type Time = Timestamp;