From 497009559d0394e31dfb96b209d53537b1d4b933 Mon Sep 17 00:00:00 2001
From: joepetrowski <joe@parity.io>
Date: Fri, 19 Apr 2024 08:55:44 +0200
Subject: [PATCH 1/4] kusama

---
 src/build_upgrade.rs | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/build_upgrade.rs b/src/build_upgrade.rs
index 82fcb80..f905236 100644
--- a/src/build_upgrade.rs
+++ b/src/build_upgrade.rs
@@ -252,7 +252,7 @@ fn generate_authorize_upgrade_calls(upgrade_details: &UpgradeDetails) -> Vec<Cal
 		match chain.network {
 			Network::Kusama | Network::Polkadot => continue, // do relay chain separately
 			Network::KusamaAssetHub => {
-				use kusama_asset_hub::runtime_types::cumulus_pallet_parachain_system::pallet::Call;
+				use kusama_asset_hub::runtime_types::frame_system::pallet::Call;
 				let path = format!(
 					"{}asset-hub-kusama_runtime-v{}.compact.compressed.wasm",
 					upgrade_details.directory, runtime_version
@@ -262,15 +262,14 @@ fn generate_authorize_upgrade_calls(upgrade_details: &UpgradeDetails) -> Vec<Cal
 				println!("Kusama Asset Hub Runtime Hash:   0x{}", hex::encode(runtime_hash));
 
 				let call = CallInfo::from_runtime_call(NetworkRuntimeCall::KusamaAssetHub(
-					KusamaAssetHubRuntimeCall::ParachainSystem(Call::authorize_upgrade {
+					KusamaAssetHubRuntimeCall::System(Call::authorize_upgrade {
 						code_hash: H256(runtime_hash),
-						check_version: true,
 					}),
 				));
 				authorization_calls.push(call);
 			},
 			Network::KusamaBridgeHub => {
-				use kusama_bridge_hub::runtime_types::cumulus_pallet_parachain_system::pallet::Call;
+				use kusama_bridge_hub::runtime_types::frame_system::pallet::Call;
 				let path = format!(
 					"{}bridge-hub-kusama_runtime-v{}.compact.compressed.wasm",
 					upgrade_details.directory, runtime_version
@@ -280,15 +279,14 @@ fn generate_authorize_upgrade_calls(upgrade_details: &UpgradeDetails) -> Vec<Cal
 				println!("Kusama Bridge Hub Runtime Hash:  0x{}", hex::encode(runtime_hash));
 
 				let call = CallInfo::from_runtime_call(NetworkRuntimeCall::KusamaBridgeHub(
-					KusamaBridgeHubRuntimeCall::ParachainSystem(Call::authorize_upgrade {
+					KusamaBridgeHubRuntimeCall::System(Call::authorize_upgrade {
 						code_hash: H256(runtime_hash),
-						check_version: true,
 					}),
 				));
 				authorization_calls.push(call);
 			},
 			Network::KusamaCoretime => {
-				use kusama_coretime::runtime_types::cumulus_pallet_parachain_system::pallet::Call;
+				use kusama_coretime::runtime_types::frame_system::pallet::Call;
 				let path = format!(
 					"{}coretime-kusama_runtime-v{}.compact.compressed.wasm",
 					upgrade_details.directory, runtime_version
@@ -298,15 +296,14 @@ fn generate_authorize_upgrade_calls(upgrade_details: &UpgradeDetails) -> Vec<Cal
 				println!("Kusama Coretime Runtime Hash:   0x{}", hex::encode(runtime_hash));
 
 				let call = CallInfo::from_runtime_call(NetworkRuntimeCall::KusamaCoretime(
-					KusamaCoretimeRuntimeCall::ParachainSystem(Call::authorize_upgrade {
+					KusamaCoretimeRuntimeCall::System(Call::authorize_upgrade {
 						code_hash: H256(runtime_hash),
-						check_version: true,
 					}),
 				));
 				authorization_calls.push(call);
 			},
 			Network::KusamaEncointer => {
-				use kusama_encointer::runtime_types::cumulus_pallet_parachain_system::pallet::Call;
+				use kusama_encointer::runtime_types::frame_system::pallet::Call;
 				let path = format!(
 					"{}encointer-kusama_runtime-v{}.compact.compressed.wasm",
 					upgrade_details.directory, runtime_version
@@ -316,9 +313,8 @@ fn generate_authorize_upgrade_calls(upgrade_details: &UpgradeDetails) -> Vec<Cal
 				println!("Kusama Encointer Runtime Hash:   0x{}", hex::encode(runtime_hash));
 
 				let call = CallInfo::from_runtime_call(NetworkRuntimeCall::KusamaEncointer(
-					KusamaEncointerRuntimeCall::ParachainSystem(Call::authorize_upgrade {
+					KusamaEncointerRuntimeCall::System(Call::authorize_upgrade {
 						code_hash: H256(runtime_hash),
-						check_version: true,
 					}),
 				));
 				authorization_calls.push(call);
@@ -401,8 +397,13 @@ fn generate_relay_upgrade_call(upgrade_details: &UpgradeDetails) -> Option<CallI
 			println!("Kusama Relay Chain Runtime Hash: 0x{}", hex::encode(runtime_hash));
 
 			Some(CallInfo::from_runtime_call(NetworkRuntimeCall::Kusama(
-				KusamaRuntimeCall::System(SystemCall::set_code { code: runtime }),
+				KusamaRuntimeCall::System(SystemCall::authorize_upgrade { code_hash: H256(runtime_hash) }),
 			)))
+
+			// TODO: Add CLI flag to `--set-relay-code` if people want to do this.
+			// Some(CallInfo::from_runtime_call(NetworkRuntimeCall::Kusama(
+			// 	KusamaRuntimeCall::System(SystemCall::set_code { code: runtime }),
+			// )))
 		},
 		Network::Polkadot => {
 			use polkadot_relay::runtime_types::frame_system::pallet::Call as SystemCall;

From 26009aa4825f5a2e4ac5cd506ed2251e6c70a94d Mon Sep 17 00:00:00 2001
From: joepetrowski <joe@parity.io>
Date: Sat, 20 Apr 2024 12:51:04 +0200
Subject: [PATCH 2/4] fmt

---
 src/build_upgrade.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/build_upgrade.rs b/src/build_upgrade.rs
index f905236..1e52abd 100644
--- a/src/build_upgrade.rs
+++ b/src/build_upgrade.rs
@@ -397,7 +397,9 @@ fn generate_relay_upgrade_call(upgrade_details: &UpgradeDetails) -> Option<CallI
 			println!("Kusama Relay Chain Runtime Hash: 0x{}", hex::encode(runtime_hash));
 
 			Some(CallInfo::from_runtime_call(NetworkRuntimeCall::Kusama(
-				KusamaRuntimeCall::System(SystemCall::authorize_upgrade { code_hash: H256(runtime_hash) }),
+				KusamaRuntimeCall::System(SystemCall::authorize_upgrade {
+					code_hash: H256(runtime_hash),
+				}),
 			)))
 
 			// TODO: Add CLI flag to `--set-relay-code` if people want to do this.

From 629799e5c672d6e3f14a3ccc1301d2177685ba9f Mon Sep 17 00:00:00 2001
From: joepetrowski <joe@parity.io>
Date: Thu, 2 May 2024 13:51:02 +0200
Subject: [PATCH 3/4] polkadot

---
 src/build_upgrade.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/build_upgrade.rs b/src/build_upgrade.rs
index 2c28a42..a2e6ca5 100644
--- a/src/build_upgrade.rs
+++ b/src/build_upgrade.rs
@@ -339,7 +339,7 @@ fn generate_authorize_upgrade_calls(upgrade_details: &UpgradeDetails) -> Vec<Cal
 				authorization_calls.push(call);
 			},
 			Network::PolkadotAssetHub => {
-				use polkadot_asset_hub::runtime_types::cumulus_pallet_parachain_system::pallet::Call;
+				use polkadot_asset_hub::runtime_types::frame_system::pallet::Call;
 				let path = format!(
 					"{}asset-hub-polkadot_runtime-v{}.compact.compressed.wasm",
 					upgrade_details.directory, runtime_version
@@ -349,15 +349,14 @@ fn generate_authorize_upgrade_calls(upgrade_details: &UpgradeDetails) -> Vec<Cal
 				println!("Polkadot Asset Hub Runtime Hash:   0x{}", hex::encode(runtime_hash));
 
 				let call = CallInfo::from_runtime_call(NetworkRuntimeCall::PolkadotAssetHub(
-					PolkadotAssetHubRuntimeCall::ParachainSystem(Call::authorize_upgrade {
+					PolkadotAssetHubRuntimeCall::System(Call::authorize_upgrade {
 						code_hash: H256(runtime_hash),
-						check_version: true,
 					}),
 				));
 				authorization_calls.push(call);
 			},
 			Network::PolkadotCollectives => {
-				use polkadot_collectives::runtime_types::cumulus_pallet_parachain_system::pallet::Call;
+				use polkadot_collectives::runtime_types::frame_system::pallet::Call;
 				let path = format!(
 					"{}collectives-polkadot_runtime-v{}.compact.compressed.wasm",
 					upgrade_details.directory, runtime_version
@@ -367,15 +366,14 @@ fn generate_authorize_upgrade_calls(upgrade_details: &UpgradeDetails) -> Vec<Cal
 				println!("Polkadot Collectives Runtime Hash: 0x{}", hex::encode(runtime_hash));
 
 				let call = CallInfo::from_runtime_call(NetworkRuntimeCall::PolkadotCollectives(
-					CollectivesRuntimeCall::ParachainSystem(Call::authorize_upgrade {
+					CollectivesRuntimeCall::System(Call::authorize_upgrade {
 						code_hash: H256(runtime_hash),
-						check_version: true,
 					}),
 				));
 				authorization_calls.push(call);
 			},
 			Network::PolkadotBridgeHub => {
-				use polkadot_bridge_hub::runtime_types::cumulus_pallet_parachain_system::pallet::Call;
+				use polkadot_bridge_hub::runtime_types::frame_system::pallet::Call;
 				let path = format!(
 					"{}bridge-hub-polkadot_runtime-v{}.compact.compressed.wasm",
 					upgrade_details.directory, runtime_version
@@ -385,9 +383,8 @@ fn generate_authorize_upgrade_calls(upgrade_details: &UpgradeDetails) -> Vec<Cal
 				println!("Polkadot Bridge Hub Runtime Hash:  0x{}", hex::encode(runtime_hash));
 
 				let call = CallInfo::from_runtime_call(NetworkRuntimeCall::PolkadotBridgeHub(
-					PolkadotBridgeHubRuntimeCall::ParachainSystem(Call::authorize_upgrade {
+					PolkadotBridgeHubRuntimeCall::System(Call::authorize_upgrade {
 						code_hash: H256(runtime_hash),
-						check_version: true,
 					}),
 				));
 				authorization_calls.push(call);

From babcbeaeb941ff6e507626e1f5e7ab4e7b9ad811 Mon Sep 17 00:00:00 2001
From: joepetrowski <joe@parity.io>
Date: Sat, 8 Jun 2024 07:48:17 +0200
Subject: [PATCH 4/4] people too

---
 src/build_upgrade.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/build_upgrade.rs b/src/build_upgrade.rs
index 48ce06d..8204412 100644
--- a/src/build_upgrade.rs
+++ b/src/build_upgrade.rs
@@ -315,7 +315,7 @@ fn generate_authorize_upgrade_calls(upgrade_details: &UpgradeDetails) -> Vec<Cal
 				authorization_calls.push(call);
 			},
 			Network::KusamaPeople => {
-				use kusama_people::runtime_types::cumulus_pallet_parachain_system::pallet::Call;
+				use kusama_people::runtime_types::frame_system::pallet::Call;
 				let path = format!(
 					"{}people-kusama_runtime-v{}.compact.compressed.wasm",
 					upgrade_details.directory, runtime_version
@@ -325,9 +325,8 @@ fn generate_authorize_upgrade_calls(upgrade_details: &UpgradeDetails) -> Vec<Cal
 				println!("Kusama People Runtime Hash:      0x{}", hex::encode(runtime_hash));
 
 				let call = CallInfo::from_runtime_call(NetworkRuntimeCall::KusamaPeople(
-					KusamaPeopleRuntimeCall::ParachainSystem(Call::authorize_upgrade {
+					KusamaPeopleRuntimeCall::System(Call::authorize_upgrade {
 						code_hash: H256(runtime_hash),
-						check_version: true,
 					}),
 				));
 				authorization_calls.push(call);