diff --git a/tests/snapshots/nanox_erc1155_transfer_wo_info/00000.png b/tests/snapshots/nanox_erc1155_transfer_wo_info/00000.png deleted file mode 120000 index a808e25..0000000 --- a/tests/snapshots/nanox_erc1155_transfer_wo_info/00000.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc1155_transfer/00000.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc1155_transfer_wo_info/00001.png b/tests/snapshots/nanox_erc1155_transfer_wo_info/00001.png deleted file mode 120000 index 18b62b5..0000000 --- a/tests/snapshots/nanox_erc1155_transfer_wo_info/00001.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc1155_transfer/00001.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc1155_transfer_wo_info/00002.png b/tests/snapshots/nanox_erc1155_transfer_wo_info/00002.png deleted file mode 120000 index 3ba3b50..0000000 --- a/tests/snapshots/nanox_erc1155_transfer_wo_info/00002.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc1155_transfer/00002.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc1155_transfer_wo_info/00003.png b/tests/snapshots/nanox_erc1155_transfer_wo_info/00003.png deleted file mode 100644 index b34af53..0000000 Binary files a/tests/snapshots/nanox_erc1155_transfer_wo_info/00003.png and /dev/null differ diff --git a/tests/snapshots/nanox_erc1155_transfer_wo_info/00004.png b/tests/snapshots/nanox_erc1155_transfer_wo_info/00004.png deleted file mode 120000 index d5f5958..0000000 --- a/tests/snapshots/nanox_erc1155_transfer_wo_info/00004.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc1155_transfer/00004.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc1155_transfer_wo_info/00005.png b/tests/snapshots/nanox_erc1155_transfer_wo_info/00005.png deleted file mode 120000 index 0d2033d..0000000 --- a/tests/snapshots/nanox_erc1155_transfer_wo_info/00005.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc1155_transfer/00005.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc1155_transfer_wo_info/00006.png b/tests/snapshots/nanox_erc1155_transfer_wo_info/00006.png deleted file mode 120000 index ce62159..0000000 --- a/tests/snapshots/nanox_erc1155_transfer_wo_info/00006.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc1155_transfer/00006.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc1155_transfer_wo_info/00007.png b/tests/snapshots/nanox_erc1155_transfer_wo_info/00007.png deleted file mode 120000 index e9c683a..0000000 --- a/tests/snapshots/nanox_erc1155_transfer_wo_info/00007.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc1155_transfer/00007.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc1155_transfer_wo_info/00008.png b/tests/snapshots/nanox_erc1155_transfer_wo_info/00008.png deleted file mode 120000 index 8dc9044..0000000 --- a/tests/snapshots/nanox_erc1155_transfer_wo_info/00008.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc1155_transfer/00008.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc1155_transfer_wo_info/00009.png b/tests/snapshots/nanox_erc1155_transfer_wo_info/00009.png deleted file mode 120000 index 8293fcb..0000000 --- a/tests/snapshots/nanox_erc1155_transfer_wo_info/00009.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc1155_transfer/00009.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc1155_transfer_wo_info/00010.png b/tests/snapshots/nanox_erc1155_transfer_wo_info/00010.png deleted file mode 120000 index 76c0110..0000000 --- a/tests/snapshots/nanox_erc1155_transfer_wo_info/00010.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc1155_transfer/00010.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc1155_transfer_wo_info/00011.png b/tests/snapshots/nanox_erc1155_transfer_wo_info/00011.png deleted file mode 120000 index e2f4374..0000000 --- a/tests/snapshots/nanox_erc1155_transfer_wo_info/00011.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc1155_transfer/00011.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc1155_transfer_wo_info/00012.png b/tests/snapshots/nanox_erc1155_transfer_wo_info/00012.png deleted file mode 120000 index 24a2c61..0000000 --- a/tests/snapshots/nanox_erc1155_transfer_wo_info/00012.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc1155_transfer/00012.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc721_transfer_wo_info/00000.png b/tests/snapshots/nanox_erc721_transfer_wo_info/00000.png deleted file mode 120000 index eaca370..0000000 --- a/tests/snapshots/nanox_erc721_transfer_wo_info/00000.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc721_transfer/00000.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc721_transfer_wo_info/00001.png b/tests/snapshots/nanox_erc721_transfer_wo_info/00001.png deleted file mode 120000 index 3f02420..0000000 --- a/tests/snapshots/nanox_erc721_transfer_wo_info/00001.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc721_transfer/00001.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc721_transfer_wo_info/00002.png b/tests/snapshots/nanox_erc721_transfer_wo_info/00002.png deleted file mode 120000 index 55b219f..0000000 --- a/tests/snapshots/nanox_erc721_transfer_wo_info/00002.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc721_transfer/00002.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc721_transfer_wo_info/00003.png b/tests/snapshots/nanox_erc721_transfer_wo_info/00003.png deleted file mode 100644 index b34af53..0000000 Binary files a/tests/snapshots/nanox_erc721_transfer_wo_info/00003.png and /dev/null differ diff --git a/tests/snapshots/nanox_erc721_transfer_wo_info/00004.png b/tests/snapshots/nanox_erc721_transfer_wo_info/00004.png deleted file mode 120000 index 4e66c9a..0000000 --- a/tests/snapshots/nanox_erc721_transfer_wo_info/00004.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc721_transfer/00004.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc721_transfer_wo_info/00005.png b/tests/snapshots/nanox_erc721_transfer_wo_info/00005.png deleted file mode 120000 index b538cb6..0000000 --- a/tests/snapshots/nanox_erc721_transfer_wo_info/00005.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc721_transfer/00005.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc721_transfer_wo_info/00006.png b/tests/snapshots/nanox_erc721_transfer_wo_info/00006.png deleted file mode 120000 index 9d4b343..0000000 --- a/tests/snapshots/nanox_erc721_transfer_wo_info/00006.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc721_transfer/00006.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc721_transfer_wo_info/00007.png b/tests/snapshots/nanox_erc721_transfer_wo_info/00007.png deleted file mode 120000 index 8851ec8..0000000 --- a/tests/snapshots/nanox_erc721_transfer_wo_info/00007.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc721_transfer/00007.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc721_transfer_wo_info/00008.png b/tests/snapshots/nanox_erc721_transfer_wo_info/00008.png deleted file mode 120000 index 7faf831..0000000 --- a/tests/snapshots/nanox_erc721_transfer_wo_info/00008.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc721_transfer/00008.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc721_transfer_wo_info/00009.png b/tests/snapshots/nanox_erc721_transfer_wo_info/00009.png deleted file mode 120000 index d3f938b..0000000 --- a/tests/snapshots/nanox_erc721_transfer_wo_info/00009.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc721_transfer/00009.png \ No newline at end of file diff --git a/tests/snapshots/nanox_erc721_transfer_wo_info/00010.png b/tests/snapshots/nanox_erc721_transfer_wo_info/00010.png deleted file mode 120000 index 8e81364..0000000 --- a/tests/snapshots/nanox_erc721_transfer_wo_info/00010.png +++ /dev/null @@ -1 +0,0 @@ -../nanox_erc721_transfer/00010.png \ No newline at end of file diff --git a/tests/src/erc1155.test.js b/tests/src/erc1155.test.js index 471cb91..37d1a8d 100644 --- a/tests/src/erc1155.test.js +++ b/tests/src/erc1155.test.js @@ -26,29 +26,23 @@ const model = nano_models[1]; await sign_promise; })); - test('[Nano ' + model.letter + '] Transfer ERC-1155 w/o PROVIDE_NFT_INFORMATION', zemu(model, async (sim, eth) => { + test('[Nano ' + model.letter + '] Transfer ERC-1155 w/o NFT metadata', zemu(model, async (sim, eth) => { const current_screen = sim.getMainMenuSnapshot(); await send_apdu(eth.transport, set_plugin); - await send_apdu(eth.transport, sign_first); - let sign_promise = send_apdu(eth.transport, sign_more); - - await waitForAppScreen(sim, current_screen); - await sim.navigateAndCompareSnapshots('.', model.name + '_erc1155_transfer_wo_info', [10, -1, 0]); - - await sign_promise; - })); - - test('[Nano ' + model.letter + '] Transfer ERC-1155 w/o SET_PLUGIN', zemu(model, async (sim, eth) => { - const current_screen = sim.getMainMenuSnapshot(); - await send_apdu(eth.transport, provide_nft_info); let sign_tx = send_apdu(eth.transport, sign_first); await expect(sign_tx).rejects.toEqual(new TransportStatusError(0x6a80)); })); + + test('[Nano ' + model.letter + '] Transfer ERC-1155 w/o plugin loaded', zemu(model, async (sim, eth) => { + const current_screen = sim.getMainMenuSnapshot(); + let nft_info = send_apdu(eth.transport, provide_nft_info); + + await expect(nft_info).rejects.toEqual(new TransportStatusError(0x6985)); + })); } -test('[Nano ' + model.letter + '] Batch transfer ERC-1155', zemu(model, async (sim, eth) => { - +{ const set_plugin = apdu_as_string('e01600007401010745524331313535495f947276749ce646f68ac8c248420045cb7b5e2eb2c2d60000000000000001000147304502210087b35cefc53fd94e25404933eb0d5ff08f20ba655d181de3b24ff0099dc3317f02204a216aa9e0b84bef6e20fcb036bd49647bf0cab66732b99b49ec277ffb682aa1'); const provide_nft_info = apdu_as_string('e0140000820101194f70656e536561205368617265642053746f726566726f6e74495f947276749ce646f68ac8c248420045cb7b5e00000000000000010001473045022100c74cd613a27a9f4887210f5a3a0e12745e1ba0ab3a0d284cb6485d89c3cce4e602205a13e62a91164985cf58a838f8f531c0b91b980d206a5ba8df28270023ef93a3'); const sign_first = apdu_as_string('e004000096058000002c8000003c800000000000000000000000f9020b0e850d8cfd86008301617d94495f947276749ce646f68ac8c248420045cb7b5e80b901e42eb2c2d60000000000000000000000006cbcd73cd8e8a42844662f0a0e76d7f79afd933d000000000000000000000000c2907efcce4011c491bbeda8a0fa63ba7aab596c00000000000000000000000000000000000000000000'); @@ -56,16 +50,18 @@ test('[Nano ' + model.letter + '] Batch transfer ERC-1155', zemu(model, async (s const sign_more_2 = apdu_as_string('e00480009689732473fcd0bbbe000000000000a30000000001abf06640f8ca8fc5e0ed471b10befcdf65a33e430000000000006a00000000640000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000010000'); const sign_more_3 = apdu_as_string('e00480006100000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000043078303000000000000000000000000000000000000000000000000000000000018080'); - const current_screen = sim.getMainMenuSnapshot(); - await send_apdu(eth.transport, set_plugin); - await send_apdu(eth.transport, provide_nft_info); - await send_apdu(eth.transport, sign_first); - await send_apdu(eth.transport, sign_more_1); - await send_apdu(eth.transport, sign_more_2); - let sign_promise = send_apdu(eth.transport, sign_more_3); + test('[Nano ' + model.letter + '] Batch transfer ERC-1155', zemu(model, async (sim, eth) => { + const current_screen = sim.getMainMenuSnapshot(); + await send_apdu(eth.transport, set_plugin); + await send_apdu(eth.transport, provide_nft_info); + await send_apdu(eth.transport, sign_first); + await send_apdu(eth.transport, sign_more_1); + await send_apdu(eth.transport, sign_more_2); + let sign_promise = send_apdu(eth.transport, sign_more_3); - await waitForAppScreen(sim, current_screen); - await sim.navigateAndCompareSnapshots('.', model.name + '_erc1155_batch_transfer', [8, -1, 0]); + await waitForAppScreen(sim, current_screen); + await sim.navigateAndCompareSnapshots('.', model.name + '_erc1155_batch_transfer', [8, -1, 0]); - await sign_promise; -})); + await sign_promise; + })); +} diff --git a/tests/src/erc721.test.js b/tests/src/erc721.test.js index 9dca820..1d05853 100644 --- a/tests/src/erc721.test.js +++ b/tests/src/erc721.test.js @@ -25,22 +25,17 @@ test('[Nano ' + model.letter + '] Transfer ERC-721', zemu(model, async (sim, eth await sign_promise; })); -test('[Nano ' + model.letter + '] Transfer ERC-721 w/o NFT_PROVIDE_INFORMATION', zemu(model, async(sim, eth) => { +test('[Nano ' + model.letter + '] Transfer ERC-721 w/o NFT metadata', zemu(model, async(sim, eth) => { const current_screen = sim.getMainMenuSnapshot(); await send_apdu(eth.transport, set_plugin); - await send_apdu(eth.transport, sign_first); - let sign_promise = send_apdu(eth.transport, sign_more); - - await waitForAppScreen(sim, current_screen); - await sim.navigateAndCompareSnapshots('.', model.name + '_erc721_transfer_wo_info', [8, -1, 0]); - - await sign_promise; -})); - -test('[Nano ' + model.letter + '] Transfer ERC-721 w/o SET_PLUGIN', zemu(model, async (sim, eth) => { - const current_screen = sim.getMainMenuSnapshot(); - await send_apdu(eth.transport, provide_nft_info); let sign_tx = send_apdu(eth.transport, sign_first); await expect(sign_tx).rejects.toEqual(new TransportStatusError(0x6a80)); })); + +test('[Nano ' + model.letter + '] Transfer ERC-721 w/o plugin loaded', zemu(model, async (sim, eth) => { + const current_screen = sim.getMainMenuSnapshot(); + let nft_info = send_apdu(eth.transport, provide_nft_info); + + await expect(nft_info).rejects.toEqual(new TransportStatusError(0x6985)); +}));