From 1a291660e50531515e5a6940e0db003e9f75a1da Mon Sep 17 00:00:00 2001 From: grdddj Date: Wed, 15 Sep 2021 10:35:31 +0200 Subject: [PATCH] chore(tests): improving consistency of ethereum fixtures --- .../tests/fixtures/ethereum/getpublickey.json | 43 +++++++ common/tests/fixtures/ethereum/sign_tx.json | 80 ++++++------ .../fixtures/ethereum/sign_tx_eip155.json | 120 +++++++++--------- .../fixtures/ethereum/sign_tx_eip1559.json | 96 +++++++------- .../tests/fixtures/ethereum/signmessage.json | 16 +-- .../device_tests/ethereum/test_getaddress.py | 4 +- .../ethereum/test_getpublickey.py | 37 ++---- .../ethereum/test_sign_verify_message.py | 8 +- tests/device_tests/ethereum/test_signtx.py | 26 ++-- tests/ui_tests/fixtures.json | 4 +- 10 files changed, 231 insertions(+), 203 deletions(-) create mode 100644 common/tests/fixtures/ethereum/getpublickey.json diff --git a/common/tests/fixtures/ethereum/getpublickey.json b/common/tests/fixtures/ethereum/getpublickey.json new file mode 100644 index 000000000..829dc56f0 --- /dev/null +++ b/common/tests/fixtures/ethereum/getpublickey.json @@ -0,0 +1,43 @@ +{ + "setup": { + "mnemonic": "alcohol woman abuse must during monitor noble actual mixed trade anger aisle", + "passphrase": "" + }, + "tests": [ + { + "parameters": { + "path": "m/44'/60'/0'" + }, + "result": { + "fingerprint": 3238854618, + "child_num": 2147483648, + "chain_code": "813d9feda6421f97a6472ff36679aa9e211ff88f6bdee51093af313ce628087e", + "public_key": "0318c22dedce01caca32354f98428e3af06a452f3fa84e6af8f1b6aa362affa641", + "xpub": "xpub6D54vV8eUYHMVBZCnz4SLjuiQngXURVCGKKGoJrWUDRegdMByLTJKfRs64q3UKiQCsSHJPtCQehTvERczdghS7gb8oedWSyNDtBU1zYDJtb" + } + }, + { + "parameters": { + "path": "m/44'/60'/0'/0" + }, + "result": { + "fingerprint": 2566851101, + "child_num": 0, + "chain_code": "ebccb5cbd84caa898472fc50a511b8653e234c3f2dd7bd4a5ec53f7073cc8c4f", + "public_key": "02d50ff29b89327b2ebce52cb751a11d074ab01394cb9e49f99ddc51da2146d212", + "xpub": "xpub6Ef8Pj4PmrkTkobADTAMrh9pejCJ3uQUBbBmCemKACT84p8SvsnkcwXb6pgeuYEseAwGkk7xuPmZt6oYnSFLrxvaBpCxjY4Jsg3zU1nuS41" + } + }, + { + "parameters": { + "path": "m/44'/60'/0'/0/0" + }, + "result": { + "fingerprint": 1762312360, + "child_num": 0, + "chain_code": "37526224b33a226749bd78e8e907e54cc46f7937362d34df7ebbfd06bc40a55c", + "public_key": "0327ceefada0c89b5ed12d163d5e3dc3b8f326321503a9bdbf6414367f3780b192", + "xpub": "xpub6GBpXvAiKQnvjHgC5qSoM3mJs4BGaRHeq8AYUf3bTyEyNx1fwhrDaX17wSwTzyjrbz2N85RLeJZqVsEJtGhsXZNJT7yMZ4mEs5T41jhg8U7" + } + } ] +} diff --git a/common/tests/fixtures/ethereum/sign_tx.json b/common/tests/fixtures/ethereum/sign_tx.json index 7161b43ec..a665e9fea 100644 --- a/common/tests/fixtures/ethereum/sign_tx.json +++ b/common/tests/fixtures/ethereum/sign_tx.json @@ -9,14 +9,14 @@ "parameters": { "comment": "Sending 200,000,000 ADT tokens to address 0x574bbb36871ba6b78e27f4b4dcfb76ea0091880b", "data": "a9059cbb000000000000000000000000574bbb36871ba6b78e27f4b4dcfb76ea0091880b000000000000000000000000000000000000000000000000000000000bebc200", - "path": "44'/60'/0'/0/0", + "path": "m/44'/60'/0'/0/0", "to_address": "0xd0d6d6c5fe4a677d343cc433536bb717bae167dd", "chain_id": 1, - "nonce": 0, - "gas_price": 20, - "gas_limit": 20, + "nonce": "0x0", + "gas_price": "0x14", + "gas_limit": "0x14", "tx_type": null, - "value": 0 + "value": "0x0" }, "result": { "sig_v": 37, @@ -29,14 +29,14 @@ "parameters": { "comment": "Sending 291 Grzegorz Brzęczyszczykiewicz tokens to address 0x574bbb36871ba6b78e27f4b4dcfb76ea0091880b", "data": "a9059cbb000000000000000000000000574bbb36871ba6b78e27f4b4dcfb76ea0091880b0000000000000000000000000000000000000000000000000000000000000123", - "path": "44'/60'/0'/0/1", + "path": "m/44'/60'/0'/0/1", "to_address": "0xfc6b5d6af8a13258f7cbd0d39e11b35e01a32f93", "chain_id": 1, - "nonce": 0, - "gas_price": 20, - "gas_limit": 20, + "nonce": "0x0", + "gas_price": "0x14", + "gas_limit": "0x14", "tx_type": null, - "value": 0 + "value": "0x0" }, "result": { "sig_v": 38, @@ -48,14 +48,14 @@ "name": "wanchain", "parameters": { "data": "", - "path": "44'/5718350'/0'/0/0", + "path": "m/44'/5718350'/0'/0/0", "to_address": "0xd0d6d6c5fe4a677d343cc433536bb717bae167dd", "chain_id": 888, - "nonce": 0, - "gas_price": 20, - "gas_limit": 20, + "nonce": "0x0", + "gas_price": "0x14", + "gas_limit": "0x14", "tx_type": 1, - "value": 100 + "value": "0x64" }, "result": { "sig_v": 1811, @@ -67,14 +67,14 @@ "name": "nodata_1", "parameters": { "data": "", - "path": "44'/60'/0'/0/100", + "path": "m/44'/60'/0'/0/100", "to_address": "0x1d1c328764a41bda0492b66baa30c4a339ff85ef", "chain_id": 1, - "nonce": 0, - "gas_price": 20, - "gas_limit": 20, + "nonce": "0x0", + "gas_price": "0x14", + "gas_limit": "0x14", "tx_type": null, - "value": 10 + "value": "0xa" }, "result": { "sig_v": 37, @@ -86,14 +86,14 @@ "name": "nodata_2_bigvalue", "parameters": { "data": "", - "path": "44'/60'/0'/0/100", + "path": "m/44'/60'/0'/0/100", "to_address": "0x1d1c328764a41bda0492b66baa30c4a339ff85ef", "chain_id": 1, - "nonce": 123456, - "gas_price": 20000, - "gas_limit": 20000, + "nonce": "0x1e240", + "gas_price": "0x4e20", + "gas_limit": "0x4e20", "tx_type": null, - "value": 12345678901234567890 + "value": "0xab54a98ceb1f0ad2" }, "result": { "sig_v": 38, @@ -105,14 +105,14 @@ "name": "data_1", "parameters": { "data": "6162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f70", - "path": "44'/60'/0'/0/0", + "path": "m/44'/60'/0'/0/0", "to_address": "0x1d1c328764a41bda0492b66baa30c4a339ff85ef", "chain_id": 1, - "nonce": 0, - "gas_price": 20, - "gas_limit": 20, + "nonce": "0x0", + "gas_price": "0x14", + "gas_limit": "0x14", "tx_type": null, - "value": 10 + "value": "0xa" }, "result": { "sig_v": 37, @@ -124,14 +124,14 @@ "name": "data_2_bigdata", "parameters": { "data": "4142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f50212121", - "path": "44'/60'/0'/0/0", + "path": "m/44'/60'/0'/0/0", "to_address": "0x1d1c328764a41bda0492b66baa30c4a339ff85ef", "chain_id": 1, - "nonce": 123456, - "gas_price": 20000, - "gas_limit": 20000, + "nonce": "0x1e240", + "gas_price": "0x4e20", + "gas_limit": "0x4e20", "tx_type": null, - "value": 12345678901234567890 + "value": "0xab54a98ceb1f0ad2" }, "result": { "sig_v": 38, @@ -143,14 +143,14 @@ "name": "newcontract", "parameters": { "data": "4142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f50212121", - "path": "44'/60'/0'/0/0", + "path": "m/44'/60'/0'/0/0", "to_address": "", "chain_id": 1, - "nonce": 123456, - "gas_price": 20000, - "gas_limit": 20000, + "nonce": "0x1e240", + "gas_price": "0x4e20", + "gas_limit": "0x4e20", "tx_type": null, - "value": 12345678901234567890 + "value": "0xab54a98ceb1f0ad2" }, "result": { "sig_v": 37, diff --git a/common/tests/fixtures/ethereum/sign_tx_eip155.json b/common/tests/fixtures/ethereum/sign_tx_eip155.json index 572cf59b3..39afb9f4c 100644 --- a/common/tests/fixtures/ethereum/sign_tx_eip155.json +++ b/common/tests/fixtures/ethereum/sign_tx_eip155.json @@ -8,11 +8,11 @@ "name": "Ethereum", "parameters": { "chain_id": 1, - "path": "44'/60'/0'/0/0", - "nonce": 0, - "gas_price": 20000000000, - "gas_limit": 21000, - "value": 10000000000, + "path": "m/44'/60'/0'/0/0", + "nonce": "0x0", + "gas_price": "0x4a817c800", + "gas_limit": "0x5208", + "value": "0x2540be400", "to_address": "0x8eA7a3fccC211ED48b763b4164884DDbcF3b0A98", "tx_type": null, "data": "" @@ -27,11 +27,11 @@ "name": "Ropsten", "parameters": { "chain_id": 3, - "path": "44'/1'/0'/0/0", - "nonce": 0, - "gas_price": 20000000000, - "gas_limit": 21000, - "value": 10000000000, + "path": "m/44'/1'/0'/0/0", + "nonce": "0x0", + "gas_price": "0x4a817c800", + "gas_limit": "0x5208", + "value": "0x2540be400", "to_address": "0x8eA7a3fccC211ED48b763b4164884DDbcF3b0A98", "tx_type": null, "data": "" @@ -46,11 +46,11 @@ "name": "Rinkeby", "parameters": { "chain_id": 4, - "path": "44'/1'/0'/0/0", - "nonce": 0, - "gas_price": 20000000000, - "gas_limit": 21000, - "value": 10000000000, + "path": "m/44'/1'/0'/0/0", + "nonce": "0x0", + "gas_price": "0x4a817c800", + "gas_limit": "0x5208", + "value": "0x2540be400", "to_address": "0x8eA7a3fccC211ED48b763b4164884DDbcF3b0A98", "tx_type": null, "data": "" @@ -65,11 +65,11 @@ "name": "ETC", "parameters": { "chain_id": 61, - "path": "44'/61'/0'/0/0", - "nonce": 0, - "gas_price": 20000000000, - "gas_limit": 21000, - "value": 10000000000, + "path": "m/44'/61'/0'/0/0", + "nonce": "0x0", + "gas_price": "0x4a817c800", + "gas_limit": "0x5208", + "value": "0x2540be400", "to_address": "0x8eA7a3fccC211ED48b763b4164884DDbcF3b0A98", "tx_type": null, "data": "" @@ -84,11 +84,11 @@ "name": "Auxilium", "parameters": { "chain_id": 28945486, - "path": "44'/344'/0'/0/0", - "nonce": 0, - "gas_price": 20000000000, - "gas_limit": 21000, - "value": 10000000000, + "path": "m/44'/344'/0'/0/0", + "nonce": "0x0", + "gas_price": "0x4a817c800", + "gas_limit": "0x5208", + "value": "0x2540be400", "to_address": "0x8eA7a3fccC211ED48b763b4164884DDbcF3b0A98", "tx_type": null, "data": "" @@ -103,11 +103,11 @@ "name": "Pirl", "parameters": { "chain_id": 3125659152, - "path": "44'/164'/0'/0/0", - "nonce": 0, - "gas_price": 20000000000, - "gas_limit": 21000, - "value": 10000000000, + "path": "m/44'/164'/0'/0/0", + "nonce": "0x0", + "gas_price": "0x4a817c800", + "gas_limit": "0x5208", + "value": "0x2540be400", "to_address": "0x8eA7a3fccC211ED48b763b4164884DDbcF3b0A98", "tx_type": null, "data": "" @@ -122,11 +122,11 @@ "name": "Unknown_chain_id_eth_path", "parameters": { "chain_id": 609112567, - "path": "44'/60'/0'/0/0", - "nonce": 0, - "gas_price": 20000000000, - "gas_limit": 21000, - "value": 10000000000, + "path": "m/44'/60'/0'/0/0", + "nonce": "0x0", + "gas_price": "0x4a817c800", + "gas_limit": "0x5208", + "value": "0x2540be400", "to_address": "0x8eA7a3fccC211ED48b763b4164884DDbcF3b0A98", "tx_type": null, "data": "" @@ -141,11 +141,11 @@ "name": "Unknown_chain_id_testnet_path", "parameters": { "chain_id": 609112567, - "path": "44'/1'/0'/0/0", - "nonce": 0, - "gas_price": 20000000000, - "gas_limit": 21000, - "value": 10000000000, + "path": "m/44'/1'/0'/0/0", + "nonce": "0x0", + "gas_price": "0x4a817c800", + "gas_limit": "0x5208", + "value": "0x2540be400", "to_address": "0x8eA7a3fccC211ED48b763b4164884DDbcF3b0A98", "tx_type": null, "data": "" @@ -160,11 +160,11 @@ "name": "Palm", "parameters": { "chain_id": 11297108109, - "path": "44'/60'/0'/0/0", - "nonce": 0, - "gas_price": 20000000000, - "gas_limit": 21000, - "value": 10000000000, + "path": "m/44'/60'/0'/0/0", + "nonce": "0x0", + "gas_price": "0x4a817c800", + "gas_limit": "0x5208", + "value": "0x2540be400", "to_address": "0x8eA7a3fccC211ED48b763b4164884DDbcF3b0A98", "tx_type": null, "data": "" @@ -179,11 +179,11 @@ "name": "max_chain_id", "parameters": { "chain_id": 2147483629, - "path": "44'/1'/0'/0/0", - "nonce": 0, - "gas_price": 20000000000, - "gas_limit": 21000, - "value": 10000000000, + "path": "m/44'/1'/0'/0/0", + "nonce": "0x0", + "gas_price": "0x4a817c800", + "gas_limit": "0x5208", + "value": "0x2540be400", "to_address": "0x8eA7a3fccC211ED48b763b4164884DDbcF3b0A98", "tx_type": null, "data": "" @@ -198,11 +198,11 @@ "name": "max_chain_plus_one", "parameters": { "chain_id": 2147483630, - "path": "44'/1'/0'/0/0", - "nonce": 0, - "gas_price": 20000000000, - "gas_limit": 21000, - "value": 10000000000, + "path": "m/44'/1'/0'/0/0", + "nonce": "0x0", + "gas_price": "0x4a817c800", + "gas_limit": "0x5208", + "value": "0x2540be400", "to_address": "0x8eA7a3fccC211ED48b763b4164884DDbcF3b0A98", "tx_type": null, "data": "" @@ -217,11 +217,11 @@ "name": "max_uint64", "parameters": { "chain_id": 18446744073709551615, - "path": "44'/1'/0'/0/0", - "nonce": 0, - "gas_price": 20000000000, - "gas_limit": 21000, - "value": 10000000000, + "path": "m/44'/1'/0'/0/0", + "nonce": "0x0", + "gas_price": "0x4a817c800", + "gas_limit": "0x5208", + "value": "0x2540be400", "to_address": "0x8eA7a3fccC211ED48b763b4164884DDbcF3b0A98", "tx_type": null, "data": "" diff --git a/common/tests/fixtures/ethereum/sign_tx_eip1559.json b/common/tests/fixtures/ethereum/sign_tx_eip1559.json index 8bb994370..dc07dfbb7 100644 --- a/common/tests/fixtures/ethereum/sign_tx_eip1559.json +++ b/common/tests/fixtures/ethereum/sign_tx_eip1559.json @@ -8,57 +8,57 @@ "name": "nodata", "parameters": { "data": "", - "path": "44'/60'/0'/0/100", + "path": "m/44'/60'/0'/0/100", "to_address": "0x1d1c328764a41bda0492b66baa30c4a339ff85ef", "chain_id": 1, - "nonce": 0, - "gas_limit": 20, - "max_gas_fee": 20, - "max_priority_fee": 1, - "value": 10 + "nonce": "0x0", + "gas_limit": "0x14", + "max_gas_fee": "0x14", + "max_priority_fee": "0x1", + "value": "0xa" }, "result": { "sig_v": 1, - "sig_r_hex": "2ceeaabc994fbce2fbd66551f9d48fc711c8db2a12e93779eeddede11e41f636", - "sig_s_hex": "2db4a9ecc73da91206f84397ae9287a399076fdc01ed7f3c6554b1c57c39bf8c" + "sig_r": "2ceeaabc994fbce2fbd66551f9d48fc711c8db2a12e93779eeddede11e41f636", + "sig_s": "2db4a9ecc73da91206f84397ae9287a399076fdc01ed7f3c6554b1c57c39bf8c" } }, { "name": "data_1", "parameters": { "data": "6162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f706162636465666768696a6b6c6d6e6f70", - "path": "44'/60'/0'/0/0", + "path": "m/44'/60'/0'/0/0", "to_address": "0x1d1c328764a41bda0492b66baa30c4a339ff85ef", "chain_id": 1, - "nonce": 0, - "gas_limit": 20, - "max_gas_fee": 20, - "max_priority_fee": 1, - "value": 10 + "nonce": "0x0", + "gas_limit": "0x14", + "max_gas_fee": "0x14", + "max_priority_fee": "0x1", + "value": "0xa" }, "result": { "sig_v": 0, - "sig_r_hex": "8e4361e40e76a7cab17e0a982724bbeaf5079cd02d50c20d431ba7dde2404ea4", - "sig_s_hex": "411930f091bb508e593e22a9ee45bd4d9eeb504ac398123aec889d5951bdebc3" + "sig_r": "8e4361e40e76a7cab17e0a982724bbeaf5079cd02d50c20d431ba7dde2404ea4", + "sig_s": "411930f091bb508e593e22a9ee45bd4d9eeb504ac398123aec889d5951bdebc3" } }, { "name": "data_2_bigdata", "parameters": { "data": "4142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f504142434445464748494a4b4c4d4e4f50212121", - "path": "44'/60'/0'/0/0", + "path": "m/44'/60'/0'/0/0", "to_address": "0x1d1c328764a41bda0492b66baa30c4a339ff85ef", "chain_id": 1, - "nonce": 123456, - "gas_limit": 20000, - "max_gas_fee": 20, - "max_priority_fee": 1, - "value": 12345678901234567890 + "nonce": "0x1e240", + "gas_limit": "0x4e20", + "max_gas_fee": "0x14", + "max_priority_fee": "0x1", + "value": "0xab54a98ceb1f0ad2" }, "result": { "sig_v": 0, - "sig_r_hex": "2e4f4c0e7c4e51270b891480060712e9d3bcab01e8ad0fadf2dfddd71504ca94", - "sig_s_hex": "2599beb32757a144dedc82b79153c21269c9939a9245342bcf35764115b62bc1" + "sig_r": "2e4f4c0e7c4e51270b891480060712e9d3bcab01e8ad0fadf2dfddd71504ca94", + "sig_s": "2599beb32757a144dedc82b79153c21269c9939a9245342bcf35764115b62bc1" } }, { @@ -66,19 +66,19 @@ "parameters": { "comment": "Sending 200,000,000 ADT tokens to address 0x574bbb36871ba6b78e27f4b4dcfb76ea0091880b", "data": "a9059cbb000000000000000000000000574bbb36871ba6b78e27f4b4dcfb76ea0091880b000000000000000000000000000000000000000000000000000000000bebc200", - "path": "44'/60'/0'/0/0", + "path": "m/44'/60'/0'/0/0", "to_address": "0xd0d6d6c5fe4a677d343cc433536bb717bae167dd", "chain_id": 1, - "nonce": 0, - "gas_limit": 20, - "max_gas_fee": 20, - "max_priority_fee": 1, - "value": 0 + "nonce": "0x0", + "gas_limit": "0x14", + "max_gas_fee": "0x14", + "max_priority_fee": "0x1", + "value": "0x0" }, "result": { "sig_v": 1, - "sig_r_hex": "94d67bacb7966f881339d91103f5d738d9c491fff4c01a6513c554ab15e86cc0", - "sig_s_hex": "405bd19a7bf4ae62d41fcb7844e36c786b106b456185c3d0877a7ce7eab6c751" + "sig_r": "94d67bacb7966f881339d91103f5d738d9c491fff4c01a6513c554ab15e86cc0", + "sig_s": "405bd19a7bf4ae62d41fcb7844e36c786b106b456185c3d0877a7ce7eab6c751" } }, { @@ -86,19 +86,19 @@ "parameters": { "comment": "Sending 291 Grzegorz Brzęczyszczykiewicz tokens to address 0x574bbb36871ba6b78e27f4b4dcfb76ea0091880b", "data": "a9059cbb000000000000000000000000574bbb36871ba6b78e27f4b4dcfb76ea0091880b0000000000000000000000000000000000000000000000000000000000000123", - "path": "44'/60'/0'/0/1", + "path": "m/44'/60'/0'/0/1", "to_address": "0xfc6b5d6af8a13258f7cbd0d39e11b35e01a32f93", "chain_id": 1, - "nonce": 0, - "gas_limit": 20, - "max_gas_fee": 20, - "max_priority_fee": 1, - "value": 0 + "nonce": "0x0", + "gas_limit": "0x14", + "max_gas_fee": "0x14", + "max_priority_fee": "0x1", + "value": "0x0" }, "result": { "sig_v": 1, - "sig_r_hex": "e631b56bcc596844cb8686b2046e36cf33634aa396e7e1ea94a97aac02c18bda", - "sig_s_hex": "399bff8752539176c4b2f1d5d2a8f6029f79841d28802149ab339a033ffe4c1f" + "sig_r": "e631b56bcc596844cb8686b2046e36cf33634aa396e7e1ea94a97aac02c18bda", + "sig_s": "399bff8752539176c4b2f1d5d2a8f6029f79841d28802149ab339a033ffe4c1f" } }, { @@ -106,19 +106,19 @@ "parameters": { "comment": "Pirl chain id, doesn't support EIP1559 at this time, but chosen for large chain id", "data": "", - "path": "44'/60'/0'/0/100", + "path": "m/44'/60'/0'/0/100", "to_address": "0x1d1c328764a41bda0492b66baa30c4a339ff85ef", "chain_id": 3125659152, - "nonce": 0, - "gas_limit": 20, - "max_gas_fee": 20, - "max_priority_fee": 1, - "value": 10 + "nonce": "0x0", + "gas_limit": "0x14", + "max_gas_fee": "0x14", + "max_priority_fee": "0x1", + "value": "0xa" }, "result": { "sig_v": 0, - "sig_r_hex": "07f8c967227c5a190cb90525c3387691a426fe61f8e0503274280724060ea95c", - "sig_s_hex": "0bf83eaf74e24aa9146b23e06f9edec6e25acb81d3830e8d146b9e7b6923ad1e" + "sig_r": "07f8c967227c5a190cb90525c3387691a426fe61f8e0503274280724060ea95c", + "sig_s": "0bf83eaf74e24aa9146b23e06f9edec6e25acb81d3830e8d146b9e7b6923ad1e" } } ] diff --git a/common/tests/fixtures/ethereum/signmessage.json b/common/tests/fixtures/ethereum/signmessage.json index 616083959..41f6df679 100644 --- a/common/tests/fixtures/ethereum/signmessage.json +++ b/common/tests/fixtures/ethereum/signmessage.json @@ -7,7 +7,7 @@ { "parameters": { "msg": "This is an example of a signed message.", - "path": "44'/60'/0'/0/0" + "path": "m/44'/60'/0'/0/0" }, "result": { "address": "0x73d0385F4d8E00C5e6504C6030F47BF6212736A8", @@ -17,7 +17,7 @@ { "parameters": { "msg": "VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!VeryLongMessage!", - "path": "44'/60'/0'/0/0" + "path": "m/44'/60'/0'/0/0" }, "result": { "address": "0x73d0385F4d8E00C5e6504C6030F47BF6212736A8", @@ -27,7 +27,7 @@ { "parameters": { "msg": "MsgLenIs9", - "path": "44'/60'/0'/0/0" + "path": "m/44'/60'/0'/0/0" }, "result": { "address": "0x73d0385F4d8E00C5e6504C6030F47BF6212736A8", @@ -37,7 +37,7 @@ { "parameters": { "msg": "MsgLenIs10", - "path": "44'/60'/0'/0/0" + "path": "m/44'/60'/0'/0/0" }, "result": { "address": "0x73d0385F4d8E00C5e6504C6030F47BF6212736A8", @@ -47,7 +47,7 @@ { "parameters": { "msg": "MsgLenIs11!", - "path": "44'/60'/0'/0/0" + "path": "m/44'/60'/0'/0/0" }, "result": { "address": "0x73d0385F4d8E00C5e6504C6030F47BF6212736A8", @@ -57,7 +57,7 @@ { "parameters": { "msg": "This message has length 99!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", - "path": "44'/60'/0'/0/0" + "path": "m/44'/60'/0'/0/0" }, "result": { "address": "0x73d0385F4d8E00C5e6504C6030F47BF6212736A8", @@ -67,7 +67,7 @@ { "parameters": { "msg": "This message has length 100!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", - "path": "44'/60'/0'/0/0" + "path": "m/44'/60'/0'/0/0" }, "result": { "address": "0x73d0385F4d8E00C5e6504C6030F47BF6212736A8", @@ -77,7 +77,7 @@ { "parameters": { "msg": "This message has length 101!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!", - "path": "44'/60'/0'/0/0" + "path": "m/44'/60'/0'/0/0" }, "result": { "address": "0x73d0385F4d8E00C5e6504C6030F47BF6212736A8", diff --git a/tests/device_tests/ethereum/test_getaddress.py b/tests/device_tests/ethereum/test_getaddress.py index 787701621..255af0b27 100644 --- a/tests/device_tests/ethereum/test_getaddress.py +++ b/tests/device_tests/ethereum/test_getaddress.py @@ -24,9 +24,7 @@ from ...common import parametrize_using_common_fixtures pytestmark = [pytest.mark.altcoin, pytest.mark.ethereum] -@parametrize_using_common_fixtures( - "ethereum/getaddress.json", -) +@parametrize_using_common_fixtures("ethereum/getaddress.json") def test_getaddress(client, parameters, result): address_n = parse_path(parameters["path"]) assert ethereum.get_address(client, address_n) == result["address"] diff --git a/tests/device_tests/ethereum/test_getpublickey.py b/tests/device_tests/ethereum/test_getpublickey.py index 9a5f20e8b..000ace9ab 100644 --- a/tests/device_tests/ethereum/test_getpublickey.py +++ b/tests/device_tests/ethereum/test_getpublickey.py @@ -17,29 +17,20 @@ import pytest from trezorlib import ethereum -from trezorlib.tools import H_ +from trezorlib.tools import parse_path -from ...common import MNEMONIC12 +from ...common import parametrize_using_common_fixtures +pytestmark = [pytest.mark.altcoin, pytest.mark.ethereum] -@pytest.mark.altcoin -@pytest.mark.ethereum -class TestMsgEthereumGetPublicKey: - @pytest.mark.setup_client(mnemonic=MNEMONIC12) - def test_ethereum_getpublickey(self, client): - res = ethereum.get_public_node(client, [H_(44), H_(60), H_(0)]) - assert res.node.depth == 3 - assert res.node.fingerprint == 0xC10CFFDA - assert res.node.child_num == 0x80000000 - assert ( - res.node.chain_code.hex() - == "813d9feda6421f97a6472ff36679aa9e211ff88f6bdee51093af313ce628087e" - ) - assert ( - res.node.public_key.hex() - == "0318c22dedce01caca32354f98428e3af06a452f3fa84e6af8f1b6aa362affa641" - ) - assert ( - res.xpub - == "xpub6D54vV8eUYHMVBZCnz4SLjuiQngXURVCGKKGoJrWUDRegdMByLTJKfRs64q3UKiQCsSHJPtCQehTvERczdghS7gb8oedWSyNDtBU1zYDJtb" - ) + +@parametrize_using_common_fixtures("ethereum/getpublickey.json") +def test_ethereum_getpublickey(client, parameters, result): + path = parse_path(parameters["path"]) + res = ethereum.get_public_node(client, path) + assert res.node.depth == len(path) + assert res.node.fingerprint == result["fingerprint"] + assert res.node.child_num == result["child_num"] + assert res.node.chain_code.hex() == result["chain_code"] + assert res.node.public_key.hex() == result["public_key"] + assert res.xpub == result["xpub"] diff --git a/tests/device_tests/ethereum/test_sign_verify_message.py b/tests/device_tests/ethereum/test_sign_verify_message.py index e0d8633b2..9463412df 100644 --- a/tests/device_tests/ethereum/test_sign_verify_message.py +++ b/tests/device_tests/ethereum/test_sign_verify_message.py @@ -24,9 +24,7 @@ from ...common import parametrize_using_common_fixtures pytestmark = [pytest.mark.altcoin, pytest.mark.ethereum] -@parametrize_using_common_fixtures( - "ethereum/signmessage.json", -) +@parametrize_using_common_fixtures("ethereum/signmessage.json") def test_signmessage(client, parameters, result): res = ethereum.sign_message( client, parse_path(parameters["path"]), parameters["msg"] @@ -35,9 +33,7 @@ def test_signmessage(client, parameters, result): assert res.signature.hex() == result["sig"] -@parametrize_using_common_fixtures( - "ethereum/verifymessage.json", -) +@parametrize_using_common_fixtures("ethereum/verifymessage.json") def test_verify(client, parameters, result): res = ethereum.verify_message( client, diff --git a/tests/device_tests/ethereum/test_signtx.py b/tests/device_tests/ethereum/test_signtx.py index 4ec4965e7..68973f443 100644 --- a/tests/device_tests/ethereum/test_signtx.py +++ b/tests/device_tests/ethereum/test_signtx.py @@ -37,12 +37,12 @@ def test_signtx(client, parameters, result): sig_v, sig_r, sig_s = ethereum.sign_tx( client, n=parse_path(parameters["path"]), - nonce=parameters["nonce"], - gas_price=parameters["gas_price"], - gas_limit=parameters["gas_limit"], + nonce=int(parameters["nonce"], 16), + gas_price=int(parameters["gas_price"], 16), + gas_limit=int(parameters["gas_limit"], 16), to=parameters["to_address"], chain_id=parameters["chain_id"], - value=parameters["value"], + value=int(parameters["value"], 16), tx_type=parameters["tx_type"], data=bytes.fromhex(parameters["data"]), ) @@ -54,27 +54,25 @@ def test_signtx(client, parameters, result): assert sig_v == result["sig_v"] -@parametrize_using_common_fixtures( - "ethereum/sign_tx_eip1559.json", -) +@parametrize_using_common_fixtures("ethereum/sign_tx_eip1559.json") @pytest.mark.skip_t1 def test_signtx_eip1559(client, parameters, result): with client: sig_v, sig_r, sig_s = ethereum.sign_tx_eip1559( client, n=parse_path(parameters["path"]), - nonce=parameters["nonce"], - gas_limit=parameters["gas_limit"], - max_gas_fee=parameters["max_gas_fee"], - max_priority_fee=parameters["max_priority_fee"], + nonce=int(parameters["nonce"], 16), + gas_limit=int(parameters["gas_limit"], 16), + max_gas_fee=int(parameters["max_gas_fee"], 16), + max_priority_fee=int(parameters["max_priority_fee"], 16), to=parameters["to_address"], chain_id=parameters["chain_id"], - value=parameters["value"], + value=int(parameters["value"], 16), data=bytes.fromhex(parameters["data"]), ) - assert sig_r.hex() == result["sig_r_hex"] - assert sig_s.hex() == result["sig_s_hex"] + assert sig_r.hex() == result["sig_r"] + assert sig_s.hex() == result["sig_s"] assert sig_v == result["sig_v"] diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json index 9b83e5583..891afdce7 100644 --- a/tests/ui_tests/fixtures.json +++ b/tests/ui_tests/fixtures.json @@ -123,7 +123,9 @@ "ethereum-test_getaddress.py::test_getaddress[parameters1-result1]": "095af81ec79e9b510c90d9fa34fed343f3840807190c67bc237af885695ae687", "ethereum-test_getaddress.py::test_getaddress[parameters2-result2]": "095af81ec79e9b510c90d9fa34fed343f3840807190c67bc237af885695ae687", "ethereum-test_getaddress.py::test_getaddress[parameters3-result3]": "095af81ec79e9b510c90d9fa34fed343f3840807190c67bc237af885695ae687", -"ethereum-test_getpublickey.py-test_ethereum_getpublickey": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", +"ethereum-test_getpublickey.py::test_ethereum_getpublickey[parameters0-result0]": "095af81ec79e9b510c90d9fa34fed343f3840807190c67bc237af885695ae687", +"ethereum-test_getpublickey.py::test_ethereum_getpublickey[parameters1-result1]": "095af81ec79e9b510c90d9fa34fed343f3840807190c67bc237af885695ae687", +"ethereum-test_getpublickey.py::test_ethereum_getpublickey[parameters2-result2]": "095af81ec79e9b510c90d9fa34fed343f3840807190c67bc237af885695ae687", "ethereum-test_sign_verify_message.py::test_signmessage[parameters0-result0]": "9e2383084cfa23440e7ff9cf95029c73b851f5732de0cb4fb5e89a0ee024fbed", "ethereum-test_sign_verify_message.py::test_signmessage[parameters1-result1]": "bd669f3ddc72582d3af7aa2e9757e68008690b78533f40eafacf0d071734c108", "ethereum-test_sign_verify_message.py::test_signmessage[parameters2-result2]": "6ccc6102d1289bce13e28ec2207c96abe4aa1ac0810a13181a874070e7bcf8f3",