diff --git a/common/tests/fixtures/ethereum/sign_tx.json b/common/tests/fixtures/ethereum/sign_tx.json index 589e1a07a3..a1d053b33f 100644 --- a/common/tests/fixtures/ethereum/sign_tx.json +++ b/common/tests/fixtures/ethereum/sign_tx.json @@ -174,8 +174,7 @@ "sig_v": 1120132, "sig_r": "6f8af79a48a022476b2837d2155f82cf9b93da7464b20a54b16c4d9760f8511a", "sig_s": "77ebd93a6795947c4e273edd6620d085443c4744feca908b39ddb41ffcc3f150" - }, - "skip_models": ["t1"] + } }, { "name": "Hoodi Testnet, mainnet path", @@ -194,8 +193,7 @@ "sig_v": 1120131, "sig_r": "7b6895910a73fcd71fbd4451304670fa1477b430552de35c746f140c9c8f5d77", "sig_s": "7365f33b29cbfbec637982b4e3967c3d70c8aa29d36d67f52109dcd6fc162562" - }, - "skip_models": ["t1"] + } } ] } diff --git a/legacy/firmware/.changelog.d/5134.changed b/legacy/firmware/.changelog.d/5134.changed new file mode 100644 index 0000000000..8f8bc88b06 --- /dev/null +++ b/legacy/firmware/.changelog.d/5134.changed @@ -0,0 +1 @@ +Allow using Ethereum mainnet addresses on all non-Ethereum networks. This enables access to networks like Hyperliquid that use conflicting chain IDs and cannot obtain official SLIP-44 registration. diff --git a/legacy/firmware/ethereum.c b/legacy/firmware/ethereum.c index 57d4d70925..865797ac53 100644 --- a/legacy/firmware/ethereum.c +++ b/legacy/firmware/ethereum.c @@ -1210,11 +1210,12 @@ static bool check_ethereum_slip44_unhardened( if (is_unknown_network(network)) { // Allow Ethereum or testnet paths for unknown networks. return slip44 == 60 || slip44 == 1; - } else if (network->slip44 != 60 && network->slip44 != 1) { - // Allow cross-signing with Ethereum unless it's testnet. + } else if (network->slip44 != 60) { + // Allow cross-signing with Ethereum for all non-mainnet networks. return (slip44 == network->slip44 || slip44 == 60); } else { - return (slip44 == network->slip44); + // Allow slip44 = 1 for legacy testnets + return (slip44 == network->slip44 || slip44 == 1); } } diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json index 6580f1d4bc..200c6cb964 100644 --- a/tests/ui_tests/fixtures.json +++ b/tests/ui_tests/fixtures.json @@ -498,6 +498,8 @@ "T1B1_en_ethereum-test_signtx.py::test_signtx[False-Auxilium]": "7df4e4dcd5fd6f56f8674ce67df9c872279f5683191a5a002d2c4a7929e6d0be", "T1B1_en_ethereum-test_signtx.py::test_signtx[False-ETC]": "25411ebe2889749dc752a7e6dd9fb9a7dfb9ed2c1842dbf24e43e46962283a3b", "T1B1_en_ethereum-test_signtx.py::test_signtx[False-Ethereum]": "5cad96852f605a022d8b7dd3c1e6aa3c49c43b1d715249bec1bd324d3ea00f18", +"T1B1_en_ethereum-test_signtx.py::test_signtx[False-Hoodi Testnet, mainnet path]": "932413226fc9c7cd2e42a14753c985d858f6cc1123e2cbe45e2523a9330f2626", +"T1B1_en_ethereum-test_signtx.py::test_signtx[False-Hoodi Testnet, testnet path]": "932413226fc9c7cd2e42a14753c985d858f6cc1123e2cbe45e2523a9330f2626", "T1B1_en_ethereum-test_signtx.py::test_signtx[False-Ledger Live legacy path0]": "932413226fc9c7cd2e42a14753c985d858f6cc1123e2cbe45e2523a9330f2626", "T1B1_en_ethereum-test_signtx.py::test_signtx[False-Ledger Live legacy path1]": "5cad96852f605a022d8b7dd3c1e6aa3c49c43b1d715249bec1bd324d3ea00f18", "T1B1_en_ethereum-test_signtx.py::test_signtx[False-Palm]": "7df4e4dcd5fd6f56f8674ce67df9c872279f5683191a5a002d2c4a7929e6d0be", @@ -517,6 +519,8 @@ "T1B1_en_ethereum-test_signtx.py::test_signtx[True-Auxilium]": "7df4e4dcd5fd6f56f8674ce67df9c872279f5683191a5a002d2c4a7929e6d0be", "T1B1_en_ethereum-test_signtx.py::test_signtx[True-ETC]": "25411ebe2889749dc752a7e6dd9fb9a7dfb9ed2c1842dbf24e43e46962283a3b", "T1B1_en_ethereum-test_signtx.py::test_signtx[True-Ethereum]": "5cad96852f605a022d8b7dd3c1e6aa3c49c43b1d715249bec1bd324d3ea00f18", +"T1B1_en_ethereum-test_signtx.py::test_signtx[True-Hoodi Testnet, mainnet path]": "932413226fc9c7cd2e42a14753c985d858f6cc1123e2cbe45e2523a9330f2626", +"T1B1_en_ethereum-test_signtx.py::test_signtx[True-Hoodi Testnet, testnet path]": "932413226fc9c7cd2e42a14753c985d858f6cc1123e2cbe45e2523a9330f2626", "T1B1_en_ethereum-test_signtx.py::test_signtx[True-Ledger Live legacy path0]": "932413226fc9c7cd2e42a14753c985d858f6cc1123e2cbe45e2523a9330f2626", "T1B1_en_ethereum-test_signtx.py::test_signtx[True-Ledger Live legacy path1]": "5cad96852f605a022d8b7dd3c1e6aa3c49c43b1d715249bec1bd324d3ea00f18", "T1B1_en_ethereum-test_signtx.py::test_signtx[True-Palm]": "7df4e4dcd5fd6f56f8674ce67df9c872279f5683191a5a002d2c4a7929e6d0be",