diff --git a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00000.png b/tests/ragger/snapshots/nanos/test_legacy_chainid1/00000.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_112233445566_network/00000.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid1/00000.png diff --git a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00001.png b/tests/ragger/snapshots/nanos/test_legacy_chainid1/00001.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_112233445566_network/00001.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid1/00001.png diff --git a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00002.png b/tests/ragger/snapshots/nanos/test_legacy_chainid1/00002.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_112233445566_network/00002.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid1/00002.png diff --git a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00003.png b/tests/ragger/snapshots/nanos/test_legacy_chainid1/00003.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_112233445566_network/00003.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid1/00003.png diff --git a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00004.png b/tests/ragger/snapshots/nanos/test_legacy_chainid1/00004.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_112233445566_network/00004.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid1/00004.png diff --git a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00005.png b/tests/ragger/snapshots/nanos/test_legacy_chainid1/00005.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_112233445566_network/00005.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid1/00005.png diff --git a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00006.png b/tests/ragger/snapshots/nanos/test_legacy_chainid1/00006.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_112233445566_network/00006.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid1/00006.png diff --git a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00007.png b/tests/ragger/snapshots/nanos/test_legacy_chainid1/00007.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_112233445566_network/00007.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid1/00007.png diff --git a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00008.png b/tests/ragger/snapshots/nanos/test_legacy_chainid1/00008.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_112233445566_network/00008.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid1/00008.png diff --git a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00009.png b/tests/ragger/snapshots/nanos/test_legacy_chainid1/00009.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_112233445566_network/00009.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid1/00009.png diff --git a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00012.png b/tests/ragger/snapshots/nanos/test_legacy_chainid1/00010.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_112233445566_network/00012.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid1/00010.png diff --git a/tests/zemu/snapshots/nanos_transfer_palm_network/00000.png b/tests/ragger/snapshots/nanos/test_legacy_chainid2/00000.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_palm_network/00000.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid2/00000.png diff --git a/tests/zemu/snapshots/nanos_transfer_palm_network/00001.png b/tests/ragger/snapshots/nanos/test_legacy_chainid2/00001.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_palm_network/00001.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid2/00001.png diff --git a/tests/zemu/snapshots/nanos_transfer_palm_network/00002.png b/tests/ragger/snapshots/nanos/test_legacy_chainid2/00002.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_palm_network/00002.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid2/00002.png diff --git a/tests/zemu/snapshots/nanos_transfer_palm_network/00003.png b/tests/ragger/snapshots/nanos/test_legacy_chainid2/00003.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_palm_network/00003.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid2/00003.png diff --git a/tests/zemu/snapshots/nanos_transfer_palm_network/00004.png b/tests/ragger/snapshots/nanos/test_legacy_chainid2/00004.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_palm_network/00004.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid2/00004.png diff --git a/tests/zemu/snapshots/nanos_transfer_palm_network/00005.png b/tests/ragger/snapshots/nanos/test_legacy_chainid2/00005.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_palm_network/00005.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid2/00005.png diff --git a/tests/zemu/snapshots/nanos_transfer_palm_network/00006.png b/tests/ragger/snapshots/nanos/test_legacy_chainid2/00006.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_palm_network/00006.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid2/00006.png diff --git a/tests/zemu/snapshots/nanos_transfer_palm_network/00007.png b/tests/ragger/snapshots/nanos/test_legacy_chainid2/00007.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_palm_network/00007.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid2/00007.png diff --git a/tests/zemu/snapshots/nanos_transfer_palm_network/00008.png b/tests/ragger/snapshots/nanos/test_legacy_chainid2/00008.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_palm_network/00008.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid2/00008.png diff --git a/tests/zemu/snapshots/nanos_transfer_palm_network/00009.png b/tests/ragger/snapshots/nanos/test_legacy_chainid2/00009.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_palm_network/00009.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid2/00009.png diff --git a/tests/zemu/snapshots/nanos_transfer_palm_network/00012.png b/tests/ragger/snapshots/nanos/test_legacy_chainid2/00010.png similarity index 100% rename from tests/zemu/snapshots/nanos_transfer_palm_network/00012.png rename to tests/ragger/snapshots/nanos/test_legacy_chainid2/00010.png diff --git a/tests/ragger/snapshots/nanosp/test_legacy_chainid1 b/tests/ragger/snapshots/nanosp/test_legacy_chainid1 new file mode 120000 index 0000000..39f93b0 --- /dev/null +++ b/tests/ragger/snapshots/nanosp/test_legacy_chainid1 @@ -0,0 +1 @@ +../nanox/test_legacy_chainid1 \ No newline at end of file diff --git a/tests/ragger/snapshots/nanosp/test_legacy_chainid2 b/tests/ragger/snapshots/nanosp/test_legacy_chainid2 new file mode 120000 index 0000000..c7a3a54 --- /dev/null +++ b/tests/ragger/snapshots/nanosp/test_legacy_chainid2 @@ -0,0 +1 @@ +../nanox/test_legacy_chainid2 \ No newline at end of file diff --git a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00000.png b/tests/ragger/snapshots/nanox/test_legacy_chainid1/00000.png similarity index 100% rename from tests/zemu/snapshots/nanox_transfer_112233445566_network/00000.png rename to tests/ragger/snapshots/nanox/test_legacy_chainid1/00000.png diff --git a/tests/ragger/snapshots/nanox/test_legacy_chainid1/00001.png b/tests/ragger/snapshots/nanox/test_legacy_chainid1/00001.png new file mode 100644 index 0000000..aee153e Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_legacy_chainid1/00001.png differ diff --git a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00002.png b/tests/ragger/snapshots/nanox/test_legacy_chainid1/00002.png similarity index 100% rename from tests/zemu/snapshots/nanox_transfer_112233445566_network/00002.png rename to tests/ragger/snapshots/nanox/test_legacy_chainid1/00002.png diff --git a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00003.png b/tests/ragger/snapshots/nanox/test_legacy_chainid1/00003.png similarity index 100% rename from tests/zemu/snapshots/nanox_transfer_112233445566_network/00003.png rename to tests/ragger/snapshots/nanox/test_legacy_chainid1/00003.png diff --git a/tests/ragger/snapshots/nanox/test_legacy_chainid1/00004.png b/tests/ragger/snapshots/nanox/test_legacy_chainid1/00004.png new file mode 100644 index 0000000..c2a8d90 Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_legacy_chainid1/00004.png differ diff --git a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00005.png b/tests/ragger/snapshots/nanox/test_legacy_chainid1/00005.png similarity index 100% rename from tests/zemu/snapshots/nanox_transfer_112233445566_network/00005.png rename to tests/ragger/snapshots/nanox/test_legacy_chainid1/00005.png diff --git a/tests/ragger/snapshots/nanox/test_legacy_chainid1/00006.png b/tests/ragger/snapshots/nanox/test_legacy_chainid1/00006.png new file mode 100644 index 0000000..6578872 Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_legacy_chainid1/00006.png differ diff --git a/tests/zemu/snapshots/nanox_transfer_palm_network/00000.png b/tests/ragger/snapshots/nanox/test_legacy_chainid2/00000.png similarity index 100% rename from tests/zemu/snapshots/nanox_transfer_palm_network/00000.png rename to tests/ragger/snapshots/nanox/test_legacy_chainid2/00000.png diff --git a/tests/zemu/snapshots/nanox_transfer_palm_network/00001.png b/tests/ragger/snapshots/nanox/test_legacy_chainid2/00001.png similarity index 100% rename from tests/zemu/snapshots/nanox_transfer_palm_network/00001.png rename to tests/ragger/snapshots/nanox/test_legacy_chainid2/00001.png diff --git a/tests/zemu/snapshots/nanox_transfer_palm_network/00002.png b/tests/ragger/snapshots/nanox/test_legacy_chainid2/00002.png similarity index 100% rename from tests/zemu/snapshots/nanox_transfer_palm_network/00002.png rename to tests/ragger/snapshots/nanox/test_legacy_chainid2/00002.png diff --git a/tests/zemu/snapshots/nanox_transfer_palm_network/00003.png b/tests/ragger/snapshots/nanox/test_legacy_chainid2/00003.png similarity index 100% rename from tests/zemu/snapshots/nanox_transfer_palm_network/00003.png rename to tests/ragger/snapshots/nanox/test_legacy_chainid2/00003.png diff --git a/tests/ragger/snapshots/nanox/test_legacy_chainid2/00004.png b/tests/ragger/snapshots/nanox/test_legacy_chainid2/00004.png new file mode 100644 index 0000000..7c87ee5 Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_legacy_chainid2/00004.png differ diff --git a/tests/zemu/snapshots/nanox_transfer_palm_network/00005.png b/tests/ragger/snapshots/nanox/test_legacy_chainid2/00005.png similarity index 100% rename from tests/zemu/snapshots/nanox_transfer_palm_network/00005.png rename to tests/ragger/snapshots/nanox/test_legacy_chainid2/00005.png diff --git a/tests/ragger/snapshots/nanox/test_legacy_chainid2/00006.png b/tests/ragger/snapshots/nanox/test_legacy_chainid2/00006.png new file mode 100644 index 0000000..6578872 Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_legacy_chainid2/00006.png differ diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid1/00000.png b/tests/ragger/snapshots/stax/test_legacy_chainid1/00000.png new file mode 100644 index 0000000..74fa840 Binary files /dev/null and b/tests/ragger/snapshots/stax/test_legacy_chainid1/00000.png differ diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid1/00001.png b/tests/ragger/snapshots/stax/test_legacy_chainid1/00001.png new file mode 100644 index 0000000..1b4442f Binary files /dev/null and b/tests/ragger/snapshots/stax/test_legacy_chainid1/00001.png differ diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid1/00002.png b/tests/ragger/snapshots/stax/test_legacy_chainid1/00002.png new file mode 100644 index 0000000..930dba7 Binary files /dev/null and b/tests/ragger/snapshots/stax/test_legacy_chainid1/00002.png differ diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid1/00003.png b/tests/ragger/snapshots/stax/test_legacy_chainid1/00003.png new file mode 100644 index 0000000..aed7d33 Binary files /dev/null and b/tests/ragger/snapshots/stax/test_legacy_chainid1/00003.png differ diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid1/00004.png b/tests/ragger/snapshots/stax/test_legacy_chainid1/00004.png new file mode 100644 index 0000000..a21279c Binary files /dev/null and b/tests/ragger/snapshots/stax/test_legacy_chainid1/00004.png differ diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid2/00000.png b/tests/ragger/snapshots/stax/test_legacy_chainid2/00000.png new file mode 100644 index 0000000..74fa840 Binary files /dev/null and b/tests/ragger/snapshots/stax/test_legacy_chainid2/00000.png differ diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid2/00001.png b/tests/ragger/snapshots/stax/test_legacy_chainid2/00001.png new file mode 100644 index 0000000..fe9d411 Binary files /dev/null and b/tests/ragger/snapshots/stax/test_legacy_chainid2/00001.png differ diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid2/00002.png b/tests/ragger/snapshots/stax/test_legacy_chainid2/00002.png new file mode 100644 index 0000000..3f80170 Binary files /dev/null and b/tests/ragger/snapshots/stax/test_legacy_chainid2/00002.png differ diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid2/00003.png b/tests/ragger/snapshots/stax/test_legacy_chainid2/00003.png new file mode 100644 index 0000000..aed7d33 Binary files /dev/null and b/tests/ragger/snapshots/stax/test_legacy_chainid2/00003.png differ diff --git a/tests/ragger/snapshots/stax/test_legacy_chainid2/00004.png b/tests/ragger/snapshots/stax/test_legacy_chainid2/00004.png new file mode 100644 index 0000000..a21279c Binary files /dev/null and b/tests/ragger/snapshots/stax/test_legacy_chainid2/00004.png differ diff --git a/tests/ragger/test_sign.py b/tests/ragger/test_sign.py index 2f098c3..bb081e8 100644 --- a/tests/ragger/test_sign.py +++ b/tests/ragger/test_sign.py @@ -169,6 +169,37 @@ def test_legacy_send_bsc(firmware: Firmware, common(firmware, backend, navigator, tx_params, test_name, BIP32_PATH2) +# Legacy Zemu ChainId: Transfer on network 112233445566 on Ethereum +def test_legacy_chainid1(firmware: Firmware, + backend: BackendInterface, + navigator: Navigator, + test_name: str): + tx_params: dict = { + "nonce": NONCE2, + "gasPrice": Web3.to_wei(GAS_PRICE, 'gwei'), + "gas": GAS_LIMIT, + "to": ADDR2, + "value": 31415926913374232, + "chainId": 112233445566 + } + common(firmware, backend, navigator, tx_params, test_name, BIP32_PATH2) + + +# Legacy Zemu ChainId: Transfer on palm network on Ethereum +def test_legacy_chainid2(firmware: Firmware, + backend: BackendInterface, + navigator: Navigator, + test_name: str): + tx_params: dict = { + "nonce": NONCE2, + "gasPrice": Web3.to_wei(GAS_PRICE, 'gwei'), + "gas": GAS_LIMIT, + "to": ADDR2, + "value": 31415926913374232, + "chainId": 11297108109 + } + common(firmware, backend, navigator, tx_params, test_name, BIP32_PATH2) + def test_1559(firmware: Firmware, backend: BackendInterface, navigator: Navigator): tx_params: dict = { diff --git a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00010.png b/tests/zemu/snapshots/nanos_transfer_112233445566_network/00010.png deleted file mode 100644 index 9c7e704..0000000 Binary files a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00010.png and /dev/null differ diff --git a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00011.png b/tests/zemu/snapshots/nanos_transfer_112233445566_network/00011.png deleted file mode 100644 index 1c9156c..0000000 Binary files a/tests/zemu/snapshots/nanos_transfer_112233445566_network/00011.png and /dev/null differ diff --git a/tests/zemu/snapshots/nanos_transfer_palm_network/00010.png b/tests/zemu/snapshots/nanos_transfer_palm_network/00010.png deleted file mode 100644 index 9c7e704..0000000 Binary files a/tests/zemu/snapshots/nanos_transfer_palm_network/00010.png and /dev/null differ diff --git a/tests/zemu/snapshots/nanos_transfer_palm_network/00011.png b/tests/zemu/snapshots/nanos_transfer_palm_network/00011.png deleted file mode 120000 index 489390a..0000000 --- a/tests/zemu/snapshots/nanos_transfer_palm_network/00011.png +++ /dev/null @@ -1 +0,0 @@ -00009.png \ No newline at end of file diff --git a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00001.png b/tests/zemu/snapshots/nanox_transfer_112233445566_network/00001.png deleted file mode 100644 index 0976a31..0000000 Binary files a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00001.png and /dev/null differ diff --git a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00004.png b/tests/zemu/snapshots/nanox_transfer_112233445566_network/00004.png deleted file mode 100644 index 70c1b9a..0000000 Binary files a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00004.png and /dev/null differ diff --git a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00006.png b/tests/zemu/snapshots/nanox_transfer_112233445566_network/00006.png deleted file mode 100644 index c922246..0000000 Binary files a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00006.png and /dev/null differ diff --git a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00007.png b/tests/zemu/snapshots/nanox_transfer_112233445566_network/00007.png deleted file mode 120000 index 7159a12..0000000 --- a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00007.png +++ /dev/null @@ -1 +0,0 @@ -00005.png \ No newline at end of file diff --git a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00008.png b/tests/zemu/snapshots/nanox_transfer_112233445566_network/00008.png deleted file mode 100644 index a58590b..0000000 Binary files a/tests/zemu/snapshots/nanox_transfer_112233445566_network/00008.png and /dev/null differ diff --git a/tests/zemu/snapshots/nanox_transfer_palm_network/00004.png b/tests/zemu/snapshots/nanox_transfer_palm_network/00004.png deleted file mode 100644 index 0c1fa4c..0000000 Binary files a/tests/zemu/snapshots/nanox_transfer_palm_network/00004.png and /dev/null differ diff --git a/tests/zemu/snapshots/nanox_transfer_palm_network/00006.png b/tests/zemu/snapshots/nanox_transfer_palm_network/00006.png deleted file mode 100644 index c922246..0000000 Binary files a/tests/zemu/snapshots/nanox_transfer_palm_network/00006.png and /dev/null differ diff --git a/tests/zemu/snapshots/nanox_transfer_palm_network/00007.png b/tests/zemu/snapshots/nanox_transfer_palm_network/00007.png deleted file mode 120000 index 7159a12..0000000 --- a/tests/zemu/snapshots/nanox_transfer_palm_network/00007.png +++ /dev/null @@ -1 +0,0 @@ -00005.png \ No newline at end of file diff --git a/tests/zemu/snapshots/nanox_transfer_palm_network/00008.png b/tests/zemu/snapshots/nanox_transfer_palm_network/00008.png deleted file mode 100644 index a58590b..0000000 Binary files a/tests/zemu/snapshots/nanox_transfer_palm_network/00008.png and /dev/null differ diff --git a/tests/zemu/src/chainid.test.js b/tests/zemu/src/chainid.test.js deleted file mode 100644 index 668b196..0000000 --- a/tests/zemu/src/chainid.test.js +++ /dev/null @@ -1,47 +0,0 @@ -import "core-js/stable"; -import "regenerator-runtime/runtime"; -import { waitForAppScreen, zemu, nano_models } from './test.fixture'; - -nano_models.forEach(function(model) { - test('[Nano ' + model.letter + '] Transfer on network 112233445566 on Ethereum', zemu(model, async (sim, eth) => { - - const tx = eth.signTransaction( - "44'/60'/1'/0/0", - 'f044850306dc4200825208945a321744667052affa8386ed49e00ef223cbffc3876f9c9e7bf6181880851a21a278be8080', - ); - - await waitForAppScreen(sim); - let clicks; - if (model.letter === 'S') clicks = 10; - else clicks = 6; - await sim.navigateAndCompareSnapshots('.', model.name + '_transfer_112233445566_network', [clicks, -1, 0]); - - await expect(tx).resolves.toEqual({ - "r": "509981d8dfb66757e25ff47c009b9b5bc5db0f169473e4735f5212b144f1c069", - "s": "5db989d81025de3c846e41a9ce01a3f9fd0982e2d827f1b88ffc95d73a48d04c", - "v": "344344f19f", - }); - })); -}); - -nano_models.forEach(function(model) { - test('[Nano ' + model.letter + '] Transfer on palm network on Ethereum', zemu(model, async (sim, eth) => { - - const tx = eth.signTransaction( - "44'/60'/1'/0/0", - 'f044850306dc4200825208945a321744667052affa8386ed49e00ef223cbffc3876f9c9e7bf61818808502a15c308d8080', - ); - - await waitForAppScreen(sim); - let clicks; - if (model.letter === 'S') clicks = 10; - else clicks = 6; - await sim.navigateAndCompareSnapshots('.', model.name + '_transfer_palm_network', [clicks, -1, 0]); - - await expect(tx).resolves.toEqual({ - "r": "946700c4972b3da24ddaa95e590ad25a8f905da62e2bd053285a4cc17f93f490", - "s": "3698e84564e58477a49f7a9cea572ef5d672a5538db08f3ee42df5eb75a1b907", - "v": "0542b8613d", - }); - })); -});