From 16c142468d912e2260d0b37ccce87fbfb4f3e375 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Sat, 25 Nov 2023 17:40:30 +0800
Subject: [PATCH] Release `pango-6502` (#1331)

* Remove old migration

* Release `pango-6502`
---
 runtime/crab/src/lib.rs           |  2 +-
 runtime/darwinia/src/lib.rs       |  2 +-
 runtime/darwinia/src/migration.rs | 15 +--------------
 runtime/pangolin/src/lib.rs       |  4 ++--
 runtime/pangoro/src/lib.rs        |  4 ++--
 5 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
index c193331ea..f997b773f 100644
--- a/runtime/crab/src/lib.rs
+++ b/runtime/crab/src/lib.rs
@@ -69,7 +69,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	(migration::CustomOnRuntimeUpgrade, darwinia_staking::migration::v1::MigrateToV1<Runtime>),
+	migration::CustomOnRuntimeUpgrade,
 >;
 
 /// Darwinia proposal base fee.
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
index 3be194ccf..15876625d 100644
--- a/runtime/darwinia/src/lib.rs
+++ b/runtime/darwinia/src/lib.rs
@@ -69,7 +69,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	(migration::CustomOnRuntimeUpgrade, darwinia_staking::migration::v1::MigrateToV1<Runtime>),
+	migration::CustomOnRuntimeUpgrade,
 >;
 
 /// Darwinia proposal base fee.
diff --git a/runtime/darwinia/src/migration.rs b/runtime/darwinia/src/migration.rs
index a58486668..ed7c0afc3 100644
--- a/runtime/darwinia/src/migration.rs
+++ b/runtime/darwinia/src/migration.rs
@@ -41,20 +41,7 @@ impl frame_support::traits::OnRuntimeUpgrade for CustomOnRuntimeUpgrade {
 }
 
 fn migrate() -> frame_support::weights::Weight {
-	// substrate
-	use sp_core::H160;
-	use sp_std::str::FromStr;
-
-	const REVERT_BYTECODE: [u8; 5] = [0x60, 0x00, 0x60, 0x00, 0xFD];
-	const USDT_ADDRESS: &str = "0x0000000000000000000000000000000000000403";
-
-	if let Ok(a) = H160::from_str(USDT_ADDRESS) {
-		EVM::create_account(a, REVERT_BYTECODE.to_vec());
-	}
-
-	<Runtime as frame_system::Config>::DbWeight::get().reads_writes(5, 5)
-
-	// frame_support::weights::Weight::zero()
+	frame_support::weights::Weight::zero()
 	// RuntimeBlockWeights::get().max_block
 	// <Runtime as frame_system::Config>::DbWeight::get().reads_writes(0, 1)
 }
diff --git a/runtime/pangolin/src/lib.rs b/runtime/pangolin/src/lib.rs
index cb26f51ac..70d34a9c6 100644
--- a/runtime/pangolin/src/lib.rs
+++ b/runtime/pangolin/src/lib.rs
@@ -70,7 +70,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	(migration::CustomOnRuntimeUpgrade, darwinia_staking::migration::v1::MigrateToV1<Runtime>),
+	migration::CustomOnRuntimeUpgrade,
 >;
 
 /// Darwinia proposal base fee.
@@ -83,7 +83,7 @@ pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
 	spec_name: sp_runtime::create_runtime_str!("Pangolin2"),
 	impl_name: sp_runtime::create_runtime_str!("DarwiniaOfficialRust"),
 	authoring_version: 0,
-	spec_version: 6_5_0_1,
+	spec_version: 6_5_0_2,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 0,
diff --git a/runtime/pangoro/src/lib.rs b/runtime/pangoro/src/lib.rs
index 5e06c222c..e7510ddbc 100644
--- a/runtime/pangoro/src/lib.rs
+++ b/runtime/pangoro/src/lib.rs
@@ -69,7 +69,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	(migration::CustomOnRuntimeUpgrade, darwinia_staking::migration::v1::MigrateToV1<Runtime>),
+	migration::CustomOnRuntimeUpgrade,
 >;
 
 /// Darwinia proposal base fee.
@@ -82,7 +82,7 @@ pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
 	spec_name: sp_runtime::create_runtime_str!("Pangoro2"),
 	impl_name: sp_runtime::create_runtime_str!("DarwiniaOfficialRust"),
 	authoring_version: 0,
-	spec_version: 6_5_0_1,
+	spec_version: 6_5_0_2,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 0,