moondance-labs · tmpolaczyk · Nov 3, 2025 · Sep 26, 2025 · Sep 26, 2025 · Sep 26, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/chains/container-chains/nodes/frontier/src/command.rs b/chains/container-chains/nodes/frontier/src/command.rs
@@ -267,7 +267,14 @@ pub fn run() -> Result<()> {
                     let partials = NodeConfig::new_builder(&config, None)?;
                     let db = partials.backend.expose_db();
                     let storage = partials.backend.expose_storage();
-                    cmd.run(config, partials.client.clone(), db, storage)
+                    let shared_trie_cache = partials.backend.expose_shared_trie_cache();
+                    cmd.run(
+                        config,
+                        partials.client.clone(),
+                        db,
+                        storage,
+                        shared_trie_cache,
+                    )
                 }),
                 BenchmarkCmd::Machine(cmd) => {
                     runner.sync_run(|config| cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone()))
@@ -363,7 +370,7 @@ pub fn run() -> Result<()> {
                     }
                 }
 
-                match config.network.network_backend.unwrap_or(sc_network::config::NetworkBackendType::Libp2p) {
+                match config.network.network_backend {
                     sc_network::config::NetworkBackendType::Libp2p => {
                         crate::service::start_parachain_node::<sc_network::NetworkWorker<_, _>>(
                             config,

diff --git a/chains/container-chains/nodes/frontier/src/rpc/mod.rs b/chains/container-chains/nodes/frontier/src/rpc/mod.rs
@@ -29,11 +29,12 @@ use {
     cumulus_client_parachain_inherent::ParachainInherentData,
     cumulus_primitives_core::{ParaId, PersistedValidationData},
     cumulus_test_relay_sproof_builder::RelayStateSproofBuilder,
+    fc_mapping_sync::{kv::MappingSyncWorker, SyncStrategy},
     fc_rpc::{
         EthApiServer, EthFilterApiServer, EthPubSubApiServer, EthTask, TxPool, TxPoolApiServer,
     },
     fc_storage::StorageOverride,
-    fp_rpc::EthereumRuntimeRPCApi,
+    fp_rpc::{EthereumRuntimeRPCApi, NoTransactionConverter},
     frame_support::CloneNoBound,
     futures::StreamExt,
     jsonrpsee::RpcModule,
@@ -175,16 +176,7 @@ where
     // TODO: are we supporting signing?
     let signers = Vec::new();
 
-    enum Never {}
-    impl<T> fp_rpc::ConvertTransaction<T> for Never {
-        fn convert_transaction(&self, _transaction: pallet_ethereum::Transaction) -> T {
-            // The Never type is not instantiable, but this method requires the type to be
-            // instantiated to be called (`&self` parameter), so if the code compiles we have the
-            // guarantee that this function will never be called.
-            unreachable!()
-        }
-    }
-    let convert_transaction: Option<Never> = None;
+    let convert_transaction: Option<NoTransactionConverter> = None;
     let authorities = vec![tc_consensus::get_aura_id_from_seed("alice")];
     let authorities_for_cdp = authorities.clone();
 
@@ -223,6 +215,8 @@ where
                 relay_chain_state,
                 downward_messages: Default::default(),
                 horizontal_messages: Default::default(),
+                relay_parent_descendants: Default::default(),
+                collator_peer_id: Default::default(),
             };
             Ok((
                 timestamp,
@@ -346,7 +340,6 @@ pub struct SpawnTasksParams<'a, B: BlockT, C, BE> {
     >,
 }
 
-use fc_mapping_sync::{kv::MappingSyncWorker, SyncStrategy};
 /// Spawn the tasks that are required to run Moonbeam.
 pub fn spawn_essential_tasks<B, C, BE>(params: SpawnTasksParams<B, C, BE>)
 where

diff --git a/chains/container-chains/nodes/frontier/src/service.rs b/chains/container-chains/nodes/frontier/src/service.rs
@@ -417,7 +417,7 @@ pub async fn start_dev_node(
 
                 let mut timestamp = 0u64;
                 TIMESTAMP.with(|x| {
-                    timestamp = x.clone().take();
+                    timestamp = *x.borrow();
                 });
 
                 timestamp += slot_duration;

diff --git a/chains/container-chains/nodes/simple/src/command.rs b/chains/container-chains/nodes/simple/src/command.rs
@@ -251,7 +251,14 @@ pub fn run() -> Result<()> {
                     let partials = NodeConfig::new_builder(&config, None)?;
                     let db = partials.backend.expose_db();
                     let storage = partials.backend.expose_storage();
-                    cmd.run(config, partials.client.clone(), db, storage)
+                    let shared_trie_cache = partials.backend.expose_shared_trie_cache();
+                    cmd.run(
+                        config,
+                        partials.client.clone(),
+                        db,
+                        storage,
+                        shared_trie_cache,
+                    )
                 }),
                 BenchmarkCmd::Machine(cmd) => {
                     runner.sync_run(|config| cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone()))
@@ -336,7 +343,7 @@ pub fn run() -> Result<()> {
                     }
                 }
 
-                match config.network.network_backend.unwrap_or(sc_network::config::NetworkBackendType::Libp2p) {
+                match config.network.network_backend {
                     sc_network::config::NetworkBackendType::Libp2p => {
                         crate::service::start_parachain_node::<sc_network::NetworkWorker<_, _>>(
                             config,

diff --git a/chains/container-chains/nodes/simple/src/service.rs b/chains/container-chains/nodes/simple/src/service.rs
@@ -258,7 +258,7 @@ pub async fn start_dev_node(
 
                 let mut timestamp = 0u64;
                 TIMESTAMP.with(|x| {
-                    timestamp = x.clone().take();
+                    timestamp = *x.borrow();
                 });
 
                 timestamp += slot_duration;

diff --git a/chains/container-chains/runtime-templates/frontier/Cargo.toml b/chains/container-chains/runtime-templates/frontier/Cargo.toml
@@ -13,6 +13,7 @@ targets = [ "x86_64-unknown-linux-gnu" ]
 workspace = true
 
 [dependencies]
+ethereum = { workspace = true }
 hex-literal = { workspace = true }
 log = { workspace = true }
 num_enum = { workspace = true }
@@ -147,6 +148,7 @@ std = [
 	"dp-consensus/std",
 	"dp-impl-tanssi-pallets-config/std",
 	"dp-slot-duration-runtime-api/std",
+	"ethereum/std",
 	"fp-account/std",
 	"fp-evm/std",
 	"fp-rpc/std",
@@ -322,6 +324,7 @@ try-runtime = [
 	"pallet-xcm-executor-utils/try-runtime",
 	"pallet-xcm/try-runtime",
 	"parachain-info/try-runtime",
+	"parachains-common/try-runtime",
 	"polkadot-runtime-common/try-runtime",
 	"sp-runtime/try-runtime",
 	"tanssi-runtime-common/try-runtime",

diff --git a/chains/container-chains/runtime-templates/frontier/src/lib.rs b/chains/container-chains/runtime-templates/frontier/src/lib.rs
@@ -41,6 +41,7 @@ use {
     alloc::{vec, vec::Vec},
     cumulus_primitives_core::AggregateMessageOrigin,
     dp_impl_tanssi_pallets_config::impl_tanssi_pallets_config,
+    ethereum::AuthorizationList,
     fp_account::EthereumSignature,
     fp_rpc::TransactionStatus,
     frame_support::{
@@ -554,6 +555,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
     type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases;
     type ConsensusHook = ConsensusHook;
     type SelectCore = cumulus_pallet_parachain_system::DefaultCoreSelector<Runtime>;
+    type RelayParentOffset = ConstU32<0>;
 }
 
 pub struct ParaSlotProvider;
@@ -736,7 +738,6 @@ impl cumulus_pallet_weight_reclaim::Config for Runtime {
 }
 
 impl pallet_migrations::Config for Runtime {
-    type RuntimeEvent = RuntimeEvent;
     type MigrationsList = (migrations::TemplateMigrations<Runtime, XcmpQueue, PolkadotXcm>,);
     type XcmExecutionManager = XcmExecutionManager;
 }
@@ -795,7 +796,6 @@ impl Contains<RuntimeCall> for NormalFilter {
 }
 
 impl pallet_maintenance_mode::Config for Runtime {
-    type RuntimeEvent = RuntimeEvent;
     type NormalCallFilter = NormalFilter;
     type MaintenanceCallFilter = InsideBoth<MaintenanceFilter, NormalFilter>;
     type MaintenanceOrigin = EnsureRoot<AccountId>;
@@ -934,7 +934,6 @@ impl pallet_evm::Config for Runtime {
         dynamic_params::contract_deploy_filter::AllowedAddressesToCreateInner,
     >;
     type Currency = Balances;
-    type RuntimeEvent = RuntimeEvent;
     type PrecompilesType = TemplatePrecompiles<Self>;
     type PrecompilesValue = PrecompilesValue;
     type ChainId = EVMChainId;
@@ -954,7 +953,6 @@ parameter_types! {
 }
 
 impl pallet_ethereum::Config for Runtime {
-    type RuntimeEvent = RuntimeEvent;
     type StateRoot = pallet_ethereum::IntermediateStateRoot<Self::Version>;
     type PostLogContent = PostBlockAndTxnHashes;
     type ExtraDataLength = ConstU32<30>;
@@ -983,7 +981,6 @@ impl pallet_base_fee::BaseFeeThreshold for BaseFeeThreshold {
 }
 
 impl pallet_base_fee::Config for Runtime {
-    type RuntimeEvent = RuntimeEvent;
     type Threshold = BaseFeeThreshold;
     type DefaultBaseFeePerGas = DefaultBaseFeePerGas;
     type DefaultElasticity = DefaultElasticity;
@@ -1370,11 +1367,11 @@ impl_runtime_apis! {
                     Ok(Location::parent())
                 }
 
-                fn fee_asset() -> Result<Asset, BenchmarkError> {
-                    Ok(Asset {
+                fn worst_case_for_trader() -> Result<(Asset, WeightLimit), BenchmarkError> {
+                    Ok((Asset {
                         id: AssetId(SelfReserve::get()),
                         fun: Fungible(crate::currency::MICROUNIT*100),
-                    })
+                    }, WeightLimit::Unlimited))
                 }
 
                 fn claimable_asset() -> Result<(Location, Location, Assets), BenchmarkError> {
@@ -1400,7 +1397,11 @@ impl_runtime_apis! {
 
             use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsicsBenchmark;
             impl pallet_xcm::benchmarking::Config for Runtime {
-                type DeliveryHelper = ();
+                type DeliveryHelper = cumulus_primitives_utility::ToParentDeliveryHelper<
+                    xcm_config::XcmConfig,
+                    ExistentialDepositAsset,
+                    xcm_config::PriceForParentDelivery,
+                >;
                 fn get_asset() -> Asset {
                     Asset {
                         id: AssetId(SelfReserve::get()),
@@ -1473,9 +1474,10 @@ impl_runtime_apis! {
                     let asset_amount = 10u128;
                     let initial_asset_amount = asset_amount * 10;
 
-                    let (asset_id, asset_location) = pallet_foreign_asset_creator::benchmarks::create_default_minted_asset::<Runtime>(
+                    let (asset_id, asset_location) = pallet_foreign_asset_creator::benchmarks::create_minted_asset::<Runtime>(
                         initial_asset_amount,
-                        who
+                        who,
+                        None,
                     );
 
                     let transfer_asset: Asset = (asset_location, asset_amount).into();
@@ -1597,6 +1599,7 @@ impl_runtime_apis! {
             nonce: Option<U256>,
             estimate: bool,
             access_list: Option<Vec<(H160, Vec<H256>)>>,
+            authorization_list: Option<AuthorizationList>,
         ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {
             let config = if estimate {
                 let mut config = <Runtime as pallet_evm::Config>::config().clone();
@@ -1610,16 +1613,17 @@ impl_runtime_apis! {
 
             let transaction_data = pallet_ethereum::TransactionData::new(
                 pallet_ethereum::TransactionAction::Call(to),
-                                data.clone(),
-                                nonce.unwrap_or_default(),
-                                gas_limit,
-                                None,
-                                max_fee_per_gas.or(Some(U256::default())),
-                                max_priority_fee_per_gas.or(Some(U256::default())),
-                                value,
-                                Some(<Runtime as pallet_evm::Config>::ChainId::get()),
-                                access_list.clone().unwrap_or_default(),
-                            );
+                data.clone(),
+                nonce.unwrap_or_default(),
+                gas_limit,
+                None,
+                max_fee_per_gas.or(Some(U256::default())),
+                max_priority_fee_per_gas.or(Some(U256::default())),
+                value,
+                Some(<Runtime as pallet_evm::Config>::ChainId::get()),
+                access_list.clone().unwrap_or_default(),
+                authorization_list.clone().unwrap_or_default(),
+            );
 
             let gas_limit = gas_limit.min(u64::MAX.into()).low_u64();
 
@@ -1635,6 +1639,7 @@ impl_runtime_apis! {
                 max_priority_fee_per_gas,
                 nonce,
                 access_list.unwrap_or_default(),
+                authorization_list.unwrap_or_default(),
                 is_transactional,
                 validate,
                 weight_limit,
@@ -1653,6 +1658,7 @@ impl_runtime_apis! {
             nonce: Option<U256>,
             estimate: bool,
             access_list: Option<Vec<(H160, Vec<H256>)>>,
+            authorization_list: Option<AuthorizationList>,
         ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {
             let config = if estimate {
                 let mut config = <Runtime as pallet_evm::Config>::config().clone();
@@ -1675,6 +1681,7 @@ impl_runtime_apis! {
                 value,
                 Some(<Runtime as pallet_evm::Config>::ChainId::get()),
                 access_list.clone().unwrap_or_default(),
+                authorization_list.clone().unwrap_or_default(),
             );
 
             let gas_limit = gas_limit.min(u64::MAX.into()).low_u64();
@@ -1691,6 +1698,7 @@ impl_runtime_apis! {
                 max_priority_fee_per_gas,
                 nonce,
                 access_list.unwrap_or_default(),
+                authorization_list.unwrap_or_default(),
                 is_transactional,
                 validate,
                 weight_limit,

diff --git a/chains/container-chains/runtime-templates/frontier/src/precompiles.rs b/chains/container-chains/runtime-templates/frontier/src/precompiles.rs
@@ -98,7 +98,8 @@ type TemplatePrecompilesAt<R> = (
     PrecompileAt<AddressU64<4>, Identity, EthereumPrecompilesChecks>,
     PrecompileAt<AddressU64<5>, Modexp, EthereumPrecompilesChecks>,
     // Non-template specific nor Ethereum precompiles :
-    PrecompileAt<AddressU64<1024>, Sha3FIPS256, (CallableByContract, CallableByPrecompile)>,
+    // FIXME(MD-1415): benchmark Sha3FIPS256 precompile and use the real weights instead of ()
+    PrecompileAt<AddressU64<1024>, Sha3FIPS256<R, ()>, (CallableByContract, CallableByPrecompile)>,
     PrecompileAt<AddressU64<1025>, ECRecoverPublicKey, (CallableByContract, CallableByPrecompile)>,
     // Template specific precompiles:
     PrecompileAt<