Merge remote-tracking branch 'origin/master' into gav-xcm-v3

.gitlab-ci.yml

@@ -361,7 +361,6 @@ build-rustdoc:
 
 .build-push-image:                 &build-push-image
   <<:                              *kubernetes-env
-  <<:                              *vault-secrets
   image:                           quay.io/buildah/stable
   variables:                       &image-variables
     GIT_STRATEGY:                  none
@@ -601,10 +600,8 @@ zombienet-test-parachains-upgrade-smoke-test:
     - job:                         publish-polkadot-image
     - job:                         publish-malus-image
     - job:                         publish-adder-collator-image
-
   variables:
     GH_DIR:                        'https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/parachains'
-
   before_script:
     - echo "ZombieNet Tests Config"
     - echo "docker.io/parity/polkadot:latest"
@@ -614,7 +611,6 @@ zombienet-test-parachains-upgrade-smoke-test:
     - export DEBUG=zombie,zombie::network-node
     - export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest" # Use polkadot latest image
     - export COL_IMAGE="docker.io/parity/polkadot-collator:latest" # Use cumulus lastest image
-
   script:
     - /home/nonroot/zombie-net/scripts/run-test-env-manager.sh
         --github-remote-dir="${GH_DIR}"

node/core/provisioner/src/lib.rs

@@ -655,7 +655,7 @@ async fn select_disputes(
 	sender: &mut impl SubsystemSender,
 	metrics: &metrics::Metrics,
 ) -> Result<MultiDisputeStatementSet, Error> {
-	const MAX_DISPUTES_FORWARDED_TO_RUNTIME: usize = 10_000;
+	const MAX_DISPUTES_FORWARDED_TO_RUNTIME: usize = 1_000;
 
 	// We use `RecentDisputes` instead of `ActiveDisputes` because redundancy is fine.
 	// It's heavier than `ActiveDisputes` but ensures that everything from the dispute

node/core/pvf/src/metrics.rs

@@ -160,11 +160,11 @@ impl metrics::Metrics for Metrics {
 						0.1,
 						0.5,
 						1.0,
+						2.0,
+						3.0,
 						10.0,
 						20.0,
 						30.0,
-						40.0,
-						50.0,
 						60.0,
 					]),
 				)?,
@@ -175,7 +175,19 @@ impl metrics::Metrics for Metrics {
 					prometheus::HistogramOpts::new(
 						"polkadot_pvf_execution_time",
 						"Time spent in executing PVFs",
-					)
+					).buckets(vec![
+						// This is synchronized with `APPROVAL_EXECUTION_TIMEOUT`  and
+						// `BACKING_EXECUTION_TIMEOUT` constants in `node/primitives/src/lib.rs`
+						0.1,
+						0.25,
+						0.5,
+						1.0,
+						2.0,
+						3.0,
+						4.0,
+						5.0,
+						6.0,
+					]),
 				)?,
 				registry,
 			)?,