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

grandpa: fix creation of justification with equivocating precommits in commit #11302

Merged
paritytech-processbot merged 5 commits into from
Jun 14, 2022
Merged

grandpa: fix creation of justification with equivocating precommits in commit #11302

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
750cdad
grandpa: fix creation of justification ancestry
andresilva Apr 26, 2022
5a48a9a
grandpa: bump to 0.16.0
andresilva Apr 26, 2022
367174b
grandpa: add test for justification with equivocation
andresilva Apr 26, 2022
2eed07d
Merge branch 'master' into andre/fix-grandpa-commit-validation
andresilva Jun 13, 2022
845f43a
grandpa: fix failing test
andresilva Jun 13, 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
Prev Previous commit
Next Next commit
Merge branch 'master' into andre/fix-grandpa-commit-validation
  • Loading branch information
@andresilva
andresilva committed Jun 13, 2022
commit 2eed07d6576c39d6028a703e7adb22b82561894e
4 changes: 3 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions client/finality-grandpa/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
ahash = "0.7.6"
async-trait = "0.1.50"
dyn-clone = "1.0"
finality-grandpa = { version = "0.15.0", features = ["derive-codec"] }
finality-grandpa = { version = "0.16.0", features = ["derive-codec"] }
futures = "0.3.21"
futures-timer = "3.0.1"
hex = "0.4.2"
Expand Down Expand Up @@ -45,16 +45,14 @@ sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
sp-core = { version = "6.0.0", path = "../../primitives/core" }
sp-finality-grandpa = { version = "4.0.0-dev", path = "../../primitives/finality-grandpa" }
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.10.0-dev" }
sc-block-builder = { version = "0.10.0-dev", path = "../block-builder" }
finality-grandpa = { version = "0.16.0", features = ["derive-codec"] }
async-trait = "0.1.50"
sp-keystore = { version = "0.12.0", path = "../../primitives/keystore" }
sp-runtime = { version = "6.0.0", path = "../../primitives/runtime" }

[dev-dependencies]
assert_matches = "1.3.0"
finality-grandpa = { version = "0.16.0", features = [
"derive-codec",
"test-helpers",
"derive-codec",
"test-helpers",
] }
serde = "1.0.136"
tempfile = "3.1.0"
Expand Down
14 changes: 1 addition & 13 deletions client/finality-grandpa/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ readme = "README.md"
homepage = "https://substrate.io"

[dependencies]
finality-grandpa = { version = "0.15.0", features = ["derive-codec"] }
finality-grandpa = { version = "0.16.0", features = ["derive-codec"] }
futures = "0.3.16"
jsonrpsee = { version = "0.13.0", features = ["server", "macros"] }
log = "0.4.8"
Expand All @@ -24,18 +24,6 @@ sc-rpc = { version = "4.0.0-dev", path = "../../rpc" }
sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
sp-core = { version = "6.0.0", path = "../../../primitives/core" }
sp-runtime = { version = "6.0.0", path = "../../../primitives/runtime" }
finality-grandpa = { version = "0.16.0", features = ["derive-codec"] }
jsonrpc-core = "18.0.0"
jsonrpc-core-client = "18.0.0"
jsonrpc-derive = "18.0.0"
jsonrpc-pubsub = "18.0.0"
futures = "0.3.16"
serde = { version = "1.0.105", features = ["derive"] }
serde_json = "1.0.50"
log = "0.4.8"
thiserror = "1.0"
parity-scale-codec = { version = "3.0.0", features = ["derive"] }
sc-client-api = { version = "4.0.0-dev", path = "../../api" }

[dev-dependencies]
sc-block-builder = { version = "0.10.0-dev", path = "../../block-builder" }
Expand Down
4 changes: 2 additions & 2 deletions frame/grandpa/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ sp-staking = { version = "4.0.0-dev", default-features = false, path = "../../pr
sp-std = { version = "4.0.0", default-features = false, path = "../../primitives/std" }

[dev-dependencies]
frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
grandpa = { package = "finality-grandpa", version = "0.16.0", features = ["derive-codec"] }
sp-keyring = { version = "6.0.0", path = "../../primitives/keyring" }
frame-benchmarking = { version = "4.0.0-dev", path = "../benchmarking" }
frame-election-provider-support = { version = "4.0.0-dev", path = "../election-provider-support" }
pallet-balances = { version = "4.0.0-dev", path = "../balances" }
pallet-offences = { version = "4.0.0-dev", path = "../offences" }
pallet-staking = { version = "4.0.0-dev", path = "../staking" }
Expand Down
6 changes: 3 additions & 3 deletions primitives/finality-grandpa/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
grandpa = { package = "finality-grandpa", version = "0.16.0", default-features = false, features = ["derive-codec"] }
log = { version = "0.4.16", optional = true }
serde = { version = "1.0.136", optional = true, features = ["derive"] }
log = { version = "0.4.17", optional = true }
scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
serde = { version = "1.0.136", features = ["derive"], optional = true }
sp-api = { version = "4.0.0-dev", default-features = false, path = "../api" }
sp-application-crypto = { version = "6.0.0", default-features = false, path = "../application-crypto" }
sp-core = { version = "6.0.0", default-features = false, path = "../core" }
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.