From 8172daf822cdb8262c8550fba9b25fba21705f9a Mon Sep 17 00:00:00 2001 From: Andrei Navoichyk Date: Fri, 14 Jan 2022 12:27:35 +0300 Subject: [PATCH 1/4] Set shorted duration --- .../workflows/build-and-push-docker-image.yml | 2 +- bin/node/runtime/src/lib.rs | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-and-push-docker-image.yml b/.github/workflows/build-and-push-docker-image.yml index 7891195d90e2a..c2fd5fcf88230 100644 --- a/.github/workflows/build-and-push-docker-image.yml +++ b/.github/workflows/build-and-push-docker-image.yml @@ -3,7 +3,7 @@ on: push: branches: - dev-cere - - 'feature/**' + - feature/decrease-durations-for-simulations env: ECR_REPOSITORY: pos-network-node jobs: diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index 12bd2e03a720b..85abc9ec1976d 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -547,13 +547,13 @@ impl pallet_election_provider_multi_phase::Config for Runtime { } parameter_types! { - pub const LaunchPeriod: BlockNumber = 1 * 24 * 60 * MINUTES; - pub const VotingPeriod: BlockNumber = 1 * 24 * 60 * MINUTES; - pub const FastTrackVotingPeriod: BlockNumber = 3 * 60 * MINUTES; + pub const LaunchPeriod: BlockNumber = 5 * MINUTES; + pub const VotingPeriod: BlockNumber = 5 * MINUTES; + pub const FastTrackVotingPeriod: BlockNumber = 5 * MINUTES; pub const InstantAllowed: bool = true; - pub const MinimumDeposit: Balance = 5000 * DOLLARS; - pub const EnactmentPeriod: BlockNumber = 1 * 24 * 60 * MINUTES; - pub const CooloffPeriod: BlockNumber = 7 * 24 * 60 * MINUTES; + pub const MinimumDeposit: Balance = 10 * DOLLARS; + pub const EnactmentPeriod: BlockNumber = 5 * MINUTES; + pub const CooloffPeriod: BlockNumber = 5 * MINUTES; // One cent: $10,000 / MB pub const PreimageByteDeposit: Balance = 1 * CENTS; pub const MaxVotes: u32 = 100; @@ -606,7 +606,7 @@ impl pallet_democracy::Config for Runtime { } parameter_types! { - pub const CouncilMotionDuration: BlockNumber = 7 * DAYS; + pub const CouncilMotionDuration: BlockNumber = 5 * MINUTES; pub const CouncilMaxProposals: u32 = 100; pub const CouncilMaxMembers: u32 = 100; } @@ -628,7 +628,7 @@ parameter_types! { // 1 storage item created, key size is 32 bytes, value size is 16+16. pub const VotingBondBase: Balance = deposit(1, 64); pub const VotingBondFactor: Balance = 1 * DOLLARS; - pub const TermDuration: BlockNumber = 7 * DAYS; + pub const TermDuration: BlockNumber = 5 * MINUTES; pub const DesiredMembers: u32 = 13; pub const DesiredRunnersUp: u32 = 20; pub const ElectionsPhragmenModuleId: LockIdentifier = *b"phrelect"; @@ -658,7 +658,7 @@ impl pallet_elections_phragmen::Config for Runtime { } parameter_types! { - pub const TechnicalMotionDuration: BlockNumber = 5 * DAYS; + pub const TechnicalMotionDuration: BlockNumber = 5 * MINUTES; pub const TechnicalMaxProposals: u32 = 100; pub const TechnicalMaxMembers: u32 = 100; } @@ -694,14 +694,14 @@ impl pallet_membership::Config for Runtime { parameter_types! { pub const ProposalBond: Permill = Permill::from_percent(5); pub const ProposalBondMinimum: Balance = 100 * DOLLARS; - pub const SpendPeriod: BlockNumber = 1 * DAYS; + pub const SpendPeriod: BlockNumber = 5 * MINUTES; pub const Burn: Permill = Permill::from_percent(0); - pub const TipCountdown: BlockNumber = 1 * DAYS; + pub const TipCountdown: BlockNumber = 5 * MINUTES; pub const TipFindersFee: Percent = Percent::from_percent(20); pub const TipReportDepositBase: Balance = 1 * DOLLARS; pub const DataDepositPerByte: Balance = 1 * CENTS; pub const BountyDepositBase: Balance = 1 * DOLLARS; - pub const BountyDepositPayoutDelay: BlockNumber = 8 * DAYS; + pub const BountyDepositPayoutDelay: BlockNumber = 5 * MINUTES; pub const TreasuryModuleId: ModuleId = ModuleId(*b"py/trsry"); pub const BountyUpdatePeriod: BlockNumber = 90 * DAYS; pub const MaximumReasonLength: u32 = 16384; @@ -963,10 +963,10 @@ parameter_types! { pub const CandidateDeposit: Balance = 10 * DOLLARS; pub const WrongSideDeduction: Balance = 2 * DOLLARS; pub const MaxStrikes: u32 = 10; - pub const RotationPeriod: BlockNumber = 80 * HOURS; + pub const RotationPeriod: BlockNumber = 5 * MINUTES; pub const PeriodSpend: Balance = 500 * DOLLARS; pub const MaxLockDuration: BlockNumber = 36 * 30 * DAYS; - pub const ChallengePeriod: BlockNumber = 7 * DAYS; + pub const ChallengePeriod: BlockNumber = 15 * MINUTES; pub const MaxCandidateIntake: u32 = 10; pub const SocietyModuleId: ModuleId = ModuleId(*b"py/socie"); } From 82a8ee2b9e5b4bd7fcd826576f9133dc7f1792bf Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Mon, 24 Oct 2022 12:55:09 +0300 Subject: [PATCH 2/4] Enable duild and push image action for small duration branches --- .github/workflows/build-and-push-docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-push-docker-image.yml b/.github/workflows/build-and-push-docker-image.yml index c2fd5fcf88230..7891195d90e2a 100644 --- a/.github/workflows/build-and-push-docker-image.yml +++ b/.github/workflows/build-and-push-docker-image.yml @@ -3,7 +3,7 @@ on: push: branches: - dev-cere - - feature/decrease-durations-for-simulations + - 'feature/**' env: ECR_REPOSITORY: pos-network-node jobs: From e504f590c5428a7ef77e2f70f9104ae227d60945 Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Mon, 29 Aug 2022 16:01:22 +0400 Subject: [PATCH 3/4] Set smaller timings --- bin/node/runtime/src/constants.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/node/runtime/src/constants.rs b/bin/node/runtime/src/constants.rs index 840324f94fbd7..0240e108e305d 100644 --- a/bin/node/runtime/src/constants.rs +++ b/bin/node/runtime/src/constants.rs @@ -59,7 +59,7 @@ pub mod time { // 1 in 4 blocks (on average, not counting collisions) will be primary BABE blocks. pub const PRIMARY_PROBABILITY: (u64, u64) = (1, 4); - pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 4 * HOURS; + pub const EPOCH_DURATION_IN_BLOCKS: BlockNumber = 5 * MINUTES; pub const EPOCH_DURATION_IN_SLOTS: u64 = { const SLOT_FILL_RATE: f64 = MILLISECS_PER_BLOCK as f64 / SLOT_DURATION as f64; From 007ccd4dbbe6528b610ad49be4015d8fc4f72e73 Mon Sep 17 00:00:00 2001 From: Maksim Ramanenkau Date: Tue, 22 Nov 2022 12:33:11 +0300 Subject: [PATCH 4/4] Add storage migrations --- bin/node/runtime/src/lib.rs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs index 85abc9ec1976d..942121d14498a 100644 --- a/bin/node/runtime/src/lib.rs +++ b/bin/node/runtime/src/lib.rs @@ -1113,6 +1113,21 @@ construct_runtime!( } ); +impl pallet_babe::migrations::BabePalletPrefix for Runtime { + fn pallet_prefix() -> &'static str { + "Babe" + } +} + +pub struct BabeEpochConfigMigrations; +impl frame_support::traits::OnRuntimeUpgrade for BabeEpochConfigMigrations { + fn on_runtime_upgrade() -> frame_support::weights::Weight { + pallet_babe::migrations::add_epoch_configuration::( + BABE_GENESIS_EPOCH_CONFIG, + ) + } +} + /// The address format for describing accounts. pub type Address = sp_runtime::MultiAddress; /// Block header type as expected by this runtime. @@ -1150,7 +1165,7 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPallets, - (), + BabeEpochConfigMigrations, >; impl_runtime_apis! {