Skip to content

Commit

Permalink
Moonbeam polkadot v0.9.32 (moonbeam-foundation#1933)
Browse files Browse the repository at this point in the history 
* UPdate tomls

* bump ethereum types

* pallet-staking: RuntimeEvent, RUntimeCall, RuntimeOrigin

* asset-manager: RuntimeEvent, RUntimeCall, RuntimeOrigin

* author-mapping: RuntimeEvent, RUntimeCall, RuntimeOrigin

* ethereum-xcm: RuntimeEvent, RUntimeCall, RuntimeOrigin

* maintenance-mode: RuntimeEvent, RUntimeCall, RuntimeOrigin

* migrations: RuntimeEvent, RUntimeCall, RuntimeOrigin

* moonbeam-orbiters: RuntimeEvent, RUntimeCall, RuntimeOrigin

* proxy-genesis: RuntimeEvent, RUntimeCall, RuntimeOrigin

* randomness: RuntimeEvent, RUntimeCall, RuntimeOrigin

* xcm-transactor: RuntimeEvent, RUntimeCall, RuntimeOrigin

* FMT

* assets-erc20-precomp: RuntimeEvent, RUntimeCall, RuntimeOrigin and new weights

* author-mapping-precomp: RuntimeEvent, RUntimeCall, RuntimeOrigin and new weights

* balances-precomp: RuntimeEvent, RUntimeCall, RuntimeOrigin and new weights

* batch-precomp: RuntimeEvent, RUntimeCall, RuntimeOrigin and new weights

* call-permit: RuntimeEvent, RUntimeCall, RuntimeOrigin and new weights

* collective-precomp: RuntimeEvent, RUntimeCall, RuntimeOrigin and new weights

* crowdloan-precomp: RuntimeEvent, RUntimeCall, RuntimeOrigin and new weights

* new cargo lock

* Fix error on toml

* pallet-democracy:runtimecall, runtime:origin

* staking-precomp:runtimecall, runtime:origin

* democracy-precomp:runtimecall, runtimeorigin

* randomness-precomp:runtimecall, runtimeorigin

* relay-encoder-precomp:runtimecall, runtimeorigin

* xcm-transactor-precomp:runtimecall, runtimeorigin

* xcm-utils-precomp:runtimecall, runtimeorigin

* xtokens-precomp:runtimecall, runtimeorigin

* precompile fmt

* Adapting moonbase to RuntimeEvent, RuntimeCall, RuntimeOrigin

* Fix moonbase runtime, which compiles now

* Adapt moonriver runtime to: democracy changes, RuntimeOrigin, RuntimeEvent, RuntimeCall

* moonbeam

* Adapt everything to clap 4.0.9

* FMT and fix democracy precompiles

* Start fixing pallet-democracy precompile tests

* BRing back note_preimage tests, imminent is removed

* Bring back imminent preimage

* moonbase tests updated

* FMT

* moonriver tests working

* install protoc in ci

* try again without sudo

* try again, this time manually

* Moonriver fmt, test fixes

* Fix moonbeam rust tests

* Fix last rust tests

* Adapt weight calculus to new weight system

* start fixing typescript tests

* Keep fixing tests

* Dispatch info now returns with base weight

* fix queue now new weight

* Keep fixing new weight related tests

* remove proto installation

* fix again github job

* Point at official evm and ethereum crates

* Debugging scheduler not working

* Keep fixing bounded democracy test calls

* Fix crowdloan democracy test

* Keep fixing tests

* More fixes related to weights and democracy

* FMT

* toml sort

* prettier

* more prettier

* compile benchmarks

* toml sort

* remove warning

* remove unused var

* Cargo lock

* fix proxy-governance test

* change democracy-proposal test

* More fixes

* Fix latest of democracy tests

* Add remaining migrations from BoundedCall

* Upgrade to 0.9.32

* FMT

* toml sort

* prettier

* editorconfig

* update polkadot api

* fix ega

* add proxy filters, this time in create_pure and kill_pure

* Add couple of db reads

* remove some as anys

* Revert "remove some as anys"

This reverts commit 5c9294a.

* fix try-runtime

* try-runtime hooks being executed

* Add pr suggestions

* warnings cleared

* more unused imports

* Fix merge error

* prettier

* add when runtime migrations were completed

* remove migrations that have already run and that require maintenance

* Preimage lazy migration (moonbeam-foundation#1962)

* migration call

* add new migration Call to runtimes

* unit tests

* benchmarking

* Benchmarking from the benchmarking server

* toml fmt

Co-authored-by: girazoki <[email protected]>

* fmt

* 0.9.31 ts fixes (moonbeam-foundation#1966)

* ts fixes

* small fixes

* lint

Co-authored-by: nanocryk <[email protected]>
Co-authored-by: Tim B <[email protected]>
Co-authored-by: Crystalin <[email protected]>
  • Loading branch information
@girazoki @nanocryk
@timbrinded @crystalin @imstar15
4 people authored and imstar15 committed May 16, 2023
1 parent c8688ae commit 13df414
Show file tree
Hide file tree
Showing 203 changed files with 7,906 additions and 6,373 deletions.
2,958 changes: 1,592 additions & 1,366 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bin/utils/moonkey/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ name = "moonkey"
path = "src/main.rs"

[dependencies]
clap = { version = "3.1", features = [ "derive" ] }
clap = { version = "4.0.9", features = [ "derive" ] }
cli-opt = { package = "moonbeam-cli-opt", path = "../../../node/cli-opt", default-features = false }
2 changes: 1 addition & 1 deletion client/rpc-core/trace/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository = "https://github.com/PureStake/moonbeam/"
version = "0.6.0"

[dependencies]
ethereum-types = "0.13.1"
ethereum-types = "0.14"
futures = { version = "0.3.1", features = [ "compat" ] }
jsonrpsee = { version = "0.15.0", default-features = false, features = [ "macros", "server" ] }
moonbeam-client-evm-tracing = { path = "../../evm-tracing" }
Expand Down
6 changes: 3 additions & 3 deletions client/rpc-core/txpool/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ repository = "https://github.com/PureStake/moonbeam/"
version = "0.6.0"

[dependencies]
ethereum = { version = "0.12.0", default-features = false, features = [ "with-codec" ] }
ethereum-types = "0.13.1"
ethereum = { version = "0.14.0", default-features = false, features = [ "with-codec" ] }
ethereum-types = "0.14"
jsonrpsee = { version = "0.15.0", default-features = false, features = [ "macros", "server" ] }
serde = { version = "1.0", features = [ "derive" ] }
serde_json = "1.0"

fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
2 changes: 1 addition & 1 deletion client/rpc-core/types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ repository = "https://github.com/PureStake/moonbeam/"
version = "0.1.0"

[dependencies]
ethereum-types = "0.13.1"
ethereum-types = "0.14"
serde = { version = "1.0", features = [ "derive" ] }
serde_json = "1.0"
12 changes: 6 additions & 6 deletions client/rpc/debug/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }

# Frontier
ethereum = { version = "0.12.0", default-features = false, features = [ "with-codec" ] }
ethereum-types = "0.13.1"
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29", features = [ "rpc_binary_search_estimate" ] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
ethereum = { version = "0.14.0", default-features = false, features = [ "with-codec" ] }
ethereum-types = "0.14"
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32", features = [ "rpc_binary_search_estimate" ] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
4 changes: 2 additions & 2 deletions client/rpc/manual-xcm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ hex-literal = "0.3.3"
jsonrpsee = { version = "0.15.0", default-features = false, features = [ "macros", "server" ] }
parity-scale-codec = "3.0.0"
tokio = { version = "1.12.0", features = [ "sync", "time" ] }
xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29", default-features = false }
xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32", default-features = false }

cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
12 changes: 6 additions & 6 deletions client/rpc/trace/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ repository = "https://github.com/PureStake/moonbeam/"
version = "0.6.0"

[dependencies]
ethereum = { version = "0.12.0", features = [ "with-codec" ] }
ethereum-types = "0.13.1"
ethereum = { version = "0.14.0", features = [ "with-codec" ] }
ethereum-types = "0.14"
futures = { version = "0.3" }
jsonrpsee = { version = "0.15.0", default-features = false, features = [ "macros", "server" ] }
serde = { version = "1.0", features = [ "derive" ] }
Expand All @@ -36,7 +36,7 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }

# Frontier
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29", features = [ "rpc_binary_search_estimate" ] }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32", features = [ "rpc_binary_search_estimate" ] }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
4 changes: 2 additions & 2 deletions client/rpc/txpool/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkad
sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }

# Frontier
ethereum-types = "0.13.1"
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29", features = [ "rpc_binary_search_estimate" ] }
ethereum-types = "0.14"
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32", features = [ "rpc_binary_search_estimate" ] }
4 changes: 2 additions & 2 deletions client/vrf/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkad
session-keys-primitives = { path = "../../primitives/session-keys" }

# Nimbus
nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.29" }
nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.32" }

# Polkadot
polkadot-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29" }
polkadot-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32" }
4 changes: 2 additions & 2 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ tempfile = "3.2.0"
tracing-core = "0.1.29"

# Benchmarking
pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29" }
xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29" }
pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32" }
xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32" }

[features]
default = [ "moonbase-native", "moonbeam-native", "moonriver-native" ]
Expand Down
4 changes: 2 additions & 2 deletions node/cli-opt/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ version = "0.28.0"

[dependencies]
bip32 = { git = "https://github.com/purestake/crates", branch = "bip32-v0.4.0-fix", default-features = false, features = [ "bip39" ] }
clap = { version = "3.1", features = [ "derive" ] }
clap = { version = "4.0.9", features = [ "derive" ] }
libsecp256k1 = "0.7"
primitive-types = "0.11.0"
primitive-types = "0.12.0"
sha3 = "0.10"
tiny-bip39 = "0.8"
url = "2.2.2"
Expand Down
2 changes: 1 addition & 1 deletion node/cli-opt/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use std::str::FromStr;
pub mod account_key;

/// Block authoring scheme to be used by the dev service.
#[derive(Debug)]
#[derive(Debug, Copy, Clone)]
pub enum Sealing {
/// Author a block immediately upon receiving a transaction into the transaction pool
Instant,
Expand Down
20 changes: 10 additions & 10 deletions node/cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors = [ "PureStake" ]
edition = "2021"
version = "0.28.0"
[dependencies]
clap = { version = "3.1", features = [ "derive" ] }
clap = { version = "4.0.9", features = [ "derive" ] }
log = "0.4.8"
parity-scale-codec = "3.0.0"

Expand All @@ -26,16 +26,16 @@ substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29", optional = true }

# Cumulus / Nimbus
cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.32" }

# Polkadot
polkadot-cli = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29" }
polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29" }
polkadot-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29" }
polkadot-service = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29" }
polkadot-cli = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32" }
polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32" }
polkadot-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32" }
polkadot-service = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32" }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
Expand All @@ -49,7 +49,7 @@ moonbase-native = [ "service/moonbase-native", "westend-native" ]
moonbeam-native = [ "service/moonbeam-native" ]
moonriver-native = [ "service/moonriver-native" ]

runtime-benchmarks = [ "service/runtime-benchmarks" ]
runtime-benchmarks = [ "polkadot-service/runtime-benchmarks", "service/runtime-benchmarks" ]
try-runtime = [
"service/try-runtime",
"try-runtime-cli",
Expand Down
4 changes: 1 addition & 3 deletions node/cli/src/cli.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,7 @@ pub struct RunCmd {
long,
conflicts_with = "collator",
conflicts_with = "validator",
use_value_delimiter = true,
require_value_delimiter = true,
multiple_values = true
value_delimiter = ','
)]
pub ethapi: Vec<EthApi>,

Expand Down
6 changes: 6 additions & 0 deletions node/cli/src/command.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,12 @@ pub fn run() -> Result<()> {
_ => panic!("invalid chain spec"),
}
}
#[cfg(not(feature = "runtime-benchmarks"))]
BenchmarkCmd::Storage(_) => Err(
"Storage benchmarking can be enabled with `--features runtime-benchmarks`."
.into(),
),
#[cfg(feature = "runtime-benchmarks")]
BenchmarkCmd::Storage(cmd) => {
let chain_spec = &runner.config().chain_spec;
match chain_spec {
Expand Down
61 changes: 30 additions & 31 deletions node/service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ parking_lot = "0.12.0"
serde = { version = "1.0.101", features = [ "derive" ] }
serde_json = "1.0"
sha3 = { version = "0.10", default-features = false }
structopt = "0.3"
tiny-bip39 = { version = "0.8", default-features = false }
tokio = { version = "1.13.0", features = [ "macros", "sync" ] }
trie-root = "0.15.2"
Expand Down Expand Up @@ -92,40 +91,40 @@ substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate",
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }

# Frontier
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fc-mapping-sync = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29", features = [ "rpc_binary_search_estimate" ] }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fp-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
fp-storage = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29" }
pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.29", features = [ "forbid-evm-reentrancy" ] }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
fc-mapping-sync = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32", features = [ "rpc_binary_search_estimate" ] }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
fp-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
fp-storage = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32" }
pallet-ethereum = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.32", features = [ "forbid-evm-reentrancy" ] }

# Cumulus / Nimbus
cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-client-collator = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-client-consensus-common = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-client-consensus-relay-chain = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-client-network = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-relay-chain-inprocess-interface = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-relay-chain-interface = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-relay-chain-rpc-interface = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.29" }
nimbus-consensus = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.29" }
cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
cumulus-client-collator = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
cumulus-client-consensus-common = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
cumulus-client-consensus-relay-chain = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
cumulus-client-network = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
cumulus-client-service = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
cumulus-relay-chain-inprocess-interface = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
cumulus-relay-chain-interface = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
cumulus-relay-chain-rpc-interface = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
cumulus-test-relay-sproof-builder = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.32" }
nimbus-consensus = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.32" }
# TODO we should be able to depend only on the primitives crate once we move the inherent data provider there.
nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.29" }
pallet-author-inherent = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.29" }
nimbus-primitives = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.32" }
pallet-author-inherent = { git = "https://github.com/purestake/nimbus", branch = "moonbeam-polkadot-v0.9.32" }

# Polkadot
polkadot-cli = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29" }
polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29" }
polkadot-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29" }
polkadot-service = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29" }
xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29", default-features = false }
polkadot-cli = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32" }
polkadot-parachain = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32" }
polkadot-primitives = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32" }
polkadot-service = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32" }
xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32", default-features = false }

# Benchmarking
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
Expand All @@ -138,7 +137,7 @@ prometheus = { version = "0.13.0", default-features = false }
rand = "0.7.3"

# Polkadot dev-dependencies
polkadot-runtime-common = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.29" }
polkadot-runtime-common = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.32" }

# Substrate dev-dependencies
pallet-sudo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.29" }
Expand Down
4 changes: 2 additions & 2 deletions node/service/src/chain_spec/fake_spec.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ impl sc_service::ChainSpec for FakeSpec {
todo!()
}

fn boot_nodes(&self) -> &[sc_network::config::MultiaddrWithPeerId] {
fn boot_nodes(&self) -> &[sc_network_common::config::MultiaddrWithPeerId] {
todo!()
}

Expand Down Expand Up @@ -72,7 +72,7 @@ impl sc_service::ChainSpec for FakeSpec {
todo!()
}

fn add_boot_node(&mut self, _addr: sc_network::config::MultiaddrWithPeerId) {
fn add_boot_node(&mut self, _addr: sc_network_common::config::MultiaddrWithPeerId) {
todo!()
}

Expand Down
Loading

0 comments on commit 13df414

Please sign in to comment.