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

Ab/polkadot stable2409 3 #231

Merged
merged 4 commits into from
Jan 20, 2025
Merged

Ab/polkadot stable2409 3 #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4e8c85
upgrade deps
brenzi Jan 20, 2025
cb49747
bump version
brenzi Jan 20, 2025
131f0c2
cleanup
brenzi Jan 20, 2025
cc896e8
taplo
brenzi Jan 20, 2025
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,909 changes: 924 additions & 985 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

172 changes: 57 additions & 115 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,140 +9,82 @@ panic = "unwind"

[workspace.dependencies]
assert_cmd = "2.0"
async-trait = "0.1.74"
clap = { version = "4.5.3", features = ["derive"] }
color-print = "0.3.4"
docify = { version = "0.2.8" }
parity-scale-codec = { version = "3.6", default-features = false, features = ["derive"] }
futures = { version = "0.3.28", features = ["compat"] }
hex-literal = "0.4.1"
jsonrpsee = { version = "0.23.2", features = ["server"] }
jsonrpsee = { version = "0.24.7", features = ["server"] }
log = { version = "0.4.21", default-features = false }
nix = "0.24"
scale-info = { version = "2.11.1", default-features = false, features = ["derive"] }
serde = { version = "1.0.197", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.114", features = ["arbitrary_precision"] }
smallvec = "1.11.2"
serde = { version = "1.0.209", default-features = false, features = ["derive"] }
serde_json = { version = "1.0.127", features = ["arbitrary_precision"] }
tempfile = "3.8.1"

# encointer deps
encointer-balances-tx-payment = { default-features = false, version = "~13.1.0" }
encointer-balances-tx-payment-rpc-runtime-api = { default-features = false, version = "~13.1.0" }
encointer-primitives = { default-features = false, version = "~13.1.0" }
pallet-encointer-balances = { default-features = false, version = "~13.1.0" }
pallet-encointer-bazaar = { default-features = false, version = "~13.1.0" }
pallet-encointer-bazaar-rpc-runtime-api = { default-features = false, version = "~13.1.0" }
pallet-encointer-ceremonies = { default-features = false, version = "~13.1.0" }
pallet-encointer-ceremonies-rpc-runtime-api = { default-features = false, version = "~13.1.0" }
pallet-encointer-communities = { default-features = false, version = "~13.1.0" }
pallet-encointer-communities-rpc-runtime-api = { default-features = false, version = "~13.1.0" }
pallet-encointer-faucet = { default-features = false, version = "~13.2.0" }
pallet-encointer-reputation-commitments = { default-features = false, version = "~13.1.0" }
pallet-encointer-scheduler = { default-features = false, version = "~13.1.0" }
encointer-balances-tx-payment = { default-features = false, version = "~14.1.0" }
encointer-balances-tx-payment-rpc-runtime-api = { default-features = false, version = "~14.1.0" }
pallet-encointer-bazaar = { default-features = false, version = "~14.1.0" }
pallet-encointer-bazaar-rpc-runtime-api = { default-features = false, version = "~14.1.0" }
pallet-encointer-ceremonies = { default-features = false, version = "~14.1.0" }
pallet-encointer-ceremonies-rpc-runtime-api = { default-features = false, version = "~14.1.0" }
pallet-encointer-communities = { default-features = false, version = "~14.1.0" }
pallet-encointer-communities-rpc-runtime-api = { default-features = false, version = "~14.1.0" }
# rpc [std]
pallet-encointer-bazaar-rpc = "~13.1.0"
pallet-encointer-ceremonies-rpc = "~13.1.0"
pallet-encointer-communities-rpc = "~13.1.0"
encointer-balances-tx-payment-rpc = "~13.1.0"
pallet-encointer-bazaar-rpc = "~14.1.0"
pallet-encointer-ceremonies-rpc = "~14.1.0"
pallet-encointer-communities-rpc = "~14.1.0"
encointer-balances-tx-payment-rpc = "~14.1.0"

# fellowship runtimes. do not depend on fellow-runtimes directly, so we can upgrade at our own pace
kusama-runtime-constants = { default-features = false, git = "https://github.com/encointer/runtimes.git", branch = "polkadot-v1.14.0" }
parachain-runtime = { package = "encointer-kusama-runtime", git = "https://github.com/encointer/runtimes.git", branch = "polkadot-v1.14.0" }
parachain-runtime = { package = "encointer-kusama-runtime", git = "https://github.com/encointer/runtimes.git", branch = "polkadot-stable2409" }

# polkadot-sdk [no_std]
cumulus-pallet-aura-ext = { version = "0.15.0", default-features = false }
cumulus-pallet-dmp-queue = { version = "0.15.0", default-features = false }
cumulus-pallet-parachain-system = { version = "0.15.0", default-features = false, features = ["parameterized-consensus-hook"] }
cumulus-pallet-xcm = { version = "0.15.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.15.0", default-features = false }
cumulus-primitives-core = { version = "0.14.0", default-features = false }
cumulus-primitives-timestamp = { version = "0.14.0", default-features = false }
cumulus-primitives-utility = { version = "0.15.0", default-features = false }
frame-benchmarking = { version = "36.0.0", default-features = false }
frame-executive = { version = "36.0.0", default-features = false }
frame-support = { version = "36.0.0", default-features = false }
frame-system = { version = "36.0.0", default-features = false }
frame-system-benchmarking = { version = "36.0.0", default-features = false }
frame-system-rpc-runtime-api = { version = "33.0.0", default-features = false }
frame-try-runtime = { version = "0.42.0", default-features = false }
pallet-asset-tx-payment = { version = "36.0.0", default-features = false }
pallet-aura = { version = "35.0.0", default-features = false }
pallet-balances = { version = "37.0.0", default-features = false }
pallet-collective = { version = "36.0.0", default-features = false }
pallet-insecure-randomness-collective-flip = { version = "24.0.0", default-features = false }
pallet-membership = { version = "36.0.0", default-features = false }
pallet-proxy = { version = "36.0.0", default-features = false }
pallet-scheduler = { version = "37.0.0", default-features = false }
pallet-timestamp = { version = "35.0.0", default-features = false }
pallet-transaction-payment = { version = "36.0.0", default-features = false }
pallet-transaction-payment-rpc-runtime-api = { version = "36.0.0", default-features = false }
pallet-treasury = { version = "35.0.0", default-features = false }
pallet-utility = { version = "36.0.0", default-features = false }
pallet-xcm = { version = "15.0.0", default-features = false }
parachains-common = { version = "15.0.0", default-features = false }
parachain-info = { version = "0.15.0", package = "staging-parachain-info", default-features = false }
polkadot-core-primitives = { version = "14.0.0", default-features = false }
polkadot-parachain-primitives = { version = "13.0.0", default-features = false }
polkadot-runtime-common = { version = "15.0.0", default-features = false }
sp-api = { version = "33.0.0", default-features = false }
sp-block-builder = { version = "33.0.0", default-features = false }
sp-consensus-aura = { version = "0.39.0", default-features = false }
cumulus-primitives-core = { version = "0.16.0", default-features = false }
frame-benchmarking = { version = "38.0.0", default-features = false }
pallet-transaction-payment = { version = "38.0.2", default-features = false }
parachains-common = { version = "18.0.0", default-features = false }
sp-api = { version = "34.0.0", default-features = false }
sp-block-builder = { version = "34.0.0", default-features = false }
sp-consensus-aura = { version = "0.40.0", default-features = false }
sp-core = { version = "34.0.0", default-features = false }
sp-inherents = { version = "33.0.0", default-features = false }
sp-io = { version = "37.0.0", default-features = false }
sp-offchain = { version = "33.0.0", default-features = false }
sp-runtime = { version = "38.0.0", default-features = false }
sp-session = { version = "34.0.0", default-features = false }
sp-std = { version = "14.0.0", default-features = false }
sp-transaction-pool = { version = "33.0.0", default-features = false }
sp-version = { version = "36.0.0", default-features = false }
substrate-wasm-builder = { version = "23.0.0" }
xcm = { version = "14.0.1", package = "staging-xcm", default-features = false }
xcm-builder = { version = "15.0.0", package = "staging-xcm-builder", default-features = false }
xcm-executor = { version = "15.0.0", package = "staging-xcm-executor", default-features = false }
sp-runtime = { version = "39.0.5", default-features = false }
xcm = { version = "14.2.0", package = "staging-xcm", default-features = false }

# std stuff
cumulus-client-cli = "0.15.0"
cumulus-client-collator = "0.15.0"
cumulus-client-consensus-aura = "0.15.0"
cumulus-client-consensus-common = "0.15.0"
cumulus-client-consensus-proposer = "0.14.0"
cumulus-client-consensus-relay-chain = "0.15.0"
cumulus-client-network = "0.15.0"
cumulus-client-service = "0.15.0"
cumulus-primitives-parachain-inherent = "0.14.0"
cumulus-relay-chain-inprocess-interface = "0.15.0"
cumulus-relay-chain-interface = "0.15.0"
cumulus-relay-chain-rpc-interface = "0.15.0"
frame-benchmarking-cli = "40.0.0"
pallet-transaction-payment-rpc = "38.0.0"
polkadot-cli = "15.0.0"
polkadot-primitives = "14.0.0"
polkadot-service = "15.0.0"
sc-basic-authorship = "0.42.0"
sc-chain-spec = "35.0.0"
sc-cli = "0.44.0"
sc-client-api = "35.1.0"
sc-consensus = "0.41.0"
sc-executor = "0.39.0"
sc-network = "0.42.0"
sc-network-common = "0.41.0"
sc-network-sync = "0.41.0"
sc-offchain = "37.0.0"
sc-rpc = "37.0.0"
sc-service = "0.43.0"
sc-sysinfo = "35.0.0"
sc-telemetry = "22.0.0"
sc-tracing = "35.0.0"
sc-transaction-pool = "35.0.0"
sc-transaction-pool-api = "35.0.0"
sp-blockchain = "35.1.0"
sp-consensus = "0.39.1"
sp-keyring = "38.0.0"
cumulus-client-cli = "0.18.0"
cumulus-client-collator = "0.18.0"
cumulus-client-consensus-aura = "0.18.0"
cumulus-client-consensus-common = "0.18.0"
cumulus-client-consensus-proposer = "0.16.0"
cumulus-client-service = "0.19.0"
cumulus-relay-chain-interface = "0.18.0"
frame-benchmarking-cli = "43.0.0"
pallet-transaction-payment-rpc = "41.0.0"
polkadot-cli = "19.0.0"
polkadot-service = "19.0.0"
sc-basic-authorship = "0.45.0"
sc-chain-spec = "38.0.0"
sc-cli = "0.47.0"
sc-client-api = "37.0.0"
sc-consensus = "0.44.0"
sc-executor = "0.40.1"
sc-network = "0.45.3"
sc-offchain = "40.0.0"
sc-service = "0.46.0"
sc-sysinfo = "38.0.0"
sc-telemetry = "25.0.0"
sc-tracing = "37.0.1"
sc-transaction-pool = "37.0.0"
sc-transaction-pool-api = "37.0.0"
sp-blockchain = "37.0.1"
sp-consensus = "0.40.0"
sp-keyring = "39.0.0"
sp-keystore = "0.40.0"
sp-timestamp = "33.0.0"
sp-timestamp = "34.0.0"
substrate-build-script-utils = "11.0.0"
substrate-frame-rpc-system = "36.0.0"
substrate-prometheus-endpoint = "0.17.0"
substrate-frame-rpc-system = "39.0.0"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.17.0" }

# ### only while debugging/developping
# [patch."https://github.com/encointer/runtimes"]
Expand Down
22 changes: 3 additions & 19 deletions node/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "encointer-collator"
# align major.minor revision with the polkadot-sdk release. bump patch revision ad lib. make this the github release tag
version = "1.14.0"
version = "1.16.0"
authors = ["Encointer <info@encointer.org>"]
build = "build.rs"
edition = "2021"
Expand All @@ -11,11 +11,10 @@ name = "encointer-collator"
path = "src/main.rs"

[dependencies]
async-trait = { workspace = true }
clap = { workspace = true }
color-print = { workspace = true }
docify = { workspace = true }
futures = { workspace = true }
hex-literal = { workspace = true }
jsonrpsee = { workspace = true }
log = { workspace = true, features = ["std"] }
parity-scale-codec = { workspace = true }
Expand All @@ -41,17 +40,15 @@ pallet-encointer-communities-rpc-runtime-api = { workspace = true, features = ["
# Substrate dependencies
frame-benchmarking = { workspace = true, features = ["std"] }
frame-benchmarking-cli = { workspace = true }
prometheus-endpoint = { workspace = true }
sc-basic-authorship = { workspace = true }
sc-chain-spec = { workspace = true }
sc-cli = { workspace = true }
sc-client-api = { workspace = true }
sc-consensus = { workspace = true }
sc-executor = { workspace = true }
sc-network = { workspace = true }
sc-network-common = { workspace = true }
sc-network-sync = { workspace = true }
sc-offchain = { workspace = true }
sc-rpc = { workspace = true }
sc-service = { workspace = true }
sc-sysinfo = { workspace = true }
sc-telemetry = { workspace = true }
Expand All @@ -63,16 +60,10 @@ sp-blockchain = { workspace = true }
sp-consensus = { workspace = true }
sp-consensus-aura = { workspace = true, features = ["std"] }
sp-core = { workspace = true, features = ["std"] }
sp-inherents = { workspace = true, features = ["std"] }
sp-io = { workspace = true, features = ["std"] }
sp-keyring = { workspace = true }
sp-keystore = { workspace = true, features = ["std"] }
sp-offchain = { workspace = true, features = ["std"] }
sp-runtime = { workspace = true }
sp-session = { workspace = true, features = ["std"] }
sp-timestamp = { workspace = true, features = ["std"] }
sp-transaction-pool = { workspace = true, features = ["std"] }
substrate-prometheus-endpoint = { workspace = true }

# RPC related dependencies
pallet-transaction-payment-rpc = { workspace = true }
Expand All @@ -81,8 +72,6 @@ substrate-frame-rpc-system = { workspace = true }

# Polkadot dependencies
polkadot-cli = { workspace = true }
polkadot-parachain-primitives = { workspace = true }
polkadot-primitives = { workspace = true }
polkadot-service = { workspace = true }
xcm = { workspace = true, features = ["std"] }

Expand All @@ -92,14 +81,9 @@ cumulus-client-collator = { workspace = true }
cumulus-client-consensus-aura = { workspace = true }
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-service = { workspace = true }
cumulus-primitives-core = { workspace = true }
cumulus-primitives-parachain-inherent = { workspace = true }
cumulus-relay-chain-inprocess-interface = { workspace = true }
cumulus-relay-chain-interface = { workspace = true }
cumulus-relay-chain-rpc-interface = { workspace = true }

[build-dependencies]
substrate-build-script-utils = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions node/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ fn encointer_genesis(
)
})
.collect(),
non_authority_keys: vec![],
},
"membership": {
"members": encointer_council,
Expand Down
1 change: 1 addition & 0 deletions node/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::path::PathBuf;

/// Sub-commands supported by the collator.
#[allow(clippy::large_enum_variant)]
#[derive(Debug, clap::Subcommand)]
pub enum Subcommand {
/// Build a chain specification.
Expand Down
Loading
Loading