Merge branch 'main' into muharem-upgrade-to-1.2

.github/review-bot.yml

@@ -4,7 +4,7 @@ rules:
       include:
         - ^\.github/.*
     type: fellows
-    minRank: 4
+    minRank: 3
     minApprovals: 2
   - name: Relay and system files
     condition:
@@ -13,8 +13,8 @@ rules:
         - ^system-parachains\/.*
         - ^CHANGELOG.md$
     type: fellows
-    minRank: 3
-    minApprovals: 4
+    minRank: 2
+    minApprovals: 3
   - name: General Files
     condition:
       include:
@@ -25,4 +25,4 @@ rules:
         - ^\.github/.*
         - ^CHANGELOG.md$
     type: fellows
-    minRank: 2
+    minRank: 1

.github/workflows/auto-merge.yml

@@ -5,6 +5,8 @@ on:
   issue_comment:
     types: [created]
 
+env: master
+
 jobs:
   set-auto-merge:
     runs-on: ubuntu-latest
@@ -14,9 +16,15 @@ jobs:
       - name: Get the GitHub handle of the fellows
         uses: paritytech/[email protected]
         id: fellows
+      - name: Generate token
+        id: merge_token
+        uses: tibdex/github-app-token@v1
+        with:
+          app_id: ${{ secrets.REVIEW_APP_ID }}
+          private_key: ${{ secrets.REVIEW_APP_KEY }}
       - name: Set auto merge
         uses: paritytech/[email protected]
         with:
-          GITHUB_TOKEN: '${{ github.token }}'
+          GITHUB_TOKEN: ${{ steps.merge_token.outputs.token }}
           MERGE_METHOD: "SQUASH"
           ALLOWLIST: ${{ steps.fellows.outputs.github-handles }}

.github/workflows/review-trigger.yml

@@ -1,6 +1,6 @@
 name: Review-Trigger
 
-on: 
+on:
   pull_request_target:
     types:
       - opened

CHANGELOG.md

@@ -4,6 +4,12 @@ Changelog for the runtimes governed by the Polkadot Fellowship.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.0.1] 22.10.2023
+
+### Changed
+
+- Restore governance lock periods to 7 days in Polkadot ([polkadot-fellows/runtimes#86](https://github.com/polkadot-fellows/runtimes/pull/86))
+
 ## [1.0.0] 22.10.2023
 
 ### Changed

relay/polkadot/src/governance/mod.rs

@@ -32,7 +32,7 @@ mod tracks;
 pub use tracks::TracksInfo;
 
 parameter_types! {
-	pub const VoteLockingPeriod: BlockNumber = prod_or_fast!(28 * DAYS, 1);
+	pub const VoteLockingPeriod: BlockNumber = prod_or_fast!(7 * DAYS, 1);
 }
 
 impl pallet_conviction_voting::Config for Runtime {

relay/polkadot/src/lib.rs

@@ -131,7 +131,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("polkadot"),
 	impl_name: create_runtime_str!("parity-polkadot"),
 	authoring_version: 0,
-	spec_version: 1_000_000,
+	spec_version: 1_000_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 24,