Skip to content
Open
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
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/release_checklist.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ All the preparation specific for this release, for example
- `astar-runtime`
- `shiden-runtime`
- `shibuya-runtime`
- `local-runtime`
- `astar-collator`
- `xcm-tools` (if needed)
- [ ] Check Spec Version bumped for all runtimes
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Some notes:
### Mandatory PR Labels
When submitting a Pull Request (PR), please make sure to include the necessary labels to help us categorize and prioritize your changes. PRs should contain at least one of the following mandatory labels:

- **runtime**: Use this label for changes or additions to the code that relate to runtime **(shiden, astar, shibuya, local)**
- **runtime**: Use this label for changes or additions to the code that relate to runtime **(shiden, astar, shibuya)**
- **client**: PRs related to client.
- **ci**: PRs related to CI (workflows).
- **tests**: PRs related to xcm-simulator tests,rpc-tests or any other kind of test.
Expand Down
95 changes: 1 addition & 94 deletions Cargo.lock

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

6 changes: 1 addition & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
members = [
"bin/collator",
"bin/xcm-tools",
"runtime/local",
"runtime/astar",
"runtime/shiden",
"runtime/shibuya",
Expand Down Expand Up @@ -158,9 +157,7 @@ sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "
sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
sc-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
Expand Down Expand Up @@ -209,7 +206,6 @@ frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk"
frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506", default-features = false }
pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506", default-features = false }
pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506", default-features = false }
pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506", default-features = false }
pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506", default-features = false }
pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506", default-features = false }
pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506", default-features = false }
Expand Down Expand Up @@ -273,6 +269,7 @@ cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-
cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
cumulus-client-consensus-relay-chain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
cumulus-client-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2506" }
Expand Down Expand Up @@ -349,7 +346,6 @@ pallet-chain-extension-unified-accounts = { path = "./chain-extensions/unified-a
assets-chain-extension-types = { path = "./chain-extensions/types/assets", default-features = false }
unified-accounts-chain-extension-types = { path = "./chain-extensions/types/unified-accounts", default-features = false }

local-runtime = { path = "./runtime/local", default-features = false }
shibuya-runtime = { path = "./runtime/shibuya", default-features = false }
shiden-runtime = { path = "./runtime/shiden", default-features = false }
astar-runtime = { path = "./runtime/astar", default-features = false }
Expand Down
9 changes: 2 additions & 7 deletions bin/collator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ sc-client-api = { workspace = true }
sc-client-db = { workspace = true }
sc-consensus = { workspace = true }
sc-consensus-aura = { workspace = true }
sc-consensus-babe = { workspace = true }
sc-consensus-grandpa = { workspace = true }
sc-consensus-manual-seal = { workspace = true, optional = true }
sc-consensus-manual-seal = { workspace = true }
sc-executor = { workspace = true }
sc-network = { workspace = true }
sc-network-sync = { workspace = true }
Expand Down Expand Up @@ -100,7 +98,6 @@ frame-system-rpc-runtime-api = { workspace = true }

# astar-specific dependencies
astar-runtime = { workspace = true, features = ["std"] }
local-runtime = { workspace = true, features = ["std"] }
shibuya-runtime = { workspace = true, features = ["std"] }
shiden-runtime = { workspace = true, features = ["std"] }

Expand All @@ -126,6 +123,7 @@ cumulus-client-consensus-common = { workspace = true }
cumulus-client-consensus-proposer = { workspace = true }
cumulus-client-consensus-relay-chain = { workspace = true }
cumulus-client-network = { workspace = true }
cumulus-client-parachain-inherent = { workspace = true }
cumulus-client-service = { workspace = true }
cumulus-primitives-aura = { workspace = true }
cumulus-primitives-core = { workspace = true, features = ["std"] }
Expand Down Expand Up @@ -168,7 +166,6 @@ substrate-build-script-utils = { workspace = true }
[features]
default = ["sc-cli", "polkadot-cli", "sc-service", "sc-service/rocksdb"]
runtime-benchmarks = [
"local-runtime/runtime-benchmarks",
"shibuya-runtime/runtime-benchmarks",
"shiden-runtime/runtime-benchmarks",
"astar-runtime/runtime-benchmarks",
Expand All @@ -194,7 +191,6 @@ runtime-benchmarks = [
"pallet-transaction-payment/runtime-benchmarks",
]
try-runtime = [
"local-runtime/try-runtime",
"astar-primitives/try-runtime",
"astar-runtime/try-runtime",
"frame-system/try-runtime",
Expand All @@ -210,4 +206,3 @@ try-runtime = [
"sp-runtime/try-runtime",
"frame-support/try-runtime",
]
manual-seal = ["sc-consensus-manual-seal"]
8 changes: 2 additions & 6 deletions bin/collator/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,7 @@ pub fn run() -> Result<()> {
backend,
..
} = local::new_partial(&config, &rpc_config)?;
let aux_revert = Box::new(|client, _, blocks| {
sc_consensus_grandpa::revert(client, blocks)?;
Ok(())
});
Ok((cmd.run(client, backend, Some(aux_revert)), task_manager))
Ok((cmd.run(client, backend, None), task_manager))
})
} else {
runner.async_run(|config| {
Expand Down Expand Up @@ -332,7 +328,7 @@ pub fn run() -> Result<()> {
})
} else {
runner.sync_run(|config| {
cmd.run_with_spec::<HashingFor<local_runtime::Block>, local::HostFunctions>(
cmd.run_with_spec::<HashingFor<shibuya_runtime::Block>, local::HostFunctions>(
Some(config.chain_spec),
)
})
Expand Down
14 changes: 5 additions & 9 deletions bin/collator/src/evm_tracing_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,12 @@ pub struct FrontierConfig {
#[derive(Debug, Parser)]
pub struct EthApiOptions {
/// Enable EVM tracing module on a non-authority node.
#[cfg_attr(
not(feature = "manual-seal"),
clap(
long,
conflicts_with = "collator",
conflicts_with = "validator",
value_delimiter = ','
)
#[clap(
long,
conflicts_with = "collator",
conflicts_with = "validator",
value_delimiter = ','
)]
#[cfg_attr(feature = "manual-seal", clap(long))]
pub ethapi: Vec<EthApi>,

/// Number of concurrent tracing tasks. Meant to be shared by both "debug" and "trace" modules.
Expand Down
4 changes: 2 additions & 2 deletions bin/collator/src/local/chain_spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
// You should have received a copy of the GNU General Public License
// along with Astar. If not, see <http://www.gnu.org/licenses/>.

use local_runtime::wasm_binary_unwrap;
use sc_service::ChainType;
use shibuya_runtime::wasm_binary_unwrap;

/// Specialized `ChainSpec` for local network.
pub type ChainSpec = sc_service::GenericChainSpec;
Expand All @@ -33,7 +33,7 @@ pub fn development_config() -> ChainSpec {
.with_id("dev")
.with_chain_type(ChainType::Development)
.with_properties(properties)
.with_genesis_config(local_runtime::genesis_config::default_config())
.with_genesis_config_preset_name("development")
.build()
}

Expand Down
3 changes: 2 additions & 1 deletion bin/collator/src/local/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ mod service;
/// Development chain specs.
mod chain_spec;

pub use crate::parachain::fake_runtime_api::RuntimeApi;
pub use chain_spec::*;
pub use service::{new_partial, start_node, HostFunctions, RuntimeApi};
pub use service::{new_partial, start_node, HostFunctions};
Loading
Loading