Merge branch 'stable2512' into backport-11425-to-stable2512

Author: EgorPopelyaev

.github/workflows/release-80_publish-crates.yml

@@ -40,6 +40,11 @@ on:
         required: false
         type: string
         default: prdoc
+      publish_jobs:
+        description: 'Number of parallel publish jobs (0 = sequential publishing, >0 = parallel with N jobs).'
+        required: false
+        type: string
+        default: '0'
 
 permissions:
   contents: write
@@ -251,6 +256,13 @@ jobs:
           cargo update --workspace --offline || cargo update --workspace
           echo "Cargo.lock updated"
 
+      - name: Verify workspace compiles
+        if: inputs.resume_from == 'full' || inputs.resume_from == 'apply'
+        run: |
+          echo "Checking that rewritten manifests compile..."
+          cargo check --workspace --all-targets 2>&1
+          echo "Workspace compiles successfully"
+
       - name: Commit version bumps
         if: inputs.resume_from == 'full' || inputs.resume_from == 'apply'
         shell: bash
@@ -279,7 +291,7 @@ jobs:
 
           if [ "$REGISTRY" = "staging.crates.io" ]; then
             cat >> ~/.cargo/config.toml << 'EOF'
-          [registries.crates-io]
+          [registries.staging]
           index = "sparse+https://index.staging.crates.io/"
           EOF
           else
@@ -293,18 +305,30 @@ jobs:
         if: inputs.resume_from != 'push'
         shell: bash
         env:
-          PARITY_PUBLISH_CRATESIO_TOKEN: ${{ inputs.registry == 'staging.crates.io' && secrets.STAGING_CRATES_IO_API_TOKEN || secrets.CRATES_IO_API_TOKEN }}
+          PARITY_PUBLISH_CRATESIO_TOKEN: ${{ secrets.CRATES_IO_API_TOKEN }}
+          PARITY_PUBLISH_STAGING_CRATESIO_TOKEN: ${{ secrets.STAGING_CRATES_IO_API_TOKEN }}
           DRY_RUN: ${{ inputs.dry_run }}
           REGISTRY: ${{ inputs.registry }}
+          PUBLISH_JOBS: ${{ inputs.publish_jobs }}
         run: |
+          PARALLEL_ARGS=""
+          if [ "$PUBLISH_JOBS" -gt 0 ] 2>/dev/null; then
+            echo "Parallel publishing enabled with $PUBLISH_JOBS jobs"
+            PARALLEL_ARGS="-j $PUBLISH_JOBS --no-verify"
+          fi
+
+          STAGING_ARG=""
+          if [ "$REGISTRY" = "staging.crates.io" ]; then
+            STAGING_ARG="--staging"
+          fi
 
           if [ "$DRY_RUN" = true ]; then
             echo "DRY RUN - Not actually publishing crates"
             echo "Target registry: $REGISTRY"
-            parity-publish apply -p -d
+            parity-publish apply -p -d $STAGING_ARG $PARALLEL_ARGS
           else
             echo "Publishing crates to $REGISTRY..."
-            parity-publish apply -p
+            parity-publish apply -p $STAGING_ARG $PARALLEL_ARGS
             echo "Crates published successfully to $REGISTRY!"
           fi
 
@@ -331,6 +355,7 @@ jobs:
         if: failure()
         env:
           CRATES_RELEASE_BRANCH: ${{ steps.derive_branch.outputs.CRATES_RELEASE_BRANCH }}
+          GITHUB_TOKEN: ${{ github.token }}
         run: |
           echo "Job failed. Pushing branch '$CRATES_RELEASE_BRANCH' to origin (paritytech-release) to preserve state for resume..."
           # Restore origin to the fork repo in case it was changed by the upstream push step

prdoc/pr_10749.prdoc

@@ -0,0 +1,15 @@
+title: '[pallet-revive] fixtures compilation fix for rust 1.92.0'
+doc:
+- audience: Runtime Dev
+  description: |-
+    Fix this error after upgrading to rustc 1.92.0:
+
+    ```
+      error: panic_immediate_abort is now a real panic strategy! Enable it with `panic = "immediate-abort"` in Cargo.toml, or with the compiler flags `-Zunstable-options -Cpanic=immediate-abort`. In both cases, you still need to build core, e.g. with `-Zbuild-std`
+        --> /Users/robert/.rustup/toolchains/1.92.0-aarch64-apple-darwin/lib/rustlib/src/rust/library/core/src/panicking.rs:36:1
+    ```
+crates:
+- name: pallet-revive-fixtures
+  bump: patch
+- name: pallet-revive
+  bump: patch

substrate/frame/revive/fixtures/src/builder.rs

@@ -195,7 +195,37 @@ pub fn create_cargo_toml<'a>(
 
 /// Invoke cargo build to compile contracts to RISC-V ELF.
 pub fn invoke_build(current_dir: &Path) -> Result<()> {
-	let encoded_rustflags = ["-Dwarnings"].join("\x1f");
+	// Necessary to make this work with both 1.92+ and versions before 1.92 of rustc.
+	let immediate_abort = {
+		let mut cmd = Command::new("rustc");
+		if let Ok(tc) = env::var(OVERRIDE_RUSTUP_TOOLCHAIN_ENV_VAR) {
+			cmd.arg(format!("+{tc}"));
+		}
+		let out = cmd.arg("--version").output().context("rustc --version failed")?;
+		let ver = String::from_utf8(out.stdout).context("utf8 from rustc --version failed")?;
+		let ver_num = ver
+			.split_whitespace()
+			.nth(1)
+			.ok_or_else(|| anyhow::anyhow!("unexpected rustc --version output: {ver}"))?;
+		let mut parts = ver_num.split('.');
+		let major: u32 = parts
+			.next()
+			.ok_or_else(|| anyhow::anyhow!("missing major version"))?
+			.parse()
+			.context("invalid major version")?;
+		let minor: u32 = parts
+			.next()
+			.ok_or_else(|| anyhow::anyhow!("missing minor version"))?
+			.parse()
+			.context("invalid minor version")?;
+		major > 1 || (major == 1 && minor >= 92)
+	};
+
+	let encoded_rustflags = if immediate_abort {
+		["-Dwarnings", "-Zunstable-options", "-Cpanic=immediate-abort"].join("\x1f")
+	} else {
+		["-Dwarnings"].join("\x1f")
+	};
 
 	let mut args = polkavm_linker::TargetJsonArgs::default();
 	args.is_64_bit = true;
@@ -211,8 +241,11 @@ pub fn invoke_build(current_dir: &Path) -> Result<()> {
 		.args([
 			"build",
 			"--release",
-			"-Zbuild-std=core",
-			"-Zbuild-std-features=panic_immediate_abort",
+			if immediate_abort {
+				"-Zbuild-std=core -Zbuild-std-features=panic_immediate_abort"
+			} else {
+				"-Zbuild-std=core"
+			},
 		])
 		.arg("--target")
 		.arg(polkavm_linker::target_json_path(args).unwrap());

substrate/frame/revive/src/tests/pvm.rs

@@ -679,7 +679,7 @@ fn deploy_and_call_other_contract() {
 						),
 						source: ALICE,
 						dest: callee_account.clone(),
-						transferred: 2156,
+						transferred: contract_base_deposit(&callee_addr),
 					}),
 					topics: vec![],
 				},
@@ -2084,7 +2084,7 @@ fn instantiate_with_zero_balance_works() {
 					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
 						source: ALICE,
 						dest: Pallet::<Test>::account_id(),
-						transferred: 777,
+						transferred: get_code_deposit(&code_hash),
 						reason: <Test as Config>::RuntimeHoldReason::Contracts(
 							HoldReason::CodeUploadDepositReserve,
 						),
@@ -2131,7 +2131,7 @@ fn instantiate_with_zero_balance_works() {
 						),
 						source: ALICE,
 						dest: account_id,
-						transferred: 337,
+						transferred: contract_base_deposit(&addr),
 					}),
 					topics: vec![],
 				},
@@ -2173,7 +2173,7 @@ fn instantiate_with_below_existential_deposit_works() {
 					event: RuntimeEvent::Balances(pallet_balances::Event::TransferAndHold {
 						source: ALICE,
 						dest: Pallet::<Test>::account_id(),
-						transferred: 777,
+						transferred: get_code_deposit(&code_hash),
 						reason: <Test as Config>::RuntimeHoldReason::Contracts(
 							HoldReason::CodeUploadDepositReserve,
 						),
@@ -2229,7 +2229,7 @@ fn instantiate_with_below_existential_deposit_works() {
 						),
 						source: ALICE,
 						dest: account_id.clone(),
-						transferred: 337,
+						transferred: contract_base_deposit(&addr),
 					}),
 					topics: vec![],
 				},