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: update to 0.9.12 #284

Merged
merged 8 commits into from
Oct 29, 2021
Merged

chore: update to 0.9.12 #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5809f2e
update to 0.9.12
weichweich Oct 28, 2021
3001a7d
Merge branch 'develop' into aw-update-0.9.12
weichweich Oct 28, 2021
99e8a50
fix: add missing #[pallet::constant]
weichweich Oct 28, 2021
88165a1
remove comment
weichweich Oct 29, 2021
c3bfac0
Merge branch 'develop' into aw-update-0.9.12
weichweich Oct 29, 2021
bbb95a8
Update Cargo.toml
weichweich Oct 29, 2021
7682bf2
update pallet version
weichweich Oct 29, 2021
9b18973
Merge remote-tracking branch 'origin/develop' into aw-update-0.9.12
weichweich Oct 29, 2021
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,380 changes: 640 additions & 740 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

102 changes: 51 additions & 51 deletions nodes/parachain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,70 +31,70 @@ structopt = "0.3.3"
trie-root = "0.15.2"

# Substrate dependencies
sc-basic-authorship = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-chain-spec = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-client-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-executor = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-finality-grandpa = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-network = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-service = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-telemetry = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-tracing = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-transaction-pool-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-block-builder = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-blockchain = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-core = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-inherents = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-io = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-keystore = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-offchain = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-runtime = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.11"}
sp-session = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-timestamp = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-trie = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
substrate-prometheus-endpoint = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-basic-authorship = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-chain-spec = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-client-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-executor = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-finality-grandpa = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-network = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-service = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-telemetry = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-tracing = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-transaction-pool-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-block-builder = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-blockchain = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-core = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-inherents = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-io = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-keystore = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-offchain = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-runtime = {git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.12"}
sp-session = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-timestamp = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-trie = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
substrate-prometheus-endpoint = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}

# RPC related dependencies
frame-rpc-system = {package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
frame-rpc-system = {package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
jsonrpc-core = "18.0.0"
pallet-transaction-payment-rpc = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-rpc = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-rpc-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
pallet-transaction-payment-rpc = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-rpc = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-rpc-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}

# Cumulus dependencies
cumulus-client-cli = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11"}
cumulus-client-collator = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11"}
cumulus-client-consensus-aura = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11"}
cumulus-client-consensus-common = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11"}
cumulus-client-consensus-relay-chain = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11"}
cumulus-client-network = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11"}
cumulus-client-service = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11"}
cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11"}
cumulus-primitives-parachain-inherent = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.11"}
cumulus-client-cli = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12"}
cumulus-client-collator = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12"}
cumulus-client-consensus-aura = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12"}
cumulus-client-consensus-common = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12"}
cumulus-client-consensus-relay-chain = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12"}
cumulus-client-network = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12"}
cumulus-client-service = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12"}
cumulus-primitives-core = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12"}
cumulus-primitives-parachain-inherent = {git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.12"}

# Polkadot dependencies
polkadot-cli = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11"}
polkadot-parachain = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11"}
polkadot-primitives = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11"}
polkadot-service = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.11"}
polkadot-cli = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12"}
polkadot-parachain = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12"}
polkadot-primitives = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12"}
polkadot-service = {git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.12"}

# Benchmarking
frame-benchmarking = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
frame-benchmarking-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
frame-benchmarking = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
frame-benchmarking-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}

# Runtime tests
node-executor = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", optional = true}
try-runtime-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", optional = true}
node-executor = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", optional = true}
try-runtime-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", optional = true}

[build-dependencies]
substrate-build-script-utils = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
substrate-build-script-utils = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}

[features]
default = []
Expand Down
66 changes: 33 additions & 33 deletions nodes/standalone/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name = "mashnet-node"
path = "src/main.rs"

[build-dependencies]
build-script-utils = {package = "substrate-build-script-utils", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
build-script-utils = {package = "substrate-build-script-utils", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
vergen = "3.1.0"

[dependencies]
Expand All @@ -28,45 +28,45 @@ serde_json = "1.0.64"
structopt = "0.3.8"

# Substrate dependencies
sc-basic-authorship = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-client-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-executor = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-finality-grandpa = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-keystore = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-network = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-service = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-telemetry = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-transaction-pool-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-block-builder = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-blockchain = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-core = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-finality-grandpa = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-inherents = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-runtime = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-timestamp = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sp-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-basic-authorship = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-client-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-executor = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-finality-grandpa = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-keystore = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-network = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-service = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-telemetry = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-transaction-pool-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-block-builder = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-blockchain = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-consensus = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-consensus-aura = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-core = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-finality-grandpa = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-inherents = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-runtime = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-timestamp = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sp-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}

# RPC related dependencies
frame-rpc-system = {package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
frame-rpc-system = {package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
jsonrpc-core = "18.0.0"
pallet-transaction-payment-rpc = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-rpc = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
sc-rpc-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
pallet-transaction-payment-rpc = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-rpc = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
sc-rpc-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}

# Benchmarking
frame-benchmarking = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
frame-benchmarking-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11"}
frame-benchmarking = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}
frame-benchmarking-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12"}

# Runtime tests
node-executor = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", optional = true}
try-runtime-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.11", optional = true}
node-executor = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", optional = true}
try-runtime-cli = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12", optional = true}

[features]
default = []
Expand Down
2 changes: 2 additions & 0 deletions nodes/standalone/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
let warp_sync = Arc::new(sc_finality_grandpa::warp_proof::NetworkProvider::new(
backend.clone(),
grandpa_link.shared_authority_set().clone(),
Vec::default(),
));

let (network, system_rpc_tx, network_starter) = sc_service::build_network(sc_service::BuildNetworkParams {
Expand Down Expand Up @@ -414,6 +415,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
let warp_sync = Arc::new(sc_finality_grandpa::warp_proof::NetworkProvider::new(
backend.clone(),
grandpa_link.shared_authority_set().clone(),
Vec::default(),
));

let (network, system_rpc_tx, network_starter) = sc_service::build_network(sc_service::BuildNetworkParams {
Expand Down
Loading