fix(core): fix chain_id not showing for unknown networks (#472)

Author: lyxyx

core/src/apps/ethereum/onekey/get_address.py

@@ -43,7 +43,9 @@ async def get_address(
             address=address,
             address_n=path,
             network=get_display_network_name(network),
-            evm_chain_id=None if network else msg.chain_id,
+            evm_chain_id=None
+            if network is not networks.UNKNOWN_NETWORK
+            else msg.chain_id,
         )
 
     return EthereumAddress(address=address)

core/src/apps/ethereum/onekey/sign_message.py

@@ -57,7 +57,7 @@ async def sign_message(
         decode_message(msg.message),
         address,
         verify=False,
-        evm_chain_id=None if network else msg.chain_id,
+        evm_chain_id=None if network is not networks.UNKNOWN_NETWORK else msg.chain_id,
     )
 
     signature = secp256k1.sign(

core/src/apps/ethereum/onekey/sign_tx.py

@@ -94,7 +94,7 @@ async def sign_tx(
         if token_id is not None
         else None,
         token_id=token_id,
-        evm_chain_id=None if network else msg.chain_id,
+        evm_chain_id=None if network is not networks.UNKNOWN_NETWORK else msg.chain_id,
     )
 
     data = bytearray()

core/src/apps/ethereum/onekey/sign_tx_eip1559.py

@@ -121,7 +121,7 @@ async def sign_tx_eip1559(
         if token_id is not None
         else None,
         token_id=token_id,
-        evm_chain_id=None if network else msg.chain_id,
+        evm_chain_id=None if network is not networks.UNKNOWN_NETWORK else msg.chain_id,
     )
     data = bytearray()
     data += msg.data_initial_chunk

core/src/apps/ethereum/onekey/verify_message.py

@@ -44,17 +44,15 @@ async def verify_message(ctx: Context, msg: EthereumVerifyMessage) -> Success:
     if msg.chain_id:
         network = networks.by_chain_id(msg.chain_id)
     else:
-        network = None
-    ctx.primary_color, ctx.icon_path = get_color_and_icon(
-        network.chain_id if network else None
-    )
+        network = networks.UNKNOWN_NETWORK
+    ctx.primary_color, ctx.icon_path = get_color_and_icon(network.chain_id)
     await confirm_signverify(
         ctx,
         get_display_network_name(network),
         decode_message(msg.message),
         address=address,
         verify=True,
-        evm_chain_id=None if network else msg.chain_id,
+        evm_chain_id=None if network is not networks.UNKNOWN_NETWORK else msg.chain_id,
     )
     from trezor.lvglui.i18n import gettext as _, keys as i18n_keys
 

core/src/apps/ethereum/sign_message.py

@@ -10,6 +10,7 @@
 from apps.common.helpers import validate_message
 from apps.common.signverify import decode_message
 
+from . import networks
 from .helpers import address_from_bytes, get_color_and_icon, get_display_network_name
 from .keychain import PATTERNS_ADDRESS, with_keychain_from_path
 
@@ -50,7 +51,9 @@ async def sign_message(
         decode_message(msg.message),
         address,
         verify=False,
-        evm_chain_id=None,
+        evm_chain_id=None
+        if network is not networks.UNKNOWN_NETWORK
+        else network.chain_id,
     )
 
     signature = secp256k1.sign(

core/src/apps/ethereum/sign_tx.py

@@ -10,7 +10,7 @@
 
 from apps.common import paths
 
-from . import tokens
+from . import networks, tokens
 from .helpers import (
     address_from_bytes,
     bytes_from_address,
@@ -85,7 +85,7 @@ async def sign_tx(
         if token_id is not None
         else None,
         token_id=token_id,
-        evm_chain_id=None if network else msg.chain_id,
+        evm_chain_id=None if network is not networks.UNKNOWN_NETWORK else msg.chain_id,
     )
 
     data = bytearray()

core/src/apps/ethereum/sign_tx_eip1559.py

@@ -10,6 +10,7 @@
 
 from apps.common import paths
 
+from . import networks
 from .helpers import (
     address_from_bytes,
     bytes_from_address,
@@ -112,7 +113,7 @@ async def sign_tx_eip1559(
         if token_id is not None
         else None,
         token_id=token_id,
-        evm_chain_id=None if network else msg.chain_id,
+        evm_chain_id=None if network is not networks.UNKNOWN_NETWORK else msg.chain_id,
     )
     data = bytearray()
     data += msg.data_initial_chunk