Update from master

.gitlab/pipeline/zombienet/polkadot.yml

@@ -209,7 +209,7 @@ zombienet-polkadot-misc-0002-upgrade-node:
  # Exit if the job is not merge queue
  # - if [[ $CI_COMMIT_REF_NAME != *"gh-readonly-queue"* ]]; then echo "I will run only in a merge queue"; exit 0; fi
  - export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest"
- - echo "Overrided poladot image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
+ - echo "Overrided polkadot image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
  - export COL_IMAGE="${COLANDER_IMAGE}":${PIPELINE_IMAGE_TAG}
  - BUILD_LINUX_JOB_ID="$(cat ./artifacts/BUILD_LINUX_JOB_ID)"
  - export POLKADOT_PR_ARTIFACTS_URL="https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/${BUILD_LINUX_JOB_ID}/artifacts/raw/artifacts"

cumulus/pallets/parachain-system/src/lib.rs

@@ -1630,7 +1630,7 @@ impl<T: Config> Pallet<T> {
 
  /// Get the relay chain block number which was used as an anchor for the last block in this
  /// chain.
- pub fn last_relay_block_number(&self) -> RelayChainBlockNumber {
+ pub fn last_relay_block_number() -> RelayChainBlockNumber {
  LastRelayChainBlockNumber::<T>::get()
  }
 }

polkadot/runtime/westend/src/lib.rs

@@ -531,7 +531,6 @@ parameter_types! {
  pub const SignedDepositByte: Balance = deposit(0, 10) / 1024;
  // Each good submission will get 1 WND as reward
  pub SignedRewardBase: Balance = 1 * UNITS;
- pub BetterUnsignedThreshold: Perbill = Perbill::from_rational(5u32, 10_000);
 
  // 1 hour session, 15 minutes unsigned phase, 4 offchain executions.
  pub OffchainRepeat: BlockNumber = UnsignedPhase::get() / 4;
@@ -608,7 +607,6 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
  type MinerConfig = Self;
  type SlashHandler = (); // burn slashes
  type RewardHandler = (); // nothing to do upon rewards
- type BetterUnsignedThreshold = BetterUnsignedThreshold;
  type BetterSignedThreshold = ();
  type OffchainRepeat = OffchainRepeat;
  type MinerTxPriority = NposSolutionPriority;

polkadot/zombienet_tests/misc/0002-upgrade-node.toml

@@ -9,12 +9,10 @@ chain = "rococo-local"
  [[relaychain.nodes]]
  name = "alice"
  args = [ "-lparachain=debug,runtime=debug", "--db paritydb" ]
- substrate_cli_args_version = 1
 
  [[relaychain.nodes]]
  name = "bob"
  args = [ "-lparachain=debug,runtime=debug", "--db rocksdb" ]
- substrate_cli_args_version = 1
 
  [[relaychain.nodes]]
  name = "charlie"

prdoc/pr_2694.prdoc

@@ -0,0 +1,14 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: "pallet-election-provider-multi-phase: Removes `BetterUnsignedThreshold` from pallet config"
+
+doc:
+ - audience: Runtime Dev
+ description: |
+ Removes thresholding for accepting solutions better than the last queued for unsigned phase. This is unnecessary
+ as even without thresholding, the number of solutions that can be submitted to on-chain which is better than the
+ previous one is limited.
+
+crates:
+ - name: "pallet-election-provider-multi-phase"

substrate/bin/node/runtime/src/lib.rs

@@ -704,8 +704,6 @@ parameter_types! {
  pub const SignedDepositIncreaseFactor: Percent = Percent::from_percent(10);
  pub const SignedDepositByte: Balance = 1 * CENTS;
 
- pub BetterUnsignedThreshold: Perbill = Perbill::from_rational(1u32, 10_000);
-
  // miner configs
  pub const MultiPhaseUnsignedPriority: TransactionPriority = StakingUnsignedPriority::get() - 1u64;
  pub MinerMaxWeight: Weight = RuntimeBlockWeights::get()
@@ -822,7 +820,6 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
  type EstimateCallFee = TransactionPayment;
  type SignedPhase = SignedPhase;
  type UnsignedPhase = UnsignedPhase;
- type BetterUnsignedThreshold = BetterUnsignedThreshold;
  type BetterSignedThreshold = ();
  type OffchainRepeat = OffchainRepeat;
  type MinerTxPriority = MultiPhaseUnsignedPriority;