Deprecate pallet-currency-swap and precompile-currency-swap usage at humanode-runtime

Author: dmitrylavrenov

Cargo.lock

@@ -23,7 +23,6 @@ pallet-bioauth = { path = "../pallet-bioauth", default-features = false }
 pallet-bootnodes = { path = "../pallet-bootnodes", default-features = false }
 pallet-chain-properties = { path = "../pallet-chain-properties", default-features = false }
 pallet-chain-start-moment = { path = "../pallet-chain-start-moment", default-features = false }
-pallet-currency-swap = { path = "../pallet-currency-swap", default-features = false }
 pallet-dummy-precompiles-code = { path = "../pallet-dummy-precompiles-code", default-features = false }
 pallet-erc20-support = { path = "../pallet-erc20-support", default-features = false }
 pallet-ethereum-chain-id = { path = "../pallet-ethereum-chain-id", default-features = false }
@@ -38,7 +37,6 @@ pallet-token-claims = { path = "../pallet-token-claims", default-features = fals
 pallet-vesting = { path = "../pallet-vesting", default-features = false }
 precompile-bioauth = { path = "../precompile-bioauth", default-features = false }
 precompile-bls12381 = { path = "../precompile-bls12381", default-features = false }
-precompile-currency-swap = { path = "../precompile-currency-swap", default-features = false }
 precompile-evm-accounts-mapping = { path = "../precompile-evm-accounts-mapping", default-features = false }
 precompile-native-currency = { path = "../precompile-native-currency", default-features = false }
 precompile-utils = { path = "../precompile-utils", default-features = false }
@@ -124,7 +122,6 @@ runtime-benchmarks = [
   "pallet-balances/runtime-benchmarks",
   "pallet-bioauth/runtime-benchmarks",
   "pallet-bootnodes/runtime-benchmarks",
-  "pallet-currency-swap/runtime-benchmarks",
   "pallet-ethereum/runtime-benchmarks",
   "pallet-evm-accounts-mapping/runtime-benchmarks",
   "pallet-evm-swap/runtime-benchmarks",
@@ -173,7 +170,6 @@ std = [
   "pallet-bootnodes/std",
   "pallet-chain-properties/std",
   "pallet-chain-start-moment/std",
-  "pallet-currency-swap/std",
   "pallet-dummy-precompiles-code/std",
   "pallet-erc20-support/std",
   "pallet-ethereum-chain-id/std",
@@ -204,7 +200,6 @@ std = [
   "pallet-vesting/std",
   "precompile-bioauth/std",
   "precompile-bls12381/std",
-  "precompile-currency-swap/std",
   "precompile-evm-accounts-mapping/std",
   "precompile-native-currency/std",
   "precompile-utils/std",
@@ -250,7 +245,6 @@ try-runtime = [
   "pallet-bootnodes/try-runtime",
   "pallet-chain-properties/try-runtime",
   "pallet-chain-start-moment/try-runtime",
-  "pallet-currency-swap/try-runtime",
   "pallet-dummy-precompiles-code/try-runtime",
   "pallet-erc20-support/try-runtime",
   "pallet-ethereum-chain-id/try-runtime",

crates/humanode-runtime/Cargo.toml

@@ -12,21 +12,6 @@ parameter_types! {
     pub EvmToNativeSwapBridgePotAccountId: EvmAccountId = EvmToNativeSwapBridgePot::account_id();
 }
 
-pub type NativeToEvmOneToOne =
-    bridge_pot_currency_swap::CurrencySwap<NativeToEvmOneToOneConfig, ExistenceRequired>;
-
-pub struct NativeToEvmOneToOneConfig;
-
-impl bridge_pot_currency_swap::Config for NativeToEvmOneToOneConfig {
-    type AccountIdFrom = AccountId;
-    type AccountIdTo = EvmAccountId;
-    type CurrencyFrom = Balances;
-    type CurrencyTo = EvmBalances;
-    type BalanceConverter = Identity;
-    type PotFrom = NativeToEvmSwapBridgePotAccountId;
-    type PotTo = EvmToNativeSwapBridgePotAccountId;
-}
-
 pub type EvmToNativeOneToOne =
     bridge_pot_currency_swap::CurrencySwap<EvmToNativeOneToOneConfig, ExistenceRequired>;
 

crates/humanode-runtime/src/currency_swap.rs

@@ -13,14 +13,13 @@ use precompile_bls12381::{
     Bls12381G1Add, Bls12381G1Mul, Bls12381G1MultiExp, Bls12381G2Add, Bls12381G2Mul,
     Bls12381G2MultiExp, Bls12381MapG1, Bls12381MapG2, Bls12381Pairing,
 };
-use precompile_currency_swap::CurrencySwap;
 use precompile_evm_accounts_mapping::EvmAccountsMapping;
 use precompile_native_currency::NativeCurrency;
 use precompile_utils::EvmData;
 use sp_core::{H160, U256};
 use sp_std::marker::PhantomData;
 
-use crate::{currency_swap, AccountId, ConstU64, EvmAccountId};
+use crate::ConstU64;
 
 /// A set of constant values used to indicate precompiles.
 pub mod precompiles_constants {
@@ -75,10 +74,8 @@ pub mod precompiles_constants {
     pub const EVM_ACCOUNTS_MAPPING: u64 = 2049;
     /// `NativeCurrency` precompile constant.
     pub const NATIVE_CURRENCY: u64 = 2050;
-    /// `CurrencySwap` precompile constant.
-    pub const CURRENCY_SWAP: u64 = 2304;
     /// `EvmSwap` precompile constant.
-    pub const EVM_SWAP: u64 = 2305;
+    pub const EVM_SWAP: u64 = 2304;
 }
 
 use precompiles_constants::*;
@@ -120,7 +117,6 @@ where
             BIOAUTH,
             EVM_ACCOUNTS_MAPPING,
             NATIVE_CURRENCY,
-            CURRENCY_SWAP,
             EVM_SWAP,
         ]
         .into_iter()
@@ -180,15 +176,6 @@ where
             a if a == hash(NATIVE_CURRENCY) => {
                 Some(NativeCurrency::<R, ConstU64<200>>::execute(handle))
             }
-            a if a == hash(CURRENCY_SWAP) => {
-                Some(CurrencySwap::<
-                    currency_swap::EvmToNativeOneToOne,
-                    EvmAccountId,
-                    AccountId,
-                    // TODO(#697): implement proper dynamic gas cost estimation.
-                    ConstU64<200>,
-                >::execute(handle))
-            }
             a if a == hash(EVM_SWAP) => Some(EvmSwap::<
                 R,
                 // TODO(#697): implement proper dynamic gas cost estimation.

crates/humanode-runtime/src/frontier_precompiles.rs

@@ -628,13 +628,6 @@ impl pallet_evm_balances::Config for Runtime {
     type DustRemoval = currency_swap::TreasuryPotProxy;
 }
 
-impl pallet_currency_swap::Config for Runtime {
-    type RuntimeEvent = RuntimeEvent;
-    type AccountIdTo = EvmAccountId;
-    type CurrencySwap = currency_swap::NativeToEvmOneToOne;
-    type WeightInfo = ();
-}
-
 impl pallet_evm_swap::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
     type EvmAccountId = EvmAccountId;
@@ -799,7 +792,6 @@ frame_support::parameter_types! {
             frontier_precompiles::hash(precompiles_constants::BIOAUTH),
             frontier_precompiles::hash(precompiles_constants::EVM_ACCOUNTS_MAPPING),
             frontier_precompiles::hash(precompiles_constants::NATIVE_CURRENCY),
-            frontier_precompiles::hash(precompiles_constants::CURRENCY_SWAP),
             frontier_precompiles::hash(precompiles_constants::EVM_SWAP),
         ];
 }
@@ -850,7 +842,6 @@ construct_runtime!(
         EvmBalances: pallet_evm_balances = 32,
         NativeToEvmSwapBridgePot: pallet_pot::<Instance4> = 33,
         EvmToNativeSwapBridgePot: pallet_pot::<Instance5> = 34,
-        CurrencySwap: pallet_currency_swap = 35,
         BalancedCurrencySwapBridgesInitializer: pallet_balanced_currency_swap_bridges_initializer = 36,
         EvmBalancesErc20Support: pallet_erc20_support = 37,
         DummyPrecompilesCode: pallet_dummy_precompiles_code = 38,