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
574 changes: 286 additions & 288 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ version.workspace = true
authors = ["Parity Technologies <[email protected]>"]
edition = "2021"
repository = "https://github.com/paritytech/polkadot.git"
version = "0.9.40"
version = "0.9.41"

[dependencies]
color-eyre = { version = "0.6.1", default-features = false }
Expand All @@ -32,7 +32,7 @@ assert_cmd = "2.0.4"
nix = { version = "0.26.1", features = ["signal"] }
tempfile = "3.2.0"
tokio = "1.24.2"
substrate-rpc-client = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
substrate-rpc-client = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
polkadot-core-primitives = { path = "core-primitives" }

[workspace]
Expand Down
24 changes: 12 additions & 12 deletions cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@ polkadot-client = { path = "../node/client", optional = true }
polkadot-node-core-pvf = { path = "../node/core/pvf", optional = true }
polkadot-performance-test = { path = "../node/test/performance-test", optional = true }

sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-io = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-keyring = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
frame-benchmarking-cli = { git = "https://github.com/CherryNetwork/substrate", optional = true , branch = "cherry-testnet" }
try-runtime-cli = { git = "https://github.com/CherryNetwork/substrate", optional = true , branch = "cherry-testnet" }
sc-cli = { git = "https://github.com/CherryNetwork/substrate", optional = true , branch = "cherry-testnet" }
sc-service = { git = "https://github.com/CherryNetwork/substrate", optional = true , branch = "cherry-testnet" }
sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-io = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-keyring = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
frame-benchmarking-cli = { git = "https://github.com/CherryNetwork/substrate", optional = true , branch = "upgrade-to-v0.9.41" }
try-runtime-cli = { git = "https://github.com/CherryNetwork/substrate", optional = true , branch = "upgrade-to-v0.9.41" }
sc-cli = { git = "https://github.com/CherryNetwork/substrate", optional = true , branch = "upgrade-to-v0.9.41" }
sc-service = { git = "https://github.com/CherryNetwork/substrate", optional = true , branch = "upgrade-to-v0.9.41" }
polkadot-node-metrics = { path = "../node/metrics" }
sc-tracing = { git = "https://github.com/CherryNetwork/substrate", optional = true , branch = "cherry-testnet" }
sc-sysinfo = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sc-executor = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sc-storage-monitor = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sc-tracing = { git = "https://github.com/CherryNetwork/substrate", optional = true , branch = "upgrade-to-v0.9.41" }
sc-sysinfo = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sc-executor = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sc-storage-monitor = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
substrate-build-script-utils = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }

[features]
default = ["db", "cli", "full-node", "cherry-native"]
Expand Down
4 changes: 4 additions & 0 deletions cli/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ pub enum Subcommand {
#[derive(Debug, Parser)]
pub struct ValidationWorkerCommand {
/// The path to the validation host's socket.
#[arg(long)]
pub socket_path: String,
/// Calling node implementation version
#[arg(long)]
pub node_impl_version: String,
}

#[allow(missing_docs)]
Expand Down
10 changes: 8 additions & 2 deletions cli/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,10 @@ pub fn run() -> Result<()> {

#[cfg(not(target_os = "android"))]
{
polkadot_node_core_pvf::prepare_worker_entrypoint(&cmd.socket_path);
polkadot_node_core_pvf::prepare_worker_entrypoint(
&cmd.socket_path,
Some(&cmd.node_impl_version),
);
Ok(())
}
},
Expand All @@ -443,7 +446,10 @@ pub fn run() -> Result<()> {

#[cfg(not(target_os = "android"))]
{
polkadot_node_core_pvf::execute_worker_entrypoint(&cmd.socket_path);
polkadot_node_core_pvf::execute_worker_entrypoint(
&cmd.socket_path,
Some(&cmd.node_impl_version),
);
Ok(())
}
},
Expand Down
6 changes: 3 additions & 3 deletions core-primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ authors.workspace = true
edition.workspace = true

[dependencies]
sp-core = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "cherry-testnet" }
sp-std = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "cherry-testnet" }
sp-runtime = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "cherry-testnet" }
sp-core = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "upgrade-to-v0.9.41" }
sp-std = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "upgrade-to-v0.9.41" }
sp-runtime = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "upgrade-to-v0.9.41" }
scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
parity-scale-codec = { version = "3.3.0", default-features = false, features = [ "derive" ] }

Expand Down
4 changes: 2 additions & 2 deletions erasure-coding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ polkadot-primitives = { path = "../primitives" }
polkadot-node-primitives = { package = "polkadot-node-primitives", path = "../node/primitives" }
novelpoly = { package = "reed-solomon-novelpoly", version = "1.0.0" }
parity-scale-codec = { version = "3.3.0", default-features = false, features = ["std", "derive"] }
sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-trie = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-trie = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
thiserror = "1.0.31"

[dev-dependencies]
Expand Down
56 changes: 28 additions & 28 deletions node/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,36 +7,36 @@ edition.workspace = true
[dependencies]
async-trait = "0.1.57"
futures = "0.3.21"
frame-benchmarking = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
frame-benchmarking-cli = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
pallet-transaction-payment = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
frame-system = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
frame-system-rpc-runtime-api = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
frame-benchmarking = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
frame-benchmarking-cli = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
pallet-transaction-payment = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
frame-system = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
frame-system-rpc-runtime-api = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }

sp-consensus = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-storage = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-runtime = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-blockchain = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-api = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-keyring = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-inherents = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-timestamp = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-session = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-authority-discovery = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-consensus-babe = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-consensus-beefy = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-consensus-grandpa = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-transaction-pool = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-offchain = { package = "sp-offchain", git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-block-builder = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-mmr-primitives = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "cherry-testnet" }
sp-consensus = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-storage = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-runtime = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-blockchain = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-api = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-keyring = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-inherents = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-timestamp = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-session = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-authority-discovery = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-consensus-babe = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-consensus-beefy = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-consensus-grandpa = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-transaction-pool = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-offchain = { package = "sp-offchain", git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-block-builder = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-mmr-primitives = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "upgrade-to-v0.9.41" }

sc-consensus = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sc-executor = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sc-client-api = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sc-service = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "cherry-testnet" }
sc-consensus = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sc-executor = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sc-client-api = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sc-service = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "upgrade-to-v0.9.41" }

# Polkadot Runtimes
cherry-runtime = { path = "../../runtime/cherry", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions node/collation-generation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ polkadot-node-primitives = { path = "../primitives" }
polkadot-node-subsystem = { path = "../subsystem" }
polkadot-node-subsystem-util = { path = "../subsystem-util" }
polkadot-primitives = { path = "../../primitives" }
sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-maybe-compressed-blob = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-maybe-compressed-blob = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
thiserror = "1.0.31"
parity-scale-codec = { version = "3.3.0", default-features = false, features = ["bit-vec", "derive"] }

Expand Down
18 changes: 9 additions & 9 deletions node/core/approval-voting/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
polkadot-node-jaeger = { path = "../../jaeger" }

sc-keystore = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "cherry-testnet" }
sp-consensus = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "cherry-testnet" }
sp-consensus-slots = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "cherry-testnet" }
sp-application-crypto = { git = "https://github.com/CherryNetwork/substrate", default-features = false, features = ["full_crypto"] , branch = "cherry-testnet" }
sp-runtime = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "cherry-testnet" }
sc-keystore = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "upgrade-to-v0.9.41" }
sp-consensus = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "upgrade-to-v0.9.41" }
sp-consensus-slots = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "upgrade-to-v0.9.41" }
sp-application-crypto = { git = "https://github.com/CherryNetwork/substrate", default-features = false, features = ["full_crypto"] , branch = "upgrade-to-v0.9.41" }
sp-runtime = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "upgrade-to-v0.9.41" }

[dev-dependencies]
async-trait = "0.1.57"
parking_lot = "0.12.0"
rand_core = "0.5.1" # should match schnorrkel
sp-keyring = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-keystore = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-consensus-babe = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-keyring = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-keystore = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-consensus-babe = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
assert_matches = "1.4.0"
kvdb-memorydb = "0.13.0"
Expand Down
6 changes: 3 additions & 3 deletions node/core/av-store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-overseer = { path = "../../overseer" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
sp-consensus = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "cherry-testnet" }
sp-consensus = { git = "https://github.com/CherryNetwork/substrate", default-features = false , branch = "upgrade-to-v0.9.41" }

[dev-dependencies]
log = "0.4.17"
env_logger = "0.9.0"
assert_matches = "1.4.0"
kvdb-memorydb = "0.13.0"

sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-keyring = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-keyring = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
parking_lot = "0.12.0"
test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" }
12 changes: 6 additions & 6 deletions node/core/backing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition.workspace = true

[dependencies]
futures = "0.3.21"
sp-keystore = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-keystore = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-primitives = { path = "../../primitives" }
polkadot-node-subsystem = {path = "../../subsystem" }
Expand All @@ -19,11 +19,11 @@ thiserror = "1.0.31"
fatality = "0.0.6"

[dev-dependencies]
sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-application-crypto = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-keyring = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sc-keystore = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-tracing = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-core = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-application-crypto = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-keyring = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sc-keystore = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
sp-tracing = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
futures = { version = "0.3.21", features = ["thread-pool"] }
assert_matches = "1.4.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
Expand Down
2 changes: 1 addition & 1 deletion node/core/bitfield-signing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gum = { package = "tracing-gum", path = "../../gum" }
polkadot-primitives = { path = "../../../primitives" }
polkadot-node-subsystem = { path = "../../subsystem" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
sp-keystore = { git = "https://github.com/CherryNetwork/substrate", branch = "cherry-testnet" }
sp-keystore = { git = "https://github.com/CherryNetwork/substrate", branch = "upgrade-to-v0.9.41" }
wasm-timer = "0.2.5"
thiserror = "1.0.31"

Expand Down
Loading