Implement ethereum explicitly related currency swap logic to make Native-to-EVM Bridge transactions visible via Ethereum RPC

Cargo.toml

@@ -150,6 +150,7 @@ fc-mapping-sync = { git = "https://github.com/humanode-network/frontier", tag =
 fc-rpc = { git = "https://github.com/humanode-network/frontier", tag = "locked/polkadot-v0.9.43-2025-03-22", default-features = false }
 fc-rpc-core = { git = "https://github.com/humanode-network/frontier", tag = "locked/polkadot-v0.9.43-2025-03-22", default-features = false }
 fc-storage = { git = "https://github.com/humanode-network/frontier", tag = "locked/polkadot-v0.9.43-2025-03-22", default-features = false }
+fp-ethereum = { git = "https://github.com/humanode-network/frontier", tag = "locked/polkadot-v0.9.43-2025-03-22", default-features = false }
 fp-evm = { git = "https://github.com/humanode-network/frontier", tag = "locked/polkadot-v0.9.43-2025-03-22", default-features = false }
 fp-rpc = { git = "https://github.com/humanode-network/frontier", tag = "locked/polkadot-v0.9.43-2025-03-22", default-features = false }
 fp-self-contained = { git = "https://github.com/humanode-network/frontier", tag = "locked/polkadot-v0.9.43-2025-03-22", default-features = false }

crates/humanode-runtime/Cargo.toml

@@ -32,13 +32,14 @@ pallet-evm-balances = { path = "../pallet-evm-balances", default-features = fals
 pallet-evm-system = { path = "../pallet-evm-system", default-features = false }
 pallet-humanode-offences = { path = "../pallet-humanode-offences", default-features = false }
 pallet-humanode-session = { path = "../pallet-humanode-session", default-features = false }
+pallet-native-to-evm-swap = { path = "../pallet-native-to-evm-swap", default-features = false }
 pallet-pot = { path = "../pallet-pot", default-features = false }
 pallet-token-claims = { path = "../pallet-token-claims", default-features = false }
 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-evm-to-native-swap = { path = "../precompile-evm-to-native-swap", default-features = false }
 precompile-native-currency = { path = "../precompile-native-currency", default-features = false }
 precompile-utils = { path = "../precompile-utils", default-features = false }
 primitives-auth-ticket = { path = "../primitives-auth-ticket", default-features = false }
@@ -131,6 +132,7 @@ runtime-benchmarks = [
   "pallet-humanode-session/runtime-benchmarks",
   "pallet-im-online/runtime-benchmarks",
   "pallet-multisig/runtime-benchmarks",
+  "pallet-native-to-evm-swap/runtime-benchmarks",
   "pallet-sudo/runtime-benchmarks",
   "pallet-timestamp/runtime-benchmarks",
   "pallet-token-claims/runtime-benchmarks",
@@ -190,6 +192,7 @@ std = [
   "pallet-humanode-session/std",
   "pallet-im-online/std",
   "pallet-multisig/std",
+  "pallet-native-to-evm-swap/std",
   "pallet-pot/std",
   "pallet-session/std",
   "pallet-sudo/std",
@@ -201,8 +204,8 @@ std = [
   "pallet-vesting/std",
   "precompile-bioauth/std",
   "precompile-bls12381/std",
-  "precompile-currency-swap/std",
   "precompile-evm-accounts-mapping/std",
+  "precompile-evm-to-native-swap/std",
   "precompile-native-currency/std",
   "precompile-utils/std",
   "primitives-auth-ticket/std",
@@ -261,6 +264,7 @@ try-runtime = [
   "pallet-humanode-session/try-runtime",
   "pallet-im-online/try-runtime",
   "pallet-multisig/try-runtime",
+  "pallet-native-to-evm-swap/try-runtime",
   "pallet-pot/try-runtime",
   "pallet-session/try-runtime",
   "pallet-sudo/try-runtime",

crates/humanode-runtime/src/currency_swap.rs → crates/humanode-runtime/src/evm_swap.rs

@@ -12,6 +12,18 @@ parameter_types! {
     pub EvmToNativeSwapBridgePotAccountId: EvmAccountId = EvmToNativeSwapBridgePot::account_id();
 }
 
+pub struct EvmToNativeSwapConfig;
+
+impl precompile_evm_to_native_swap::Config for EvmToNativeSwapConfig {
+    type AccountId = AccountId;
+    type EvmAccountId = EvmAccountId;
+    type NativeToken = Balances;
+    type EvmToken = EvmBalances;
+    type BalanceConverterEvmToNative = Identity;
+    type BridgePotNative = NativeToEvmSwapBridgePotAccountId;
+    type BridgePotEvm = EvmToNativeSwapBridgePotAccountId;
+}
+
 pub type NativeToEvmOneToOne =
     bridge_pot_currency_swap::CurrencySwap<NativeToEvmOneToOneConfig, ExistenceRequired>;
 

crates/humanode-runtime/src/frontier_precompiles.rs

@@ -12,14 +12,14 @@ 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_evm_to_native_swap::EvmToNativeSwap;
 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::{evm_swap, ConstU64};
 
 /// A set of constant values used to indicate precompiles.
 pub mod precompiles_constants {
@@ -74,8 +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;
+    /// `EvmToNativeSwap` precompile constant.
+    pub const EVM_TO_NATIVE_SWAP: u64 = 2304;
 }
 
 use precompiles_constants::*;
@@ -117,7 +117,7 @@ where
             BIOAUTH,
             EVM_ACCOUNTS_MAPPING,
             NATIVE_CURRENCY,
-            CURRENCY_SWAP
+            EVM_TO_NATIVE_SWAP,
         ]
         .into_iter()
         .map(hash)
@@ -172,15 +172,11 @@ 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_TO_NATIVE_SWAP) => Some(EvmToNativeSwap::<
+                evm_swap::EvmToNativeSwapConfig,
+                // TODO(#697): implement proper dynamic gas cost estimation.
+                ConstU64<200>,
+            >::execute(handle)),
             // Fallback
             _ => None,
         }

crates/humanode-runtime/src/lib.rs

@@ -85,12 +85,12 @@ use frontier_precompiles::{precompiles_constants, FrontierPrecompiles};
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
 pub mod constants;
-mod currency_swap;
 mod deauthentication_reason;
 #[cfg(test)]
 mod dev_utils;
 mod display_moment;
 pub mod eth_sig;
+mod evm_swap;
 mod find_author;
 mod fixed_supply;
 pub mod robonode;
@@ -625,13 +625,24 @@ impl pallet_evm_balances::Config for Runtime {
     type Balance = Balance;
     type ExistentialDeposit = ConstU128<1>;
     type AccountStore = EvmSystem;
-    type DustRemoval = currency_swap::TreasuryPotProxy;
+    type DustRemoval = evm_swap::TreasuryPotProxy;
 }
 
 impl pallet_currency_swap::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
     type AccountIdTo = EvmAccountId;
-    type CurrencySwap = currency_swap::NativeToEvmOneToOne;
+    type CurrencySwap = evm_swap::NativeToEvmOneToOne;
+    type WeightInfo = ();
+}
+
+impl pallet_native_to_evm_swap::Config for Runtime {
+    type RuntimeEvent = RuntimeEvent;
+    type EvmAccountId = EvmAccountId;
+    type NativeToken = Balances;
+    type EvmToken = EvmBalances;
+    type BalanceConverterNativeToEvm = Identity;
+    type BridgePotNative = NativeToEvmSwapBridgePotAccountId;
+    type BridgePotEvm = EvmToNativeSwapBridgePotAccountId;
     type WeightInfo = ();
 }
 
@@ -661,7 +672,7 @@ impl pallet_evm::Config for Runtime {
     type ChainId = EthereumChainId;
     type BlockGasLimit = BlockGasLimit;
     type OnChargeTransaction =
-        fixed_supply::EvmTransactionCharger<EvmBalances, currency_swap::FeesPotProxy>;
+        fixed_supply::EvmTransactionCharger<EvmBalances, evm_swap::FeesPotProxy>;
     type OnCreate = ();
     type FindAuthor = find_author::FindAuthorTruncated<
         find_author::FindAuthorFromSession<find_author::FindAuthorBabe, BabeId>,
@@ -787,7 +798,7 @@ 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_TO_NATIVE_SWAP),
         ];
 }
 
@@ -842,6 +853,7 @@ construct_runtime!(
         EvmBalancesErc20Support: pallet_erc20_support = 37,
         DummyPrecompilesCode: pallet_dummy_precompiles_code = 38,
         HumanodeOffences: pallet_humanode_offences = 39,
+        NativeToEvmSwap: pallet_native_to_evm_swap = 40,
     }
 );
 

crates/humanode-runtime/src/tests/currency_swap.rs

@@ -164,86 +164,3 @@ fn currency_swap_native_call_works() {
         );
     })
 }
-
-/// This test verifies that the swap precompile call works in the happy path.
-#[test]
-fn currency_swap_precompile_call_works() {
-    // Build the state from the config.
-    new_test_ext_with().execute_with(move || {
-        let alice_balance_before = Balances::total_balance(&account_id("Alice"));
-        let native_to_evm_swap_bridge_pot_before =
-            Balances::total_balance(&NativeToEvmSwapBridgePot::account_id());
-        let alice_evm_balance_before = EvmBalances::total_balance(&evm_account_id("EvmAlice"));
-        let evm_to_native_swap_bridge_pot_before =
-            EvmBalances::total_balance(&EvmToNativeSwapBridgePot::account_id());
-        let fees_pot_balance_before = Balances::total_balance(&FeesPot::account_id());
-        let swap_balance: Balance = 1000;
-
-        // Prepare EVM call.
-        let input = EvmDataWriter::new_with_selector(precompile_currency_swap::Action::Swap)
-            .write(H256::from(account_id("Alice").as_ref()))
-            .build();
-
-        let expected_gas_usage: u64 = 21216 + 560;
-        let expected_fee: Balance =
-            u128::from(expected_gas_usage) * u128::try_from(*GAS_PRICE).unwrap();
-
-        // Invoke the function under test.
-        let config = <Runtime as pallet_evm::Config>::config();
-        let execinfo = <Runtime as pallet_evm::Config>::Runner::call(
-            evm_account_id("EvmAlice"),
-            *PRECOMPILE_ADDRESS,
-            input,
-            swap_balance.into(),
-            50_000, // a reasonable upper bound for tests
-            Some(*GAS_PRICE),
-            Some(*GAS_PRICE),
-            None,
-            Vec::new(),
-            true,
-            true,
-            None,
-            None,
-            config,
-        )
-        .unwrap();
-        assert_eq!(
-            execinfo.exit_reason,
-            fp_evm::ExitReason::Succeed(fp_evm::ExitSucceed::Returned)
-        );
-        assert_eq!(execinfo.used_gas.standard, expected_gas_usage.into());
-        assert_eq!(execinfo.value, EvmDataWriter::new().write(true).build());
-        assert_eq!(
-            execinfo.logs,
-            vec![LogsBuilder::new(*PRECOMPILE_ADDRESS).log3(
-                precompile_currency_swap::SELECTOR_LOG_SWAP,
-                evm_account_id("EvmAlice"),
-                H256::from(account_id("Alice").as_ref()),
-                EvmDataWriter::new().write(swap_balance).build(),
-            )]
-        );
-
-        // Assert state changes.
-        assert!(BalancedCurrencySwapBridgesInitializer::is_balanced().unwrap());
-        assert_eq!(
-            Balances::total_balance(&FeesPot::account_id()),
-            fees_pot_balance_before + expected_fee
-        );
-        assert_eq!(
-            Balances::total_balance(&account_id("Alice")),
-            alice_balance_before + swap_balance
-        );
-        assert_eq!(
-            Balances::total_balance(&NativeToEvmSwapBridgePot::account_id()),
-            native_to_evm_swap_bridge_pot_before - swap_balance - expected_fee
-        );
-        assert_eq!(
-            EvmBalances::total_balance(&evm_account_id("EvmAlice")),
-            alice_evm_balance_before - swap_balance - expected_fee
-        );
-        assert_eq!(
-            EvmBalances::total_balance(&EvmToNativeSwapBridgePot::account_id()),
-            evm_to_native_swap_bridge_pot_before + swap_balance + expected_fee
-        );
-    })
-}