Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

[do not merge] burn in for ed25519-zebra #5747

Closed
wants to merge 9 commits into from
Closed

[do not merge] burn in for ed25519-zebra #5747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
465a004
BURN IN repo changes
jakehemmerle Jul 2, 2022
68460a0
lol try again
jakehemmerle Jul 2, 2022
e9c7a55
youre so close
jakehemmerle Jul 2, 2022
0d32477
i hope someone reads these
jakehemmerle Jul 2, 2022
bc80488
Merge branch 'master' into ed25519-zebra-burn-in
jakehemmerle Jul 15, 2022
c452493
updated lock
jakehemmerle Jul 16, 2022
ef87614
Merge branch 'master' into ed25519-zebra-burn-in
jakehemmerle Jul 18, 2022
e3e1c3d
updated lock; broken URL
jakehemmerle Jul 18, 2022
72449f6
Merge remote-tracking branch 'origin/master' into ed25519-zebra-burn-in
bkchr Aug 7, 2022
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,579 changes: 739 additions & 840 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ assert_cmd = "2.0.4"
nix = "0.24.1"
tempfile = "3.2.0"
tokio = "1.18.2"
remote-externalities = { git = "https://github.com/paritytech/substrate", branch = "master" }
remote-externalities = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
polkadot-core-primitives = { path = "core-primitives" }

[workspace]
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Implementation of a <https://polkadot.network> node in Rust based on the Substra
> **NOTE:** In 2018, we split our implementation of "Polkadot" from its development framework
> "Substrate". See the [Substrate][substrate-repo] repo for git history prior to 2018.

[substrate-repo]: https://github.com/paritytech/substrate
[substrate-repo]: https://github.com/jakehemmerle/substrate

This repo contains runtimes for the Polkadot, Kusama, and Westend networks. The README provides
information about installing the `polkadot` binary and developing on the codebase. For more
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ automated and require no human action.
1. To initiate the release process:
1. branch master off to a release candidate branch:
- `git checkout master; git pull; git checkout -b release-v0.8.26`
2. In the [substrate](https://github.com/paritytech/substrate) repo, check out the commit used by polkadot (this can be found using the following command in the *polkadot* repo: `grep 'paritytech/substrate' Cargo.lock | grep -E '[0-9a-f]{40}' | sort | uniq `
2. In the [substrate](https://github.com/jakehemmerle/substrate) repo, check out the commit used by polkadot (this can be found using the following command in the *polkadot* repo: `grep 'paritytech/substrate' Cargo.lock | grep -E '[0-9a-f]{40}' | sort | uniq `
3. Branch off this **substrate** commit into its own branch: `git branch -b polkadot-v0.8.26; git push origin refs/heads/polkadot-v0.8.26`
4. In the **polkadot** repository, use [diener](https://github.com/bkchr/diener/) to switch to this branch: `diener update --branch "polkadot-v0.8.26" --substrate`. Update Cargo.lock (to do this, you can run `cargo build` and then ctrl+c once it finishes fetching and begins compiling)
5. Push the **polkadot** `release-v0.8.26` branch to Github: `git push origin refs/heads/release-v0.8.26`
Expand Down
22 changes: 11 additions & 11 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ 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/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sp-core = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-keyring = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
frame-benchmarking-cli = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra", optional = true }
try-runtime-cli = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra", optional = true }
sc-cli = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra", optional = true }
sc-service = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra", optional = true }
polkadot-node-metrics = { path = "../node/metrics" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master", optional = true }
sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-tracing = { git = "https://github.com/jakehemmerle/substrate", optional = true , branch = "8805-ed25519-zebra" }
sc-sysinfo = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }

# this crate is used only to enable `trie-memory-tracker` feature
# see https://github.com/paritytech/substrate/pull/6745
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
# see https://github.com/jakehemmerle/substrate/pull/6745
sp-trie = { git = "https://github.com/jakehemmerle/substrate", default-features = false , branch = "8805-ed25519-zebra" }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-build-script-utils = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }

[features]
default = ["wasmtime", "db", "cli", "hostperfcheck", "full-node", "trie-memory-tracker", "polkadot-native"]
Expand Down
6 changes: 3 additions & 3 deletions core-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"

[dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-std = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-core = { git = "https://github.com/jakehemmerle/substrate", default-features = false , branch = "8805-ed25519-zebra" }
sp-std = { git = "https://github.com/jakehemmerle/substrate", default-features = false , branch = "8805-ed25519-zebra" }
sp-runtime = { git = "https://github.com/jakehemmerle/substrate", default-features = false , branch = "8805-ed25519-zebra" }
scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
parity-scale-codec = { version = "3.1.5", default-features = false, features = [ "derive" ] }
parity-util-mem = { version = "0.11.0", default-features = false, optional = true }
Expand Down
4 changes: 2 additions & 2 deletions erasure-coding/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ 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.1.5", default-features = false, features = ["std", "derive"] }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
trie = { package = "sp-trie", git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
thiserror = "1.0.31"
56 changes: 28 additions & 28 deletions node/client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,37 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"

[dependencies]
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "master" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
frame-benchmarking = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
frame-benchmarking-cli = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
pallet-transaction-payment = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
frame-system = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
frame-system-rpc-runtime-api = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }

sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-authority-discovery = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-mmr-primitives = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-consensus = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-storage = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-runtime = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-blockchain = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-api = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-core = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-keyring = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-inherents = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-timestamp = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-session = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-authority-discovery = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-finality-grandpa = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-consensus-babe = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-transaction-pool = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-offchain = { package = "sp-offchain", git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-block-builder = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-mmr-primitives = { git = "https://github.com/jakehemmerle/substrate", default-features = false , branch = "8805-ed25519-zebra" }

sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sc-consensus = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sc-executor = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sc-client-api = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sc-service = { git = "https://github.com/jakehemmerle/substrate", default-features = false , branch = "8805-ed25519-zebra" }

beefy-primitives = { git = "https://github.com/paritytech/substrate", branch = "master" }
beefy-primitives = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }

# Polkadot Runtimes
polkadot-runtime = { path = "../../runtime/polkadot", optional = true }
Expand Down
4 changes: 2 additions & 2 deletions node/collation-generation/Cargo.toml
View file
Open in desktop
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/paritytech/substrate", branch = "master" }
sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-maybe-compressed-blob = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
thiserror = "1.0.31"
parity-scale-codec = { version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] }

Expand Down
18 changes: 9 additions & 9 deletions node/core/approval-voting/Cargo.toml
View file
Open in desktop
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/paritytech/substrate", branch = "master", default-features = false }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = ["full_crypto"] }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sc-keystore = { git = "https://github.com/jakehemmerle/substrate", default-features = false , branch = "8805-ed25519-zebra" }
sp-consensus = { git = "https://github.com/jakehemmerle/substrate", default-features = false , branch = "8805-ed25519-zebra" }
sp-consensus-slots = { git = "https://github.com/jakehemmerle/substrate", default-features = false , branch = "8805-ed25519-zebra" }
sp-application-crypto = { git = "https://github.com/jakehemmerle/substrate", default-features = false, features = ["full_crypto"] , branch = "8805-ed25519-zebra" }
sp-runtime = { git = "https://github.com/jakehemmerle/substrate", default-features = false , branch = "8805-ed25519-zebra" }

[dev-dependencies]
async-trait = "0.1.56"
parking_lot = "0.12.0"
rand_core = "0.5.1" # should match schnorrkel
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-keystore = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-core = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-consensus-babe = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
assert_matches = "1.4.0"
kvdb-memorydb = "0.11.0"
Expand Down
4 changes: 2 additions & 2 deletions node/core/av-store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ env_logger = "0.9.0"
assert_matches = "1.4.0"
kvdb-memorydb = "0.11.0"

sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"

[dependencies]
futures = "0.3.21"
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keystore = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
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/paritytech/substrate", branch = "master" }
sp-application-crypto = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-application-crypto = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-keyring = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sc-keystore = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
sp-tracing = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
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
View file
Open in desktop
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/paritytech/substrate", branch = "master" }
sp-keystore = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
wasm-timer = "0.2.5"
thiserror = "1.0.31"

Expand Down
6 changes: 3 additions & 3 deletions node/core/candidate-validation/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ async-trait = "0.1.53"
futures = "0.3.21"
gum = { package = "tracing-gum", path = "../../gum" }

sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "https://github.com/paritytech/substrate", branch = "master" }
sp-maybe-compressed-blob = { package = "sp-maybe-compressed-blob", git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
parity-scale-codec = { version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] }

polkadot-primitives = { path = "../../../primitives" }
Expand All @@ -22,9 +22,9 @@ polkadot-node-subsystem-util = { path = "../../subsystem-util" }
polkadot-node-core-pvf = { path = "../pvf" }

[dev-dependencies]
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
futures = { version = "0.3.21", features = ["thread-pool"] }
assert_matches = "1.4.0"
polkadot-node-subsystem-test-helpers = { path = "../../subsystem-test-helpers" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/jakehemmerle/substrate", branch = "8805-ed25519-zebra" }
test-helpers = { package = "polkadot-primitives-test-helpers", path = "../../../primitives/test-helpers" }
Loading