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

chore: upgrade to polkadot v1.12.0 #6

Merged
merged 10 commits into from
Aug 9, 2024
Merged

chore: upgrade to polkadot v1.12.0 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0b2d5f9
chore(base): polkadot-v1.11.0
al3mart May 23, 2024
435612c
chore(base): add benchmarks.rs
al3mart May 23, 2024
d09da6d
Merge branch 'main' into al3mart/chore-polkadot-v1.11.0
al3mart Jun 7, 2024
cd6fc37
Update node/src/service.rs
al3mart Jun 11, 2024
b86117f
style: newlines
Daanvdplas Jun 12, 2024
836444a
chore: v1.12
Daanvdplas Jun 12, 2024
23d0395
fix: revert CheckMetadataHash
al3mart Jun 17, 2024
85d9781
Merge pull request #26 from r0gue-io/daan/chore-polkadot-v1.12.0
Daanvdplas Jun 21, 2024
a6a88d5
chore: merge remote-tracking branch 'upstream/main' into chore-polkad…
AlexD10S Aug 7, 2024
7c37225
chore: bump assets pallets
AlexD10S Aug 7, 2024
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,340 changes: 1,303 additions & 1,037 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

184 changes: 93 additions & 91 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,120 +9,122 @@ license = "Unlicense"
repository = "https://github.com/r0gue-io/base-parachain"

[workspace]
members = [
"node",
"runtime",
]
members = ["node", "runtime"]
resolver = "2"

[workspace.dependencies]
clap = { version = "4.5.3", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
"derive",
] }
color-print = "0.3.4"
docify = "0.2.8"
futures = "0.3.30"
hex-literal = "0.4.1"
jsonrpsee = { version = "0.22", features = ["server"] }
log = { version = "0.4.20", default-features = false }
scale-info = { version = "2.11.1", default-features = false, features = ["derive"] }
scale-info = { version = "2.11.1", default-features = false, features = [
"derive",
] }
serde = "1.0.197"
serde_json = "1.0.114"
smallvec = "1.11.2"

# Build
substrate-build-script-utils = "11.0.0"
substrate-wasm-builder = "22.0.1"
docify = "0.2.8"
substrate-wasm-builder = "22.0.0"

# Local
parachain-template-runtime = { path = "./runtime" }

# Substrate
frame-benchmarking = { version = "33.0.0", default-features = false }
frame-benchmarking-cli = "37.0.0"
frame-executive = { version = "33.0.0", default-features = false }
frame-metadata-hash-extension = { version = "0.2.0", default-features = false }
frame-support = { version = "33.0.0", default-features = false }
frame-system = { version = "33.0.0", default-features = false }
frame-system-benchmarking = { version = "33.0.0", default-features = false }
frame-system-rpc-runtime-api = { version = "31.0.0", default-features = false }
frame-try-runtime = { version = "0.39.0", default-features = false }
pallet-aura = { version = "32.0.0", default-features = false }
pallet-assets = { version = "34.0.0", default-features = false }
pallet-authorship = { version = "33.0.0", default-features = false }
pallet-balances = { version = "34.0.0", default-features = false }
pallet-message-queue = { version = "36.0.0", default-features = false }
pallet-nfts = { version = "27.0.0", default-features = false }
pallet-nfts-runtime-api = { version = "19.0.0", default-features = false }
pallet-nft-fractionalization = { version = "15.0.0", default-features = false }
pallet-session = { version = "33.0.0", default-features = false }
pallet-sudo = { version = "33.0.0", default-features = false }
pallet-timestamp = { version = "32.0.0", default-features = false }
pallet-transaction-payment = { version = "33.0.0", default-features = false }
pallet-transaction-payment-rpc = "35.0.0"
pallet-transaction-payment-rpc-runtime-api = { version = "33.0.0", default-features = false }
sc-basic-authorship = "0.39.0"
sc-chain-spec = "32.0.0"
sc-cli = "0.41.0"
sc-client-api = "33.0.0"
sc-offchain = "34.0.0"
sc-consensus = "0.38.0"
sc-executor = "0.37.0"
sc-network = "0.39.0"
sc-network-sync = "0.38.0"
sc-rpc = "34.0.0"
sc-service = "0.40.0"
sc-sysinfo = "32.0.0"
sc-telemetry = "19.0.0"
sc-tracing = "33.0.0"
sc-transaction-pool = "33.0.0"
sc-transaction-pool-api = "33.0.0"
sp-api = { version = "31.0.0", default-features = false }
sp-block-builder = { version = "31.0.0", default-features = false }
sp-blockchain = "33.0.0"
sp-consensus-aura = { version = "0.37.0", default-features = false }
sp-core = { version = "32.0.0", default-features = false }
sp-io = { version = "35.0.0", default-features = false }
sp-genesis-builder = { version = "0.12.0", default-features = false }
sp-inherents = { version = "31.0.0", default-features = false }
sp-keystore = "0.38.0"
sp-offchain = { version = "31.0.0", default-features = false }
sp-runtime = { version = "36.0.0", default-features = false }
sp-session = { version = "32.0.0", default-features = false }
frame-benchmarking = { version = "34.0.0", default-features = false }
frame-benchmarking-cli = "38.0.0"
frame-executive = { version = "34.0.0", default-features = false }
frame-support = { version = "34.0.0", default-features = false }
frame-system = { version = "34.0.1", default-features = false }
frame-system-benchmarking = { version = "34.0.0", default-features = false }
frame-system-rpc-runtime-api = { version = "32.0.0", default-features = false }
frame-try-runtime = { version = "0.40.0", default-features = false }
pallet-aura = { version = "33.0.0", default-features = false }
pallet-assets = { version = "35.0.0", default-features = false }
pallet-authorship = { version = "34.0.0", default-features = false }
pallet-balances = { version = "35.0.0", default-features = false }
pallet-message-queue = { version = "37.0.0", default-features = false }
pallet-nfts = { version = "28.0.0", default-features = false }
pallet-nfts-runtime-api = { version = "20.0.0", default-features = false }
pallet-nft-fractionalization = { version = "16.0.0", default-features = false }
pallet-session = { version = "34.0.0", default-features = false }
pallet-sudo = { version = "34.0.0", default-features = false }
pallet-timestamp = { version = "33.0.0", default-features = false }
pallet-transaction-payment = { version = "34.0.0", default-features = false }
pallet-transaction-payment-rpc = "36.0.0"
pallet-transaction-payment-rpc-runtime-api = { version = "34.0.0", default-features = false }
sc-basic-authorship = "0.40.0"
sc-chain-spec = "33.0.0"
sc-cli = "0.42.0"
sc-client-api = "34.0.0"
sc-offchain = "35.0.0"
sc-consensus = "0.39.1"
sc-executor = "0.38.0"
sc-network = "0.40.0"
sc-network-sync = "0.39.0"
sc-rpc = "35.0.0"
sc-service = "0.41.0"
sc-sysinfo = "33.0.0"
sc-telemetry = "20.0.0"
sc-tracing = "34.0.0"
sc-transaction-pool = "34.0.0"
sc-transaction-pool-api = "34.0.0"
sp-api = { version = "32.0.0", default-features = false }
sp-block-builder = { version = "32.0.0", default-features = false }
sp-blockchain = "34.0.0"
sp-consensus-aura = { version = "0.38.0", default-features = false }
sp-core = { version = "33.0.1", default-features = false }
sp-io = { version = "36.0.0", default-features = false }
sp-genesis-builder = { version = "0.13.0", default-features = false }
sp-inherents = { version = "32.0.0", default-features = false }
sp-keystore = "0.39.0"
sp-offchain = { version = "32.0.0", default-features = false }
sp-runtime = { version = "37.0.0", default-features = false }
sp-session = { version = "33.0.0", default-features = false }
sp-std = { version = "14.0.0", default-features = false }
sp-timestamp = "31.0.0"
sp-transaction-pool = { version = "31.0.0", default-features = false }
sp-version = { version = "34.0.0", default-features = false }
substrate-frame-rpc-system = "33.0.0"
sp-timestamp = "32.0.0"
sp-transaction-pool = { version = "32.0.0", default-features = false }
sp-version = { version = "35.0.0", default-features = false }
substrate-frame-rpc-system = "34.0.0"
substrate-prometheus-endpoint = "0.17.0"

# Polkadot
pallet-xcm = { version = "12.0.0", default-features = false }
polkadot-cli = "12.0.0"
polkadot-parachain-primitives = { version = "11.0.0", default-features = false }
polkadot-primitives = "12.0.0"
polkadot-runtime-common = { version = "12.0.0", default-features = false }
xcm = { version = "12.0.0", package = "staging-xcm", default-features = false }
xcm-builder = { version = "12.0.0", package = "staging-xcm-builder", default-features = false }
xcm-executor = { version = "12.0.0", package = "staging-xcm-executor", default-features = false }
pallet-xcm = { version = "13.0.0", default-features = false }
polkadot-cli = "13.0.0"
polkadot-parachain-primitives = { version = "12.0.0", default-features = false }
polkadot-primitives = "13.0.0"
polkadot-runtime-common = { version = "13.0.0", default-features = false }
xcm = { version = "13.0.1", package = "staging-xcm", default-features = false }
xcm-builder = { version = "13.0.0", package = "staging-xcm-builder", default-features = false }
xcm-executor = { version = "13.0.0", package = "staging-xcm-executor", default-features = false }

# Cumulus
cumulus-client-cli = "0.12.0"
cumulus-client-collator = "0.12.0"
cumulus-client-consensus-aura = "0.12.0"
cumulus-client-consensus-common = "0.12.0"
cumulus-client-consensus-proposer = "0.12.0"
cumulus-client-service = "0.12.0"
cumulus-pallet-aura-ext = { version = "0.12.0", default-features = false }
cumulus-pallet-parachain-system = { version = "0.12.0", default-features = false, features = ["parameterized-consensus-hook"] }
cumulus-pallet-session-benchmarking = { version = "14.0.0", default-features = false }
cumulus-pallet-xcm = { version = "0.12.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.12.0", default-features = false }
cumulus-primitives-aura = { version = "0.12.0", default-features = false }
cumulus-primitives-core = { version = "0.12.0", default-features = false }
cumulus-primitives-parachain-inherent = "0.12.0"
cumulus-primitives-storage-weight-reclaim = { version = "3.0.0", default-features = false }
cumulus-primitives-utility = { version = "0.12.0", default-features = false }
cumulus-relay-chain-interface = "0.12.0"
pallet-collator-selection = { version = "14.0.0", default-features = false }
parachains-common = { version = "12.0.0", default-features = false }
parachain-info = { version = "0.12.0", package = "staging-parachain-info", default-features = false }
cumulus-client-cli = "0.13.0"
cumulus-client-collator = "0.13.0"
cumulus-client-consensus-aura = "0.13.0"
cumulus-client-consensus-common = "0.13.0"
cumulus-client-consensus-proposer = "0.13.0"
cumulus-client-service = "0.13.0"
cumulus-pallet-aura-ext = { version = "0.13.0", default-features = false }
cumulus-pallet-parachain-system = { version = "0.13.0", default-features = false, features = [
"parameterized-consensus-hook",
] }
cumulus-pallet-session-benchmarking = { version = "15.0.0", default-features = false }
cumulus-pallet-xcm = { version = "0.13.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.13.0", default-features = false }
cumulus-primitives-aura = { version = "0.13.0", default-features = false }
cumulus-primitives-core = { version = "0.13.0", default-features = false }
cumulus-primitives-parachain-inherent = "0.13.0"
cumulus-primitives-storage-weight-reclaim = { version = "4.0.0", default-features = false }
cumulus-primitives-utility = { version = "0.13.0", default-features = false }
cumulus-relay-chain-interface = "0.13.0"
pallet-collator-selection = { version = "15.0.0", default-features = false }
parachains-common = { version = "13.0.0", default-features = false }
parachain-info = { version = "0.13.0", package = "staging-parachain-info", default-features = false }
1 change: 1 addition & 0 deletions node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ substrate-build-script-utils.workspace = true
clap.workspace = true
codec.workspace = true
color-print.workspace = true
docify.workspace = true
futures.workspace = true
jsonrpsee.workspace = true
log.workspace = true
Expand Down
3 changes: 2 additions & 1 deletion node/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@ pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Pu

/// The extensions for the [`ChainSpec`].
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, ChainSpecGroup, ChainSpecExtension)]
#[serde(deny_unknown_fields)]
pub struct Extensions {
/// The relay chain of the Parachain.
#[serde(alias = "relayChain", alias = "RelayChain")]
pub relay_chain: String,
/// The id of the Parachain.
#[serde(alias = "paraId", alias = "ParaId")]
pub para_id: u32,
}

Expand Down
8 changes: 5 additions & 3 deletions node/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
use sp_keystore::KeystorePtr;
use substrate_prometheus_endpoint::Registry;

#[docify::export(wasm_executor)]
type ParachainExecutor = WasmExecutor<ParachainHostFunctions>;

type ParachainClient = TFullClient<Block, RuntimeApi, ParachainExecutor>;
Expand All @@ -65,6 +66,7 @@
///
/// Use this macro if you don't actually need the full service, but just the builder in order to
/// be able to perform chain operations.
#[docify::export(component_instantiation)]
pub fn new_partial(config: &Configuration) -> Result<Service, sc_service::Error> {
let telemetry = config
.telemetry_endpoints
Expand Down Expand Up @@ -337,7 +339,7 @@
config: parachain_config,
keystore: params.keystore_container.keystore(),
backend: backend.clone(),
network: network.clone(),
network: network,

Check warning on line 342 in node/src/service.rs

View workflow job for this annotation

GitHub Actions / clippy

redundant field names in struct initialization 

warning: redundant field names in struct initialization
   --> node/src/service.rs:342:9
    |
342 |         network: network,
    |         ^^^^^^^^^^^^^^^^ help: replace it with: `network`
    |
    = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#redundant_field_names
    = note: `#[warn(clippy::redundant_field_names)]` on by default
sync_service: sync_service.clone(),
system_rpc_tx,
tx_handler_controller,
Expand Down Expand Up @@ -405,9 +407,9 @@
prometheus_registry.as_ref(),
telemetry.as_ref().map(|t| t.handle()),
&task_manager,
relay_chain_interface.clone(),
relay_chain_interface,
transaction_pool,
sync_service.clone(),
sync_service,
params.keystore_container.keystore(),
relay_chain_slot_duration,
para_id,
Expand Down
Loading
Loading