From 544b535b845acf5404664276462f3596dcae1a7d Mon Sep 17 00:00:00 2001
From: "paritytech-cmd-bot-polkadot-sdk[bot]"
 <179002856+paritytech-cmd-bot-polkadot-sdk[bot]@users.noreply.github.com>
Date: Wed, 5 Feb 2025 13:28:09 +0100
Subject: [PATCH] [stable2407] Backport #7446 (#7460)

Backport #7446 into `stable2407` from serban300.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Serban Iorga <serban@parity.io>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
---
 prdoc/pr_7460.prdoc                                    | 10 ++++++++++
 substrate/frame/parameters/src/tests/mock.rs           |  2 +-
 .../procedural/src/construct_runtime/expand/origin.rs  |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 prdoc/pr_7460.prdoc

diff --git a/prdoc/pr_7460.prdoc b/prdoc/pr_7460.prdoc
new file mode 100644
index 000000000000..bee1eed648ab
--- /dev/null
+++ b/prdoc/pr_7460.prdoc
@@ -0,0 +1,10 @@
+title: Update SCALE codec indices
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      We need this in order to be able to update `parity-scale-codec` to the latest version after it's released. That's because `parity-scale-codec` added support for checking for duplicate indexes at compile time.
+
+crates:
+  - name: frame-support-procedural
+    bump: patch
diff --git a/substrate/frame/parameters/src/tests/mock.rs b/substrate/frame/parameters/src/tests/mock.rs
index 53a3b3e394c4..8d6f7d25ceac 100644
--- a/substrate/frame/parameters/src/tests/mock.rs
+++ b/substrate/frame/parameters/src/tests/mock.rs
@@ -75,7 +75,7 @@ pub mod dynamic_params {
 	}
 
 	#[dynamic_pallet_params]
-	#[codec(index = 3)]
+	#[codec(index = 4)]
 	pub mod somE_weird_SPElLInG_s {
 		#[codec(index = 0)]
 		pub static V: u64 = 0;
diff --git a/substrate/frame/support/procedural/src/construct_runtime/expand/origin.rs b/substrate/frame/support/procedural/src/construct_runtime/expand/origin.rs
index 4a14853c04ee..5a6a89afef3f 100644
--- a/substrate/frame/support/procedural/src/construct_runtime/expand/origin.rs
+++ b/substrate/frame/support/procedural/src/construct_runtime/expand/origin.rs
@@ -206,6 +206,7 @@ pub fn expand_outer_origin(
 			system(#system_path::Origin<#runtime>),
 			#caller_variants
 			#[allow(dead_code)]
+			#[codec(skip)]
 			Void(#scrate::__private::Void)
 		}