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

Migrate pallet-grandpa to attribute macros #8724

Merged
18 commits merged into from
May 26, 2021
Merged

Migrate pallet-grandpa to attribute macros #8724

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f6e3a3c
frame/grandpa: migrate Config
octol May 4, 2021
b2d7383
frame/grandpa: migrate decl_module
octol May 4, 2021
19ac9fb
frame/grandpa: migrate decl_event
octol May 4, 2021
962a744
frame/grandpa: migrate decl_error
octol May 4, 2021
c172e99
frame/grandpa: migrate decl_storage
octol May 4, 2021
e5656d4
frame/grandpa: make report_equivocation_unsigned pub(super)
octol May 4, 2021
0781fe6
frame/grandpa: remove unused imports
octol May 4, 2021
9008771
frame/grandpa: replace deprecated Module with Pallet
octol May 4, 2021
4cf4f9d
frame/grandpa: add RawEvent for compatibility
octol May 4, 2021
a1c02cf
frame/grandpa: create migration to new storage prefix
octol May 6, 2021
0d9c53f
Merge remote-tracking branch 'upstream/master' into jon/migrate-grand…
octol May 6, 2021
7ae74a0
frame/grandpa: bump version to 4.0.0
octol May 6, 2021
1c8e18a
frame/grandpa: address review comments
octol May 12, 2021
ef2dfb4
Merge remote-tracking branch 'upstream/master' into jon/migrate-grand…
octol May 12, 2021
73dce62
Merge remote-tracking branch 'upstream/master' into jon/migrate-grand…
octol May 20, 2021
2065326
Try using version 3.1 instead
octol May 20, 2021
5266da4
frame/grandpa: tweak log text to say cancelled
octol May 20, 2021
32ba95b
Merge remote-tracking branch 'upstream/master' into jon/migrate-grand…
octol May 20, 2021
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
2 changes: 1 addition & 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.

2 changes: 1 addition & 1 deletion bin/node-template/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
pallet-aura = { version = "3.0.0", default-features = false, path = "../../../frame/aura" }
pallet-balances = { version = "3.0.0", default-features = false, path = "../../../frame/balances" }
frame-support = { version = "3.0.0", default-features = false, path = "../../../frame/support" }
pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../../frame/grandpa" }
pallet-grandpa = { version = "4.0.0", default-features = false, path = "../../../frame/grandpa" }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not entirely sure about this. Seems awfully convenient, but on the other hand we don't seem the change these unless we update the substrate version?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think node-template-runtime should use the latest pallet-grandpa if possible, thus I prefer to update here.
But next time we release node-template-runtime we should be careful to bump to a major version (or we can bump to a major version in this PR and not release yet).

same for other crates.

pallet-randomness-collective-flip = { version = "3.0.0", default-features = false, path = "../../../frame/randomness-collective-flip" }
pallet-sudo = { version = "3.0.0", default-features = false, path = "../../../frame/sudo" }
frame-system = { version = "3.0.0", default-features = false, path = "../../../frame/system" }
Expand Down
2 changes: 1 addition & 1 deletion bin/node/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ frame-support = { version = "3.0.0", default-features = false, path = "../../../
pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
pallet-authority-discovery = { version = "3.0.0", path = "../../../frame/authority-discovery" }
pallet-staking = { version = "3.0.0", path = "../../../frame/staking" }
pallet-grandpa = { version = "3.0.0", path = "../../../frame/grandpa" }
pallet-grandpa = { version = "4.0.0", path = "../../../frame/grandpa" }

# node-specific dependencies
node-runtime = { version = "2.0.0", path = "../runtime" }
Expand Down
2 changes: 1 addition & 1 deletion bin/node/executor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ frame-system = { version = "3.0.0", path = "../../../frame/system" }
node-testing = { version = "2.0.0", path = "../testing" }
pallet-balances = { version = "3.0.0", path = "../../../frame/balances" }
pallet-contracts = { version = "3.0.0", path = "../../../frame/contracts" }
pallet-grandpa = { version = "3.0.0", path = "../../../frame/grandpa" }
pallet-grandpa = { version = "4.0.0", path = "../../../frame/grandpa" }
pallet-im-online = { version = "3.0.0", path = "../../../frame/im-online" }
pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
pallet-session = { version = "3.0.0", path = "../../../frame/session" }
Expand Down
2 changes: 1 addition & 1 deletion bin/node/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pallet-democracy = { version = "3.0.0", default-features = false, path = "../../
pallet-election-provider-multi-phase = { version = "3.0.0", default-features = false, path = "../../../frame/election-provider-multi-phase" }
pallet-elections-phragmen = { version = "4.0.0", default-features = false, path = "../../../frame/elections-phragmen" }
pallet-gilt = { version = "3.0.0", default-features = false, path = "../../../frame/gilt" }
pallet-grandpa = { version = "3.0.0", default-features = false, path = "../../../frame/grandpa" }
pallet-grandpa = { version = "4.0.0", default-features = false, path = "../../../frame/grandpa" }
pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
pallet-indices = { version = "3.0.0", default-features = false, path = "../../../frame/indices" }
pallet-identity = { version = "3.0.0", default-features = false, path = "../../../frame/identity" }
Expand Down
2 changes: 1 addition & 1 deletion bin/node/testing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sc-client-db = { version = "0.9.0", path = "../../../client/db/", features = ["k
sc-client-api = { version = "3.0.0", path = "../../../client/api/" }
codec = { package = "parity-scale-codec", version = "2.0.0" }
pallet-contracts = { version = "3.0.0", path = "../../../frame/contracts" }
pallet-grandpa = { version = "3.0.0", path = "../../../frame/grandpa" }
pallet-grandpa = { version = "4.0.0", path = "../../../frame/grandpa" }
pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
sp-keyring = { version = "3.0.0", path = "../../../primitives/keyring" }
node-executor = { version = "2.0.0", path = "../executor" }
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
@@ -1,6 +1,6 @@
[package]
name = "pallet-grandpa"
version = "3.0.0"
version = "4.0.0"
Copy link
Contributor Author

@octol octol May 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Appears the Polkadot companion check fails with the version bumped

authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -17,6 +17,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0", default-features =
sp-application-crypto = { version = "3.0.0", default-features = false, path = "../../primitives/application-crypto" }
sp-core = { version = "3.0.0", default-features = false, path = "../../primitives/core" }
sp-finality-grandpa = { version = "3.0.0", default-features = false, path = "../../primitives/finality-grandpa" }
sp-io = { version = "3.0.0", default-features = false, path = "../../primitives/io" }
sp-session = { version = "3.0.0", default-features = false, path = "../../primitives/session" }
sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
Expand All @@ -31,7 +32,6 @@ log = { version = "0.4.14", default-features = false }
[dev-dependencies]
frame-benchmarking = { version = "3.1.0", path = "../benchmarking" }
grandpa = { package = "finality-grandpa", version = "0.14.0", features = ["derive-codec"] }
sp-io = { version = "3.0.0", path = "../../primitives/io" }
sp-keyring = { version = "3.0.0", path = "../../primitives/keyring" }
pallet-balances = { version = "3.0.0", path = "../balances" }
pallet-offences = { version = "3.0.0", path = "../offences" }
Expand Down
2 changes: 1 addition & 1 deletion frame/grandpa/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#![cfg_attr(not(feature = "std"), no_std)]

use super::{*, Module as Grandpa};
use super::{*, Pallet as Grandpa};
use frame_benchmarking::benchmarks;
use frame_system::RawOrigin;
use sp_core::H256;
Expand Down
4 changes: 2 additions & 2 deletions frame/grandpa/src/equivocation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ use sp_staking::{
SessionIndex,
};

use super::{Call, Module, Config};
use super::{Call, Pallet, Config};

/// A trait with utility methods for handling equivocation reports in GRANDPA.
/// The offence type is generic, and the trait provides , reporting an offence
Expand Down Expand Up @@ -203,7 +203,7 @@ pub struct GrandpaTimeSlot {
/// A `ValidateUnsigned` implementation that restricts calls to `report_equivocation_unsigned`
/// to local calls (i.e. extrinsics generated on this node) or that already in a block. This
/// guarantees that only block authors can include unsigned equivocation reports.
impl<T: Config> frame_support::unsigned::ValidateUnsigned for Module<T> {
impl<T: Config> frame_support::unsigned::ValidateUnsigned for Pallet<T> {
type Call = Call<T>;
fn validate_unsigned(source: TransactionSource, call: &Self::Call) -> TransactionValidity {
if let Call::report_equivocation_unsigned(equivocation_proof, key_owner_proof) = call {
Expand Down
Loading