Return babe configuration information in the babe api epoch functions #8072

expenses · 2021-02-08T14:05:28Z

polkadot companion: paritytech/polkadot#2467

This PR is an attempt to solve #8060. I'm not very familiar with decl_storage!, so I need to figure a few things out before I can continue.

frame/babe/src/lib.rs

andresilva

I think we need to have 3 storage entries:

EpochConfig: BabeEpochConfiguration - We need to make the module's genesis config (add_extra_genesis) take this as a parameter.
NextEpochConfig: Option<BabeEpochConfiguration> - This represents the config for epoch N+1 which is already set in stone (i.e. it was already previously announced). When implementing fn next_config() we read from here, if it's None then we return the value from EpochConfig since the config for the next epoch is the same as the current one.
PendingEpochConfigChange: Option<NextConfigDescriptor> - This is the current NextEpochConfig entry, it should be renamed to this. It represents a pending epoch config change for N+2, which will be announced once we finish the current epoch (N) and start the epoch N+1 by announcing the config for N+2.

frame/babe/src/lib.rs

primitives/consensus/babe/src/lib.rs

frame/babe/src/lib.rs

…runtime

expenses · 2021-02-18T13:32:47Z

We could also remove c and allowed_slots from BabeGenesisConfiguration, but that would require releasing a new version of the babe api and creating migrations etc.

…poch

frame/babe/src/lib.rs

primitives/consensus/babe/src/lib.rs

expenses

.

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

…poch

bkchr · 2021-03-05T17:18:22Z

frame/babe/src/lib.rs

+
+	struct __OldNextEpochConfig;
+	impl frame_support::traits::StorageInstance for __OldNextEpochConfig {
+		fn pallet_prefix() -> &'static str { "BabeApi" }


This is wrong.

Currently this is Babe and not BabeApi.

Also this should probably be configurable.

I've made it configurable, but I think it still is BabeApi. See paritytech/polkadot#2467 (comment).

…poch

frame/babe/src/lib.rs

stale

expenses · 2021-03-10T07:44:12Z

bot merge

ghost · 2021-03-10T07:44:14Z

The PR is currently unmergeable.

expenses · 2021-03-10T08:40:17Z

bot merge

ghost · 2021-03-10T08:40:22Z

Trying merge.

…paritytech#8072) * Make changes * Add serialize/deserialize, copy babe epoch config defaults from node runtime * Fix line widths and turn default features off for serde * Remove ser/deser from Epoch, fix node-cli * Apply suggestions * Add comment to BABE_GENESIS_EPOCH_CONFIG in bin * Apply suggestions * Add a sketchy migration function * Add a migration test * Check for PendingEpochConfigChange as well * Make epoch_config in node-cli * Move updating EpochConfig out of the if * Fix executor tests * Calculate weight for add_epoch_configurations * Fix babe test * Apply suggestions from code review Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> * Add more asserts to tests, remove unused changes to primitives/slots * Allow setting the migration pallet prefix * Rename to BabePalletPrefix Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

(paritytech/substrate#8072)

* Remove VestingAccount * Fix chain specs * Update rust-toolchain * Update make test and benchmark * Update CI * Run `make format` and `make clippy` * Update CI * Quick fix * Support try-runtime * Remove pallet-randomness-collective-flip * Migrate elections-phragmen (paritytech/substrate#7040) * Migrate PalletVersion to StorageVersion (paritytech/substrate#9165) * Migrate pallet-babe epoch config (paritytech/substrate#8072) * Migrate frame-system AccountInfo to AccountInfoWithTripleRefCount (paritytech/substrate#8221) * Migrate prefix `GrandpaFinality` -> `Grandpa` * Migrate prefix `Instance1Collective` -> `Council` * Migrate prefix `Instance2Collective` -> `TechnicalCommittee` * Migrate prefix `Instance1Membership` -> `TechnicalMembership` * Migrate pallet-tips prefix from `Treasury` -> `Tips` * Migrate pallet-bounties prefix from `Treasury` -> `Bounties` * Migrate prefix from `PhragmenElection` -> `Elections` * Revert `dev` spec_name * Confirm migrations order * Use ChainX substrate patch for system migration * Run `make format` * Reset spec_name `dev` -> `chainx` * Add migrations.rs for mainnet and testnet * Bump ChainX version to `4.0.0` * Bump ChainX version to `4.0.0` * Update governance parameters for dev and malan * Update malan chainspec * Quick fix * Quick fix * Update generate_keys.sh * Adjust malan parameters * Update malan chainspec * Update malan chainspec * Update malan chainspec * Rename malan testnet name * Add bootnodes url * Run `make format` * Regenerate weights * Disable pre_release.yml CI * Regenerate benchmark weights * Run `make clippy` * Run `make format` Co-authored-by: icodezjb <icodezjb@users.noreply.github.com>

expenses requested review from andresilva, rphmeier and tomusdrw February 8, 2021 14:05

github-actions bot added the A3-in_progress Pull request is in progress. No review needed at this stage. label Feb 8, 2021

expenses commented Feb 8, 2021

View reviewed changes

frame/babe/src/lib.rs Outdated Show resolved Hide resolved

expenses changed the title ~~Return babe configuration information in the~~ Return babe configuration information in the babe api epoch functions Feb 9, 2021

andresilva suggested changes Feb 16, 2021

View reviewed changes

frame/babe/src/lib.rs Outdated Show resolved Hide resolved

primitives/consensus/babe/src/lib.rs Outdated Show resolved Hide resolved

frame/babe/src/lib.rs Outdated Show resolved Hide resolved

shawntabrizi reviewed Feb 16, 2021

View reviewed changes

frame/babe/src/lib.rs Outdated Show resolved Hide resolved

Make changes

120fc30

expenses force-pushed the ashley-standalone-epoch branch from b2f4332 to 120fc30 Compare February 17, 2021 13:40

expenses commented Feb 17, 2021

View reviewed changes

frame/babe/src/lib.rs Outdated Show resolved Hide resolved

expenses requested review from andresilva and shawntabrizi February 17, 2021 13:41

Add serialize/deserialize, copy babe epoch config defaults from node …

4cbac3e

…runtime

expenses marked this pull request as ready for review February 17, 2021 14:18

github-actions bot added A0-please_review Pull request needs code review. and removed A3-in_progress Pull request is in progress. No review needed at this stage. labels Feb 17, 2021

expenses added B7-runtimenoteworthy C1-low PR touches the given topic and has a low impact on builders. labels Feb 17, 2021

expenses added 2 commits February 17, 2021 15:56

Fix line widths and turn default features off for serde

cb22034

Remove ser/deser from Epoch, fix node-cli

a85fdcd

github-actions bot added the A7-needspolkadotpr label Feb 17, 2021

expenses mentioned this pull request Feb 17, 2021

Companion PR for substrate PR 8072 - Add a config field to babe epochs paritytech/polkadot#2467

Merged

expenses added 2 commits February 18, 2021 14:38

Merge remote-tracking branch 'origin/master' into ashley-standalone-e…

2617aaf

…poch

Merge remote-tracking branch 'origin/master' into ashley-standalone-e…

b1b589f

…poch

paritytech-ci added the D2-breaksapi label Feb 22, 2021

andresilva suggested changes Feb 22, 2021

View reviewed changes

Apply suggestions

11826f0

expenses requested a review from andresilva February 22, 2021 12:19

expenses commented Mar 3, 2021

View reviewed changes

expenses and others added 3 commits March 3, 2021 09:28

Apply suggestions from code review

bdfe039

Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>

Add more asserts to tests, remove unused changes to primitives/slots

74fbbb4

Merge remote-tracking branch 'origin/master' into ashley-standalone-e…

8b9a2af

…poch

expenses requested a review from andresilva March 3, 2021 08:49

andresilva approved these changes Mar 5, 2021

View reviewed changes

bkchr approved these changes Mar 5, 2021

View reviewed changes

bkchr previously requested changes Mar 5, 2021

View reviewed changes

expenses added 2 commits March 9, 2021 09:03

Allow setting the migration pallet prefix

a49a87f

Merge remote-tracking branch 'origin/master' into ashley-standalone-e…

cec8f99

…poch

expenses requested a review from bkchr March 9, 2021 08:18

bkchr reviewed Mar 9, 2021

View reviewed changes

frame/babe/src/lib.rs Outdated Show resolved Hide resolved

frame/babe/src/lib.rs Outdated Show resolved Hide resolved

Rename to BabePalletPrefix

35ff1cf

expenses requested a review from bkchr March 9, 2021 11:20

bkchr approved these changes Mar 9, 2021

View reviewed changes

ghost merged commit 2461349 into master Mar 10, 2021

ghost deleted the ashley-standalone-epoch branch March 10, 2021 08:40

expenses mentioned this pull request Mar 11, 2021

Babe fetch epoch returns a complete epoch paritytech/smoldot#646

Merged

jordy25519 mentioned this pull request Mar 29, 2021

Re-Genesis #7458

Open

tomaka mentioned this pull request May 23, 2021

BabeApi_current_epoch() and BabeApi_next_epoch() don't give any information about configuration #8060

Closed

icodezjb mentioned this pull request Jan 27, 2022

Migrations from 11ace4ef8b2ad176293ad6db2b3dd795befd2c79 to polkadot-v0.9.11 of substrate chainx-org/ChainX#604

Closed

25 tasks

icodezjb added a commit to chainx-org/ChainX that referenced this pull request Feb 8, 2022

Migrate pallet-babe epoch config

8849287

(paritytech/substrate#8072)

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Return babe configuration information in the babe api epoch functions #8072

Return babe configuration information in the babe api epoch functions #8072

expenses commented Feb 8, 2021 •

edited

Loading

andresilva left a comment

expenses commented Feb 18, 2021

expenses left a comment •

edited

Loading

bkchr Mar 5, 2021

expenses Mar 9, 2021

expenses commented Mar 10, 2021

ghost commented Mar 10, 2021

expenses commented Mar 10, 2021

ghost commented Mar 10, 2021

Return babe configuration information in the babe api epoch functions #8072

Return babe configuration information in the babe api epoch functions #8072

Conversation

expenses commented Feb 8, 2021 • edited Loading

andresilva left a comment

Choose a reason for hiding this comment

expenses commented Feb 18, 2021

expenses left a comment • edited Loading

Choose a reason for hiding this comment

bkchr Mar 5, 2021

Choose a reason for hiding this comment

expenses Mar 9, 2021

Choose a reason for hiding this comment

expenses commented Mar 10, 2021

ghost commented Mar 10, 2021

expenses commented Mar 10, 2021

ghost commented Mar 10, 2021

expenses commented Feb 8, 2021 •

edited

Loading

expenses left a comment •

edited

Loading