Fix the denomination of Bridge pool gas fees

apps/src/lib/cli.rs

@@ -2817,7 +2817,8 @@ pub mod args {
             let recipient = BRIDGE_POOL_TARGET.parse(matches);
             let sender = SOURCE.parse(matches);
             let amount = InputAmount::Unvalidated(AMOUNT.parse(matches));
-            let fee_amount = BRIDGE_POOL_GAS_AMOUNT.parse(matches).amount;
+            let fee_amount =
+                InputAmount::Unvalidated(BRIDGE_POOL_GAS_AMOUNT.parse(matches));
             let fee_payer = BRIDGE_POOL_GAS_PAYER.parse(matches);
             let fee_token = BRIDGE_POOL_GAS_TOKEN.parse(matches);
             let code_path = PathBuf::from(TX_BRIDGE_POOL_WASM);

shared/src/ledger/args.rs

@@ -716,8 +716,8 @@ pub struct EthereumBridgePool<C: NamadaTypes = SdkTypes> {
     pub sender: C::Address,
     /// The amount to be transferred
     pub amount: InputAmount,
-    /// The amount of fees (in NAM)
-    pub fee_amount: token::Amount,
+    /// The amount of gas fees
+    pub fee_amount: InputAmount,
     /// The account of fee payer.
     ///
     /// If unset, it is the same as the sender.

shared/src/ledger/eth_bridge/bridge_pool.rs

@@ -9,7 +9,7 @@ use std::sync::Arc;
 use borsh::BorshSerialize;
 use ethbridge_bridge_contract::Bridge;
 use ethers::providers::Middleware;
-use namada_core::ledger::eth_bridge::ADDRESS as BRIDGE_ADDRESS;
+use namada_core::ledger::eth_bridge::storage::wrapped_erc20s;
 use namada_core::types::key::common;
 use owo_colors::OwoColorize;
 use serde::{Deserialize, Serialize};
@@ -55,11 +55,21 @@ pub async fn build_bridge_pool_tx<C: crate::ledger::queries::Client + Sync>(
     gas_payer: common::PublicKey,
 ) -> Result<Tx, Error> {
     let fee_payer = fee_payer.unwrap_or_else(|| sender.clone());
-    let DenominatedAmount { amount, .. } =
-        validate_amount(client, amount, &BRIDGE_ADDRESS, tx_args.force)
-            .await
-            .expect("Failed to validate amount");
-
+    let DenominatedAmount { amount, .. } = validate_amount(
+        client,
+        amount,
+        &wrapped_erc20s::token(&asset),
+        tx_args.force,
+    )
+    .await
+    .ok_or_else(|| Error::Other("Failed to validate amount".into()))?;
+    let DenominatedAmount {
+        amount: fee_amount, ..
+    } = validate_amount(client, fee_amount, &fee_token, tx_args.force)
+        .await
+        .ok_or_else(|| {
+            Error::Other("Failed to validate Bridge pool fee amount".into())
+        })?;
     let transfer = PendingTransfer {
         transfer: TransferToEthereum {
             asset,

shared/src/ledger/rpc.rs

@@ -983,6 +983,7 @@ pub async fn validate_amount<C: crate::ledger::queries::Client + Sync>(
     force: bool,
 ) -> Option<token::DenominatedAmount> {
     let input_amount = match amount {
+        InputAmount::Unvalidated(amt) if amt.is_zero() => return Some(amt),
         InputAmount::Unvalidated(amt) => amt.canonical(),
         InputAmount::Validated(amt) => return Some(amt),
     };