Merge pull request #12 from KiiChain/fix/ledger

Fix ledger chain ID and linux nano

Author: Thaleszh

ethereum/eip712/encoding.go

@@ -3,6 +3,7 @@ package eip712
 import (
 	"errors"
 	"fmt"
+	"strconv"
 
 	apitypes "github.com/ethereum/go-ethereum/signer/core/apitypes"
 
@@ -101,8 +102,17 @@ func decodeAminoSignDoc(signDocBytes []byte) (apitypes.TypedData, error) {
 		return apitypes.TypedData{}, err
 	}
 
+	// Extract the chain ID from the sign doc itself for EIP-712 domain
+	// This ensures we use the same chain ID that was used during signing
+	chainID := eip155ChainID
+	if aminoDoc.ChainID != "" {
+		if parsedChainID, err := parseChainID(aminoDoc.ChainID); err == nil {
+			chainID = parsedChainID
+		}
+	}
+
 	typedData, err := WrapTxToTypedData(
-		eip155ChainID,
+		chainID,
 		signDocBytes,
 	)
 	if err != nil {
@@ -176,8 +186,17 @@ func decodeProtobufSignDoc(signDocBytes []byte) (apitypes.TypedData, error) {
 		body.Memo,
 	)
 
+	// Extract the chain ID from the sign doc itself for EIP-712 domain
+	// This ensures we use the same chain ID that was used during signing
+	chainID := eip155ChainID
+	if signDoc.ChainId != "" {
+		if parsedChainID, err := parseChainID(signDoc.ChainId); err == nil {
+			chainID = parsedChainID
+		}
+	}
+
 	typedData, err := WrapTxToTypedData(
-		eip155ChainID,
+		chainID,
 		signBytes,
 	)
 	if err != nil {
@@ -227,3 +246,9 @@ func validatePayloadMessages(msgs []sdk.Msg) error {
 
 	return nil
 }
+
+// parseChainID attempts to parse the chain ID string as a uint64.
+// The chain ID in the sign doc should be the EIP-155 chain ID.
+func parseChainID(chainIDStr string) (uint64, error) {
+	return strconv.ParseUint(chainIDStr, 10, 64)
+}

wallets/usbwallet/hub.go

@@ -152,7 +152,11 @@ func (hub *Hub) refreshWallets() {
 	for _, info := range infos {
 		for _, id := range hub.productIDs {
 			// Windows and macOS use UsageID matching, Linux uses Interface matching
-			if info.ProductID == id && (info.UsagePage == hub.usageID || info.Interface == hub.endpointID) {
+			// Ledger product IDs use MMII format where MM is device model and II is interface flags.
+			// Match either exact legacy IDs (0x0001, 0x0004, etc.) or device model prefix for
+			// WebUSB/app-specific IDs (e.g., 0x4011 matches 0x4000 prefix for Nano X with Ethereum app).
+			modelMatch := id >= 0x1000 && (info.ProductID>>8 == id>>8)
+			if (info.ProductID == id || modelMatch) && (info.UsagePage == hub.usageID || info.Interface == hub.endpointID) {
 				devices = append(devices, info)
 				break
 			}