Merge branch 'main' into trigger-release-1.2.8

polkadot-fellows · Jul 5, 2024 · 873e14e · 873e14e
2 parents dec50e3 + bb52c32
commit 873e14e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -14,11 +14,11 @@ 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.3
+        uses: paritytech/get-fellows-action@v1.1.4
         id: fellows
       - name: Generate a token
         id: merge_token
-        uses: actions/create-github-app-token@v1.8.1
+        uses: actions/create-github-app-token@v1
         with:
           app-id: ${{ secrets.MERGE_APP_ID }}
           private-key: ${{ secrets.MERGE_APP_KEY }}

diff --git a/.github/workflows/review-bot.yml b/.github/workflows/review-bot.yml
@@ -16,17 +16,17 @@ jobs:
     steps:
       - name: Extract content of artifact
         id: number
-        uses: Bullrich/extract-text-from-artifact@v1.0.0
+        uses: Bullrich/extract-text-from-artifact@v1.0.1
         with:
           artifact-name: pr_number
       - name: Generate token
         id: team_token
-        uses: actions/create-github-app-token@v1.9.3
+        uses: actions/create-github-app-token@v1
         with:
           app-id: ${{ secrets.REVIEW_APP_ID }}
           private-key: ${{ secrets.REVIEW_APP_KEY }}
       - name: "Evaluates PR reviews and assigns reviewers"
-        uses: paritytech/review-bot@v2.4.1
+        uses: paritytech/review-bot@v2.5.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           team-token: ${{ steps.team_token.outputs.token }}

diff --git a/.github/workflows/review-trigger.yml b/.github/workflows/review-trigger.yml
@@ -28,7 +28,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
       - name: Get the GitHub handle of the fellows
-        uses: paritytech/get-fellows-action@v1.1.3
+        uses: paritytech/get-fellows-action@v1.1.4
         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/chain-spec-generator/src/relay_chain_specs.rs b/chain-spec-generator/src/relay_chain_specs.rs
@@ -21,7 +21,11 @@ use beefy_primitives::ecdsa_crypto::AuthorityId as BeefyId;
 use grandpa::AuthorityId as GrandpaId;
 use kusama_runtime_constants::currency::UNITS as KSM;
 use pallet_staking::Forcing;
-use polkadot_primitives::{AccountId, AccountPublic, AssignmentId, ValidatorId};
+use polkadot_primitives::{
+	vstaging::{ApprovalVotingParams, NodeFeatures},
+	AccountId, AccountPublic, AssignmentId, AsyncBackingParams, ValidatorId,
+	ON_DEMAND_DEFAULT_QUEUE_MAX_SIZE,
+};
 use polkadot_runtime_constants::currency::UNITS as DOT;
 use runtime_parachains::configuration::HostConfiguration;
 use sc_chain_spec::{ChainSpec, ChainType, NoExtension};
@@ -76,7 +80,26 @@ fn default_parachains_host_configuration() -> HostConfiguration<polkadot_primiti
 		relay_vrf_modulo_samples: 2,
 		zeroth_delay_tranche_width: 0,
 		minimum_validation_upgrade_delay: 5,
-		..Default::default()
+		dispute_post_conclusion_acceptance_period: 100u32,
+		scheduling_lookahead: 1,
+		max_validators_per_core: Default::default(),
+		coretime_cores: Default::default(),
+		on_demand_retries: Default::default(),
+		on_demand_queue_max_size: ON_DEMAND_DEFAULT_QUEUE_MAX_SIZE,
+		on_demand_target_queue_utilization: Perbill::from_percent(25),
+		on_demand_fee_variability: Perbill::from_percent(3),
+		on_demand_base_fee: 10_000_000u128,
+		minimum_backing_votes: 1,
+		node_features: NodeFeatures::EMPTY,
+		async_backing_params: AsyncBackingParams {
+			max_candidate_depth: 2,
+			allowed_ancestry_len: 2,
+		},
+		executor_params: Default::default(),
+		on_demand_ttl: 5,
+		max_validators: None,
+		pvf_voting_ttl: 2,
+		approval_voting_params: ApprovalVotingParams { max_approval_coalesce_count: 1 },
 	}
 }