Merge branch 'master' into muharem-meta-tx

Author: muharem

.config/taplo.toml

@@ -15,7 +15,7 @@ exclude = [
 [formatting]
 reorder_arrays = true
 inline_table_expand = false
-array_auto_expand = false
+array_auto_expand = true
 array_auto_collapse = false
 indent_string = "	"         # tab
 

.github/scripts/common/lib.sh

@@ -243,17 +243,17 @@ fetch_release_artifacts() {
 # - REPO in the form paritytech/polkadot
 fetch_debian_package_from_s3() {
   BINARY=$1
-  echo "Version    : $VERSION"
+  echo "Version    : $NODE_VERSION"
   echo "Repo       : $REPO"
   echo "Binary     : $BINARY"
-  echo "Tag        : $RELEASE_TAG"
+  echo "Tag        : $VERSION"
   OUTPUT_DIR=${OUTPUT_DIR:-"./release-artifacts/${BINARY}"}
   echo "OUTPUT_DIR : $OUTPUT_DIR"
 
   URL_BASE=$(get_s3_url_base $BINARY)
   echo "URL_BASE=$URL_BASE"
 
-  URL=$URL_BASE/$RELEASE_TAG/x86_64-unknown-linux-gnu/${BINARY}_${VERSION}_amd64.deb
+  URL=$URL_BASE/$VERSION/x86_64-unknown-linux-gnu/${BINARY}_${NODE_VERSION}_amd64.deb
 
   mkdir -p "$OUTPUT_DIR"
   pushd "$OUTPUT_DIR" > /dev/null

.github/scripts/release/release_lib.sh

@@ -71,7 +71,7 @@ git_show_log() {
 # 1_012_000 or 1_012_001 if SUFFIX is set
 function get_spec_version() {
     INPUT=$1
-    SUFFIX=${SUFFIX:-000} #this variable makes it possible to set a specific ruuntime version like 93826 it can be intialised as sestem variable
+    SUFFIX=${SUFFIX:-000} #this variable makes it possible to set a specific runtime version like 93826 it can be initialised as system variable
     [[ $INPUT =~ .*([0-9]+\.[0-9]+\.[0-9]{1,2}).* ]]
     VERSION="${BASH_REMATCH[1]}"
     MATCH="${BASH_REMATCH[0]}"

.github/workflows/checks-quick.yml

@@ -102,7 +102,6 @@ jobs:
           --exclude
           "substrate/frame/contracts/fixtures/build"
           "substrate/frame/contracts/fixtures/contracts/common"
-          "substrate/frame/revive/fixtures/contracts/common"
       - name: deny git deps
         run: python3 .github/scripts/deny-git-deps.py .
   check-markdown:

.github/workflows/release-11_rc-automation.yml

@@ -1,6 +1,6 @@
 name: Release - RC automation
 on:
-  # TODO: Activate it and delete old branches patterns, when the release process from stable is setteled
+  # TODO: Activate it and delete old branches patterns, when the release process from stable is settled
   #push:
     # branches:
     #   # Catches release-polkadot-v1.2.3, release-v1.2.3-rc1, etc

.github/workflows/release-40_publish-deb-package.yml

@@ -1,10 +1,10 @@
-name: Release - Publish polakdot deb package
+name: Release - Publish polkadot deb package
 
 on:
   workflow_dispatch:
     inputs:
       tag:
-        description: Current final release tag in the format polakdot-stableYYMM or polkadot-stable-YYMM-X
+        description: Current final release tag in the format polkadot-stableYYMM or polkadot-stable-YYMM-X
         default: polkadot-stable2412
         required: true
         type: string
@@ -44,9 +44,9 @@ jobs:
     needs: [validate-inputs]
     env:
       REPO: ${{ github.repository }}
-      RELEASE_TAG: ${{ needs.validate-inputs.outputs.release_tag }}
+      VERSION: ${{ needs.validate-inputs.outputs.release_tag }}
     outputs:
-      VERSION: ${{ steps.fetch_artifacts_from_s3.outputs.VERSION }}
+      NODE_VERSION: ${{ steps.fetch_artifacts_from_s3.outputs.NODE_VERSION }}
 
     steps:
       - name: Checkout sources
@@ -57,8 +57,8 @@ jobs:
         run: |
           . ./.github/scripts/common/lib.sh
 
-          VERSION="$(get_polkadot_node_version_from_code)"
-          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
+          NODE_VERSION="$(get_polkadot_node_version_from_code)"
+          echo "NODE_VERSION=${NODE_VERSION}" >> $GITHUB_OUTPUT
 
           fetch_debian_package_from_s3 polkadot
 
@@ -76,7 +76,7 @@ jobs:
       AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
       AWS_DEB_PATH: "s3://releases-package-repos/deb"
       LOCAL_DEB_REPO_PATH: ${{ github.workspace }}/deb
-      VERSION: ${{ needs.fetch-artifacts-from-s3.outputs.VERSION }}
+      NODE_VERSION: ${{ needs.fetch-artifacts-from-s3.outputs.NODE_VERSION }}
 
     steps:
       - name: Install pgpkkms
@@ -135,7 +135,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         run: |
           # Add the new deb to the repo
-          reprepro -b "$LOCAL_DEB_REPO_PATH" includedeb "${{ inputs.distribution }}" "release-artifacts/polkadot_${VERSION}_amd64.deb"
+          reprepro -b "$LOCAL_DEB_REPO_PATH" includedeb "${{ inputs.distribution }}" "release-artifacts/polkadot_${NODE_VERSION}_amd64.deb"
 
       - name: Upload updated deb repo
         env:

.github/workflows/release-50_publish-docker.yml

@@ -281,7 +281,7 @@ jobs:
         uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
 
       - name: Cache Docker layers
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+        uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/release-reusable-promote-to-final.yml

@@ -35,6 +35,9 @@ jobs:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_RELEASE_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_RELEASE_SECRET_ACCESS_KEY }}
       AWS_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+      RELEASE_TAG: ${{ inputs.release_tag }}
+      PACKAGE: ${{ inputs.package }}
+      TARGET: ${{ inputs.target }}
 
     steps:
       - name: Checkout sources
@@ -44,22 +47,25 @@ jobs:
         id: prepare_final_tag
         shell: bash
         run: |
-          tag="$(echo ${{ inputs.release_tag }} | sed 's/-rc[0-9]*$//')"
+          tag="$(echo $RELEASE_TAG | sed 's/-rc[0-9]*$//')"
           echo $tag
           echo "FINAL_TAG=${tag}" >> $GITHUB_OUTPUT
 
       - name: Fetch binaries from s3 based on version
         run: |
           . ./.github/scripts/common/lib.sh
 
-          VERSION="${{ inputs.release_tag }}"
-          if [[ ${{ inputs.package }} == 'polkadot' ]]; then
+          VERSION="$RELEASE_TAG"
+          if [[ "$PACKAGE" == 'polkadot' ]]; then
             packages=(polkadot polkadot-prepare-worker polkadot-execute-worker)
             for package in "${packages[@]}"; do
-              fetch_release_artifacts_from_s3 $package ${{ inputs.target }}
+              OUTPUT_DIR="./release-artifacts/$TARGET/${package}"
+              fetch_release_artifacts_from_s3 "$package" "$TARGET"
             done
+            NODE_VERSION="$(get_polkadot_node_version_from_code)"
+            fetch_debian_package_from_s3 polkadot
           else
-            fetch_release_artifacts_from_s3 ${{ inputs.package }} ${{ inputs.target }}
+            fetch_release_artifacts_from_s3 "$PACKAGE" "$TARGET"
           fi
 
       - name: Configure AWS Credentials
@@ -73,11 +79,11 @@ jobs:
         run: |
           . ./.github/scripts/release/release_lib.sh
 
-          if [[ ${{ inputs.package }} == 'polkadot' ]]; then
+          if [[ "$PACKAGE" == 'polkadot' ]]; then
             packages=(polkadot polkadot-prepare-worker polkadot-execute-worker)
             for package in "${packages[@]}"; do
               upload_s3_release $package ${{ steps.prepare_final_tag.outputs.final_tag }} ${{ inputs.target }}
             done
           else
-            upload_s3_release ${{ inputs.package }} ${{ steps.prepare_final_tag.outputs.final_tag }} ${{ inputs.target }}
+            upload_s3_release "$PACKAGE" ${{ steps.prepare_final_tag.outputs.final_tag }} "$TARGET"
           fi

.github/workflows/release-reusable-rc-buid.yml

@@ -15,7 +15,7 @@ on:
         type: string
 
       release_tag:
-        description: Tag matching the actual release candidate with the format stableYYMM-rcX or stableYYMM
+        description: Tag matching the actual release candidate with the format polkadpt-stableYYMM(-rcX) or plkadot-stableYYMM-X(-rcX)
         required: true
         type: string
 

.github/workflows/zombienet-reusable-preflight.yml

@@ -220,7 +220,7 @@ jobs:
   wait_build_images:
     needs: [ci-env]
     runs-on: ubuntu-latest
-    timeout-minutes: 60
+    timeout-minutes: 90
     outputs:
       BUILD_RUN_ID: ${{ steps.wait_build.outputs.BUILD_RUN_ID }}
     steps:

Cargo.lock

@@ -646,6 +646,7 @@ bitvec = { version = "1.0.1", default-features = false }
 blake2 = { version = "0.10.4", default-features = false }
 blake2b_simd = { version = "1.0.2", default-features = false }
 blake3 = { version = "1.5" }
+bn = { package = "substrate-bn", version = "0.6", default-features = false }
 bounded-collections = { version = "0.2.3", default-features = false }
 bounded-vec = { version = "0.7" }
 bp-asset-hub-rococo = { path = "bridges/chains/chain-asset-hub-rococo", default-features = false }
@@ -858,7 +859,7 @@ linked-hash-map = { version = "0.5.4" }
 linked_hash_set = { version = "0.1.4" }
 linregress = { version = "0.5.1" }
 lite-json = { version = "0.2.0", default-features = false }
-litep2p = { version = "0.9.1", features = ["websocket"] }
+litep2p = { version = "0.9.3", features = ["websocket"] }
 log = { version = "0.4.22", default-features = false }
 macro_magic = { version = "0.5.1" }
 maplit = { version = "1.0.2" }
@@ -889,8 +890,9 @@ node-rpc = { path = "substrate/bin/node/rpc" }
 node-testing = { path = "substrate/bin/node/testing" }
 nohash-hasher = { version = "0.2.0" }
 novelpoly = { version = "2.0.0", package = "reed-solomon-novelpoly" }
-num-bigint = { version = "0.4.3" }
+num-bigint = { version = "0.4.3", default-features = false }
 num-format = { version = "0.4.3" }
+num-integer = { version = "0.1.46", default-features = false }
 num-rational = { version = "0.4.1" }
 num-traits = { version = "0.2.17", default-features = false }
 num_cpus = { version = "1.13.1" }
@@ -1139,6 +1141,7 @@ relay-substrate-client = { path = "bridges/relays/client-substrate" }
 relay-utils = { path = "bridges/relays/utils" }
 remote-externalities = { path = "substrate/utils/frame/remote-externalities", default-features = false, package = "frame-remote-externalities" }
 reqwest = { version = "0.12.9", default-features = false }
+ripemd = { version = "0.1.3", default-features = false }
 rlp = { version = "0.6.1", default-features = false }
 rococo-emulated-chain = { path = "cumulus/parachains/integration-tests/emulated/chains/relays/rococo" }
 rococo-parachain-runtime = { path = "cumulus/parachains/runtimes/testing/rococo-parachain" }

Cargo.toml

@@ -283,7 +283,6 @@ pub mod pallet {
 	/// The `RequestCount` is decreased by one at the beginning of every block. This is to ensure
 	/// that the pallet can always make progress.
 	#[pallet::storage]
-	#[pallet::getter(fn request_count)]
 	pub type RequestCount<T: Config<I>, I: 'static = ()> = StorageValue<_, u32, ValueQuery>;
 
 	/// High level info about the imported commitments.
@@ -392,7 +391,7 @@ pub mod pallet {
 		init_data: InitializationDataOf<T, I>,
 	) -> Result<(), Error<T, I>> {
 		if init_data.authority_set.len == 0 {
-			return Err(Error::<T, I>::InvalidInitialAuthoritySet)
+			return Err(Error::<T, I>::InvalidInitialAuthoritySet);
 		}
 		CurrentAuthoritySetInfo::<T, I>::put(init_data.authority_set);
 
@@ -404,6 +403,13 @@ pub mod pallet {
 
 		Ok(())
 	}
+
+	impl<T: Config<I>, I: 'static> Pallet<T, I> {
+		/// The current number of requests which have written to storage.
+		pub fn request_count() -> u32 {
+			RequestCount::<T, I>::get()
+		}
+	}
 }
 
 #[cfg(test)]

bridges/modules/beefy/src/lib.rs

@@ -418,7 +418,6 @@ pub mod pallet {
 
 	/// Hash of the best finalized header.
 	#[pallet::storage]
-	#[pallet::getter(fn best_finalized)]
 	pub type BestFinalized<T: Config<I>, I: 'static = ()> =
 		StorageValue<_, BridgedBlockId<T, I>, OptionQuery>;
 
@@ -821,6 +820,13 @@ pub fn initialize_for_benchmarks<T: Config<I>, I: 'static>(header: BridgedHeader
 	.expect("only used from benchmarks; benchmarks are correct; qed");
 }
 
+impl<T: Config<I>, I: 'static> Pallet<T, I> {
+	/// Returns the hash of the best finalized header.
+	pub fn best_finalized() -> Option<BridgedBlockId<T, I>> {
+		BestFinalized::<T, I>::get()
+	}
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;

bridges/modules/grandpa/src/lib.rs

@@ -506,14 +506,12 @@ pub mod pallet {
 	/// runtime methods may still be used to do that (i.e. democracy::referendum to update halt
 	/// flag directly or call the `set_operating_mode`).
 	#[pallet::storage]
-	#[pallet::getter(fn module_owner)]
 	pub type PalletOwner<T: Config<I>, I: 'static = ()> = StorageValue<_, T::AccountId>;
 
 	/// The current operating mode of the pallet.
 	///
 	/// Depending on the mode either all, some, or no transactions will be allowed.
 	#[pallet::storage]
-	#[pallet::getter(fn operating_mode)]
 	pub type PalletOperatingMode<T: Config<I>, I: 'static = ()> =
 		StorageValue<_, MessagesOperatingMode, ValueQuery>;
 
@@ -733,7 +731,7 @@ fn ensure_normal_operating_mode<T: Config<I>, I: 'static>() -> Result<(), Error<
 	if PalletOperatingMode::<T, I>::get() ==
 		MessagesOperatingMode::Basic(BasicOperatingMode::Normal)
 	{
-		return Ok(())
+		return Ok(());
 	}
 
 	Err(Error::<T, I>::NotOperatingNormally)