Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 23 additions & 21 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions node/cli-opt/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,5 @@ pub struct RpcConfig {
pub ethapi_trace_cache_duration: u64,
pub eth_log_block_cache: usize,
pub max_past_logs: u32,
pub fee_history_limit: u64,
}
4 changes: 4 additions & 0 deletions node/cli/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ pub struct RunCmd {
/// Id of the parachain this collator collates for.
#[structopt(long)]
pub parachain_id: Option<u32>,

/// Maximum fee history cache size.
#[structopt(long, default_value = "2048")]
pub fee_history_limit: u64,
}

impl std::ops::Deref for RunCmd {
Expand Down
1 change: 1 addition & 0 deletions node/cli/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,7 @@ pub fn run() -> Result<()> {
ethapi_trace_cache_duration: cli.run.ethapi_trace_cache_duration,
eth_log_block_cache: cli.run.eth_log_block_cache,
max_past_logs: cli.run.max_past_logs,
fee_history_limit: cli.run.fee_history_limit,
};

// If dev service was requested, start up manual or instant seal.
Expand Down
20 changes: 18 additions & 2 deletions node/perf-test/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,14 @@ where
select_chain: maybe_select_chain,
transaction_pool,
other:
(block_import, filter_pool, telemetry, _telemetry_worker_handle, frontier_backend),
(
block_import,
filter_pool,
telemetry,
_telemetry_worker_handle,
frontier_backend,
fee_history_cache,
),
} = service::new_partial::<RuntimeApi, Executor>(&config, true)?;

// TODO: review -- we don't need any actual networking
Expand Down Expand Up @@ -183,13 +190,18 @@ where

let subscription_task_executor =
sc_rpc::SubscriptionTaskExecutor::new(task_manager.spawn_handle());
let overrides = rpc::overrides_handle(client.clone());

let fee_history_limit = 2048;
service::rpc::spawn_essential_tasks(service::rpc::SpawnTasksParams {
task_manager: &task_manager,
client: client.clone(),
substrate_backend: backend.clone(),
frontier_backend: frontier_backend.clone(),
filter_pool: filter_pool.clone(),
overrides: overrides.clone(),
fee_history_limit,
fee_history_cache: fee_history_cache.clone(),
});

let command_sink_for_deps = command_sink.clone();
Expand All @@ -202,6 +214,8 @@ where
let network = network.clone();
let max_past_logs = 1000;
let runtime_variant = runtime_variant.clone();
let fee_history_cache = fee_history_cache.clone();
let overrides = overrides.clone();

Box::new(move |deny_unsafe, _| {
let runtime_variant = runtime_variant.clone();
Expand All @@ -219,13 +233,15 @@ where
frontier_backend: frontier_backend.clone(),
backend: backend.clone(),
max_past_logs,
fee_history_limit,
fee_history_cache: fee_history_cache.clone(),
transaction_converter: TransactionConverters::for_runtime_variant(
runtime_variant,
),
xcm_senders: None,
};
#[allow(unused_mut)]
let mut io = rpc::create_full(deps, subscription_task_executor.clone());
let mut io = rpc::create_full(deps, subscription_task_executor.clone(), overrides.clone());
Ok(io)
})
};
Expand Down
1 change: 1 addition & 0 deletions node/service/src/chain_spec/moonbeam.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ pub fn testnet_genesis(
.collect(),
},
ethereum: EthereumConfig {},
base_fee: Default::default(),
democracy: DemocracyConfig::default(),
scheduler: SchedulerConfig {},
parachain_staking: ParachainStakingConfig {
Expand Down
1 change: 1 addition & 0 deletions node/service/src/chain_spec/moonriver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ pub fn testnet_genesis(
.collect(),
},
ethereum: EthereumConfig {},
base_fee: Default::default(),
democracy: DemocracyConfig::default(),
scheduler: SchedulerConfig {},
parachain_staking: ParachainStakingConfig {
Expand Down
Loading