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

Update Substrate deps for native support #857

Merged
merged 6 commits into from
Jul 8, 2024
Merged

Update Substrate deps for native support #857

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db934b3
Update deps to custom Substrate branch
JasonTulp Jul 2, 2024
3c3e98c
Move all deps to workspace cargo.toml
JasonTulp Jul 2, 2024
35dcceb
Add patch for substrate branch
JasonTulp Jul 4, 2024
b78a5b5
Merge branch 'feat/substrate-v1.0.0' into feat/substrate-v1.0.0-native
JasonTulp Jul 4, 2024
38147fb
Update nightly version to 2024-04-29 (First build for Rust 1.80.0)
JasonTulp Jul 8, 2024
5f22f10
Update nightly to latest, remove default-features from patch
JasonTulp Jul 8, 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
1,668 changes: 835 additions & 833 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

148 changes: 147 additions & 1 deletion Cargo.toml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ try-runtime-cli = { workspace = true, optional = true }
# CLI-specific dependencies

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0" }
substrate-build-script-utils = { workspace = true, default-features = true }

[features]
default = ["rocksdb"]
Expand Down
4 changes: 2 additions & 2 deletions ethy-gadget/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ log = { workspace = true }
thiserror = { workspace = true }
codec = { workspace = true }
libsecp256k1 = { workspace = true }
prometheus = { package = "substrate-prometheus-endpoint", git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", version = "0.10.0-dev", default-features = false }
substrate-prometheus-endpoint = { workspace = true }
sc-chain-spec = { workspace = true }
sc-client-api = { workspace = true }
sc-keystore = { workspace = true }
Expand Down Expand Up @@ -45,7 +45,7 @@ serde = { workspace = true }
tokio = { workspace = true }
sc-consensus = { workspace = true }
sc-service = { workspace = true }
sc-network-test = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
sc-network-test = { workspace = true }
sc-block-builder = { workspace = true }
sp-consensus-grandpa = { workspace = true }
sp-keyring = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion ethy-gadget/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
use std::sync::Arc;

use log::debug;
use prometheus::Registry;
use substrate_prometheus_endpoint::Registry;

use sc_client_api::{Backend, BlockchainEvents, Finalizer};
use sc_network::ProtocolName;
Expand Down
2 changes: 1 addition & 1 deletion ethy-gadget/src/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

//! ETHY Prometheus metrics definition

use prometheus::{register, Counter, Gauge, PrometheusError, Registry, U64};
use substrate_prometheus_endpoint::{register, Counter, Gauge, PrometheusError, Registry, U64};

/// ETHY metrics exposed through Prometheus
pub(crate) struct Metrics {
Expand Down
2 changes: 1 addition & 1 deletion pallet/vortex-distribution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pallet-assets-ext = { workspace = true, default-features = true }
frame-election-provider-support = { workspace = true }
pallet-session = { workspace = true }
pallet-bags-list = { workspace = true }
pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
pallet-staking-reward-curve = { workspace = true }

[features]
default = ["std"]
Expand Down
10 changes: 5 additions & 5 deletions runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ try-runtime-cli = { workspace = true, optional = true }

# Benchmark dependencies
frame-benchmarking = { workspace = true, optional = true }
frame-system-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
pallet-session-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
pallet-election-provider-support-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false, optional = true }
frame-system-benchmarking = { workspace = true, optional = true }
pallet-session-benchmarking = { workspace = true, optional = true }
pallet-election-provider-support-benchmarking = { workspace = true, optional = true }

[build-dependencies]
substrate-wasm-builder = { workspace = true, default-features = true }
Expand All @@ -133,8 +133,8 @@ ethabi = { workspace = true }
substrate-test-runtime-client = { workspace = true }
tokio = { workspace = true }
ethereum = { version = "0.14.0", default-features = false }
frame-remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v1.0.0", default-features = false }
frame-remote-externalities = { workspace = true }
sp-externalities = { workspace = true }

[features]
default = [ "std" ]
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "nightly-2023-05-22"
channel = "nightly-2024-04-29"
targets = ["wasm32-unknown-unknown"]
profile = "default" # include rustfmt, clippy