fixup! eth: add confirmation screen for known networks

Author: Tomasvrba

src/rust/bitbox02-rust/src/hww/api/ethereum/params.rs

@@ -100,11 +100,6 @@ const PARAMS: &[Params] = &[
     },
 ];
 
-/// Check if the chain_id corresponds to a known network (to show an additional confirmations for).
-pub fn is_known_network(chain_id: u64) -> bool {
-    PARAMS.iter().any(|p| p.chain_id == chain_id)
-}
-
 /// Get the chain parameters by `coin` or `chain_id`. If `chain_id` is non-zero, `coin` is ignored.
 fn get(coin: Option<EthCoin>, chain_id: u64) -> Option<&'static Params> {
     PARAMS.iter().find(|p| {
@@ -118,6 +113,11 @@ fn get(coin: Option<EthCoin>, chain_id: u64) -> Option<&'static Params> {
     })
 }
 
+/// Check if the chain_id corresponds to a known network (to show an additional confirmations for).
+pub fn is_known_network(coin: Option<EthCoin>, chain_id: u64) -> bool {
+    get(coin, chain_id).is_some()
+}
+
 /// Get the chain parameters by `coin` or `chain_id`. If `chain_id` is non-zero, `coin` is
 /// ignored. If `coin` is None. `chain_id` alone is used.
 ///

src/rust/bitbox02-rust/src/hww/api/ethereum/sign.rs

@@ -300,7 +300,7 @@ pub async fn process(request: &Transaction<'_>) -> Result<Response, Error> {
     super::keypath::warn_unusual_keypath(&params, params.name, request.keypath()).await?;
 
     // Show chain confirmation only for known networks
-    if super::params::is_known_network(params.chain_id) {
+    if super::params::is_known_network(request.coin()?, request.chain_id()) {
         confirm::confirm(&confirm::Params {
             body: &format!("Sign transaction on\n\n{}", params.name),
             accept_is_nextarrow: true,
@@ -1335,47 +1335,4 @@ mod tests {
         .unwrap();
         assert_eq!(unsafe { CONFIRM_COUNTER }, 1);
     }
-
-    /// Test that unknown networks do NOT get the chain confirmation screen
-    #[test]
-    pub fn test_no_chain_confirmation_for_unknown_networks() {
-        const KEYPATH: &[u32] = &[44 + HARDENED, 60 + HARDENED, 0 + HARDENED, 0, 0];
-        static mut CONFIRM_COUNTER: u32 = 0;
-
-        // Test with an unknown network (chain_id 999999)
-        mock(Data {
-            ui_confirm_create: Some(Box::new(|params| {
-                unsafe {
-                    // Only the warning confirmations should appear, not chain confirmation
-                    if params.body.starts_with("Sign transaction on") {
-                        CONFIRM_COUNTER += 1;
-                    }
-                }
-                true
-            })),
-            ui_transaction_address_create: Some(Box::new(|_, _| true)),
-            ui_transaction_fee_create: Some(Box::new(|_, _, _| true)),
-            ..Default::default()
-        });
-        mock_unlocked();
-
-        block_on(process(&Transaction::Legacy(&pb::EthSignRequest {
-            coin: pb::EthCoin::Eth as _,
-            keypath: KEYPATH.to_vec(),
-            nonce: b"\x1f\xdc".to_vec(),
-            gas_price: b"\x01\x65\xa0\xbc\x00".to_vec(),
-            gas_limit: b"\x52\x08".to_vec(),
-            recipient:
-                b"\x04\xf2\x64\xcf\x34\x44\x03\x13\xb4\xa0\x19\x2a\x35\x28\x14\xfb\xe9\x27\xb8\x85"
-                    .to_vec(),
-            value: b"\x07\x5c\xf1\x25\x9e\x9c\x40\x00".to_vec(),
-            data: b"".to_vec(),
-            host_nonce_commitment: None,
-            chain_id: 999999,
-            address_case: pb::EthAddressCase::Mixed as _,
-        })))
-        .unwrap();
-
-        assert_eq!(unsafe { CONFIRM_COUNTER }, 0);
-    }
 }