Merge remote-tracking branch 'upstream/main' into s0me0ne/fix-people-…

…chainspec-gen
polkadot-fellows · Jun 24, 2024 · ac8867b · ac8867b
2 parents 4049378 + 6cdd183
commit ac8867b
Show file tree

Hide file tree

Showing 83 changed files with 6,916 additions and 635 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -14,7 +14,7 @@ jobs:
     if: ${{ github.event.issue.pull_request && startsWith(github.event.comment.body, '/merge') }}
     steps:
       - name: Get the GitHub handle of the fellows
-        uses: paritytech/get-fellows-action@v1.1.2
+        uses: paritytech/get-fellows-action@v1.1.3
         id: fellows
       - name: Generate a token
         id: merge_token

diff --git a/.github/workflows/integration-tests-matrix.json b/.github/workflows/integration-tests-matrix.json
@@ -19,6 +19,10 @@
     "name": "people-kusama",
     "package": "people-kusama-integration-tests"
   },
+  {
+    "name": "people-polkadot",
+    "package": "people-polkadot-integration-tests"
+  },
   {
     "name": "collectives-polkadot",
     "package": "collectives-polkadot-integration-tests"

diff --git a/.github/workflows/review-trigger.yml b/.github/workflows/review-trigger.yml
@@ -26,7 +26,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
       - name: Get the GitHub handle of the fellows
-        uses: paritytech/get-fellows-action@v1.1.2
+        uses: paritytech/get-fellows-action@v1.1.3
         id: fellows
         # Require new reviews when the author is pushing and he is not a fellow
       - name: Fail when author pushes new code

diff --git a/.github/workflows/runtimes-matrix.json b/.github/workflows/runtimes-matrix.json
@@ -67,6 +67,12 @@
     "path": "system-parachains/people/people-kusama",
     "is_relay": false
   },
+  {
+    "name": "people-polkadot",
+    "package": "people-polkadot-runtime",
+    "path": "system-parachains/people/people-polkadot",
+    "is_relay": false
+  },
   {
     "name": "encointer-kusama",
     "package": "encointer-kusama-runtime",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,13 +4,55 @@ 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.2.7] 14.06.2024
+
+Note: This release only affects the following runtimes and is not a full system release:
+
+- Polkadot Relay Chain
+- Polkadot People
+
+### Changed
+
+- Updated Relay and People configurations to complete launch ([polkadot-fellows/runtimes#350](https://github.com/polkadot-fellows/runtimes/pull/350))
+
+## [1.2.6] 13.06.2024
+
+Note: This release only affects the following runtimes and is not a full system release:
+
+- Polkadot Relay Chain
+- Polkadot Asset Hub
+- Polkadot People
+- Kusama Relay Chain
+- Kusama Asset Hub
+- Kusama People
+
+### Added
+
+- Add the Polkadot People Chain ([polkadot-fellows/runtimes#319](https://github.com/polkadot-fellows/runtimes/pull/319))
+
+### Changed
+
+- Set max asset ID restriction for the creation of trusted assets ([polkadot-fellows/runtimes#346](https://github.com/polkadot-fellows/runtimes/pull/346))
+
+### Fixed
+
+- Kusama People: clear requested judgements that do not have corresponding deposits reserved ([polkadot-fellows/runtimes#339](https://github.com/polkadot-fellows/runtimes/pull/339))
+
+### Changed
+
+- People chain now uses 6-second block times ([polkadot-fellows/runtimes#308](https://github.com/polkadot-fellows/runtimes/pull/308))
+
+### Removed
+
+- Removed Identity-related code from Kusama Relay Chain ([polkadot-fellows/runtimes#315](https://github.com/polkadot-fellows/runtimes/pull/315))
+
 ## [1.2.5] 06.06.2024
 
 ### Added
 
 - Staking runtime api to check if reward is pending for an era ([polkadot-fellows/runtimes#318](https://github.com/polkadot-fellows/runtimes/pull/318))
 - Allow any parachain to have bidirectional channel with any system parachains ([polkadot-fellows/runtimes#329](https://github.com/polkadot-fellows/runtimes/pull/329))
-- Update price controller of broker pallet to use higher leadin, without adjusting the minimum price too much ([polkadot-fellows/runtimes#334](https://github.com/polkadot-fellows/runtimes/pull/334)
+- Update price controller of broker pallet to use higher leadin, without adjusting the minimum price too much ([polkadot-fellows/runtimes#334](https://github.com/polkadot-fellows/runtimes/pull/334))
 - Enable support for new hardware signers like the generic ledger app ([polkadot-fellows/runtimes#337](https://github.com/polkadot-fellows/runtimes/pull/337))
 
 ### Changed

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -170,6 +170,8 @@ penpal-emulated-chain = { path = "integration-tests/emulated/chains/parachains/t
 penpal-runtime = { version = "0.15.1" }
 people-kusama-emulated-chain = { path = "integration-tests/emulated/chains/parachains/people/people-kusama" }
 people-kusama-runtime = { path = "system-parachains/people/people-kusama" }
+people-polkadot-emulated-chain = { path = "integration-tests/emulated/chains/parachains/people/people-polkadot" }
+people-polkadot-runtime = { path = "system-parachains/people/people-polkadot" }
 polkadot-core-primitives = { version = "8.0.0", default-features = false }
 polkadot-emulated-chain = { path = "integration-tests/emulated/chains/relays/polkadot" }
 polkadot-parachain-primitives = { version = "7.0.0", default-features = false }
@@ -246,6 +248,7 @@ members = [
 	"integration-tests/emulated/chains/parachains/bridges/bridge-hub-polkadot",
 	"integration-tests/emulated/chains/parachains/collectives/collectives-polkadot",
 	"integration-tests/emulated/chains/parachains/people/people-kusama",
+	"integration-tests/emulated/chains/parachains/people/people-polkadot",
 	"integration-tests/emulated/chains/parachains/testing/penpal",
 	"integration-tests/emulated/chains/relays/kusama",
 	"integration-tests/emulated/chains/relays/polkadot",
@@ -259,6 +262,7 @@ members = [
 	"integration-tests/emulated/tests/bridges/bridge-hub-polkadot",
 	"integration-tests/emulated/tests/collectives/collectives-polkadot",
 	"integration-tests/emulated/tests/people/people-kusama",
+	"integration-tests/emulated/tests/people/people-polkadot",
 	"relay/kusama",
 	"relay/kusama/constants",
 	"relay/polkadot",
@@ -278,6 +282,7 @@ members = [
 	"system-parachains/encointer",
 	"system-parachains/gluttons/glutton-kusama",
 	"system-parachains/people/people-kusama",
+	"system-parachains/people/people-polkadot",
 	"integration-tests/zombienet",
 ]
 

diff --git a/chain-spec-generator/Cargo.toml b/chain-spec-generator/Cargo.toml
@@ -39,6 +39,7 @@ encointer-kusama-runtime = { workspace = true }
 glutton-kusama-runtime = { workspace = true }
 coretime-kusama-runtime = { workspace = true }
 people-kusama-runtime = { workspace = true }
+people-polkadot-runtime = { workspace = true }
 
 [features]
 fast-runtime = ["kusama-runtime/fast-runtime", "polkadot-runtime/fast-runtime"]
@@ -56,6 +57,7 @@ runtime-benchmarks = [
 	"pallet-staking/runtime-benchmarks",
 	"parachains-common/runtime-benchmarks",
 	"people-kusama-runtime/runtime-benchmarks",
+	"people-polkadot-runtime/runtime-benchmarks",
 	"polkadot-primitives/runtime-benchmarks",
 	"polkadot-runtime/runtime-benchmarks",
 	"runtime-parachains/runtime-benchmarks",

diff --git a/chain-spec-generator/src/main.rs b/chain-spec-generator/src/main.rs
@@ -123,6 +123,10 @@ fn main() -> Result<(), String> {
 				system_parachains_specs::PeopleKusamaChainSpec,
 				system_parachains_specs::people_kusama_local_testnet_config,
 			),
+			(
+				"people-polkadot-local",
+				Box::new(system_parachains_specs::people_polkadot_local_testnet_config) as Box<_>,
+			),
 		]);
 
 	if let Some(function) = supported_chains.get(&*cli.chain) {