Skip to content
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

Astar Collator 5.0.0 release #865

Merged
merged 17 commits into from
Mar 13, 2023
Merged

Astar Collator 5.0.0 release #865

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fe58b85
EVM tracing support (#802)
akru Jan 16, 2023
59e72e9
Merge branch 'master' into 5.x.x
akru Jan 23, 2023
5ff160c
Fix srtool build
akru Jan 23, 2023
7dcd3fa
[CI] temporary disable aarch64 target
akru Jan 24, 2023
88cf7d3
[CI] fix binaries upload for release pipeline
akru Jan 24, 2023
702b334
Merge branch 'master' into 5.x.x
akru Jan 27, 2023
0dbd92e
Merge branch 'master' into 5.x.x
akru Jan 31, 2023
11e1c37
Fix CI errors
akru Jan 31, 2023
8deb9b3
Update rust toolchain version to 2023-01-11
akru Jan 31, 2023
7953720
Update Cargo.lock
akru Feb 1, 2023
7bd370b
Added txpool rpc support (#855)
akru Feb 13, 2023
95a41fa
Merge remote-tracking branch 'origin/master'
akru Feb 20, 2023
6ec6c47
Remove outdated migrations from runtimes
akru Feb 20, 2023
53d1444
Merge remote-tracking branch 'origin/master'
akru Feb 28, 2023
a797f5d
Merge remote-tracking branch 'origin/master'
akru Mar 6, 2023
a6fc8ad
Sort review comments
akru Mar 7, 2023
83dd328
Merge remote-tracking branch 'origin/master'
akru Mar 10, 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
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
matrix:
target:
- x86_64-unknown-linux-gnu
# - aarch64-unknown-linux-gnu
- aarch64-unknown-linux-gnu

steps:
- name: Checkout the source code
Expand Down
10 changes: 5 additions & 5 deletions bin/collator/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ pub fn run() -> Result<()> {
let runner = cli.create_runner(&cli.run.normalize())?;
let collator_options = cli.run.collator_options();

let tracing_config = crate::cli::EvmTracingConfig {
let evm_tracing_config = crate::cli::EvmTracingConfig {
ethapi: cli.ethapi,
ethapi_max_permits: cli.ethapi_max_permits,
ethapi_trace_max_count: cli.ethapi_trace_max_count,
Expand All @@ -832,7 +832,7 @@ pub fn run() -> Result<()> {

runner.run_node_until_exit(|config| async move {
if config.chain_spec.is_dev() {
return local::start_node(config, tracing_config).map_err(Into::into);
return local::start_node(config, evm_tracing_config).map_err(Into::into);
}

let polkadot_cli = RelayChainCli::new(
Expand Down Expand Up @@ -876,17 +876,17 @@ pub fn run() -> Result<()> {
);

if config.chain_spec.is_astar() {
start_astar_node(config, polkadot_config, tracing_config, collator_options, para_id, cli.enable_evm_rpc)
start_astar_node(config, polkadot_config, evm_tracing_config, collator_options, para_id, cli.enable_evm_rpc)
.await
.map(|r| r.0)
.map_err(Into::into)
} else if config.chain_spec.is_shiden() {
start_shiden_node(config, polkadot_config, tracing_config, collator_options, para_id, cli.enable_evm_rpc)
start_shiden_node(config, polkadot_config, evm_tracing_config, collator_options, para_id, cli.enable_evm_rpc)
.await
.map(|r| r.0)
.map_err(Into::into)
} else if config.chain_spec.is_shibuya() {
start_shibuya_node(config, polkadot_config, tracing_config, collator_options, para_id, cli.enable_evm_rpc)
start_shibuya_node(config, polkadot_config, evm_tracing_config, collator_options, para_id, cli.enable_evm_rpc)
.await
.map(|r| r.0)
.map_err(Into::into)
Expand Down
10 changes: 5 additions & 5 deletions bin/collator/src/local/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ pub fn new_partial(
/// Builds a new service.
pub fn start_node(
config: Configuration,
tracing_config: EvmTracingConfig,
evm_tracing_config: EvmTracingConfig,
) -> Result<TaskManager, ServiceError> {
let sc_service::PartialComponents {
client,
Expand Down Expand Up @@ -235,11 +235,11 @@ pub fn start_node(
let fee_history_cache: FeeHistoryCache = Arc::new(std::sync::Mutex::new(BTreeMap::new()));
let overrides = crate::rpc::overrides_handle(client.clone());

let ethapi_cmd = tracing_config.ethapi.clone();
let ethapi_cmd = evm_tracing_config.ethapi.clone();
let tracing_requesters =
if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) {
tracing::spawn_tracing_tasks(
&tracing_config,
&evm_tracing_config,
tracing::SpawnTasksParams {
task_manager: &task_manager,
client: client.clone(),
Expand Down Expand Up @@ -321,8 +321,8 @@ pub fn start_node(
let transaction_pool = transaction_pool.clone();
let rpc_config = crate::rpc::EvmTracingConfig {
tracing_requesters,
trace_filter_max_count: tracing_config.ethapi_trace_max_count,
enable_txpool: true,
trace_filter_max_count: evm_tracing_config.ethapi_trace_max_count,
enable_txpool: ethapi_cmd.contains(&EthApiCmd::TxPool),
};

Box::new(move |deny_unsafe, subscription| {
Expand Down
20 changes: 10 additions & 10 deletions bin/collator/src/parachain/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ async fn build_relay_chain_interface(
async fn start_node_impl<RuntimeApi, Executor, BIQ, BIC>(
parachain_config: Configuration,
polkadot_config: Configuration,
tracing_config: EvmTracingConfig,
evm_tracing_config: EvmTracingConfig,
collator_options: CollatorOptions,
id: ParaId,
enable_evm_rpc: bool,
Expand Down Expand Up @@ -441,11 +441,11 @@ where
let fee_history_cache: FeeHistoryCache = Arc::new(std::sync::Mutex::new(BTreeMap::new()));
let overrides = crate::rpc::overrides_handle(client.clone());

let ethapi_cmd = tracing_config.ethapi.clone();
let ethapi_cmd = evm_tracing_config.ethapi.clone();
let tracing_requesters =
if ethapi_cmd.contains(&EthApiCmd::Debug) || ethapi_cmd.contains(&EthApiCmd::Trace) {
tracing::spawn_tracing_tasks(
&tracing_config,
&evm_tracing_config,
tracing::SpawnTasksParams {
task_manager: &task_manager,
client: client.clone(),
Expand Down Expand Up @@ -519,7 +519,7 @@ where
let transaction_pool = transaction_pool.clone();
let rpc_config = crate::rpc::EvmTracingConfig {
tracing_requesters,
trace_filter_max_count: tracing_config.ethapi_trace_max_count,
trace_filter_max_count: evm_tracing_config.ethapi_trace_max_count,
enable_txpool: ethapi_cmd.contains(&EthApiCmd::TxPool),
};

Expand Down Expand Up @@ -711,7 +711,7 @@ where
pub async fn start_astar_node(
parachain_config: Configuration,
polkadot_config: Configuration,
tracing_config: EvmTracingConfig,
evm_tracing_config: EvmTracingConfig,
collator_options: CollatorOptions,
id: ParaId,
enable_evm_rpc: bool,
Expand All @@ -722,7 +722,7 @@ pub async fn start_astar_node(
start_node_impl::<astar::RuntimeApi, astar::Executor, _, _>(
parachain_config,
polkadot_config,
tracing_config,
evm_tracing_config,
collator_options,
id,
enable_evm_rpc,
Expand Down Expand Up @@ -843,7 +843,7 @@ pub async fn start_astar_node(
pub async fn start_shiden_node(
parachain_config: Configuration,
polkadot_config: Configuration,
tracing_config: EvmTracingConfig,
evm_tracing_config: EvmTracingConfig,
collator_options: CollatorOptions,
id: ParaId,
enable_evm_rpc: bool,
Expand All @@ -854,7 +854,7 @@ pub async fn start_shiden_node(
start_node_impl::<shiden::RuntimeApi, shiden::Executor, _, _>(
parachain_config,
polkadot_config,
tracing_config,
evm_tracing_config,
collator_options,
id,
enable_evm_rpc,
Expand Down Expand Up @@ -1001,7 +1001,7 @@ pub async fn start_shiden_node(
pub async fn start_shibuya_node(
parachain_config: Configuration,
polkadot_config: Configuration,
tracing_config: EvmTracingConfig,
evm_tracing_config: EvmTracingConfig,
collator_options: CollatorOptions,
id: ParaId,
enable_evm_rpc: bool,
Expand All @@ -1012,7 +1012,7 @@ pub async fn start_shibuya_node(
start_node_impl::<shibuya::RuntimeApi, shibuya::Executor, _, _>(
parachain_config,
polkadot_config,
tracing_config,
evm_tracing_config,
collator_options,
id,
enable_evm_rpc,
Expand Down
2 changes: 1 addition & 1 deletion bin/collator/src/rpc/tracing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pub struct SpawnTasksParams<'a, B: BlockT, C, BE> {
pub overrides: Arc<OverrideHandle<B>>,
}

// Spawn the tasks that are required to run a Moonbeam tracing node.
/// Spawn the tasks that are required to run a EVM tracing.
Copy link
Member

Choose a reason for hiding this comment

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

"an EVM tracing node" perhaps

pub fn spawn_tracing_tasks<B, C, BE>(
rpc_config: &crate::cli::EvmTracingConfig,
params: SpawnTasksParams<B, C, BE>,
Expand Down