From 8d7676994dbcf4d8ef431e10ba060eb5ef2a7e22 Mon Sep 17 00:00:00 2001 From: Juan Leni Date: Tue, 25 Aug 2020 18:05:12 +0200 Subject: [PATCH 1/5] upgrade tx schema --- .gdbinit | 11 -- app/Makefile | 4 +- app/script.ld | 2 +- app/src/parser.c | 17 ++- app/src/parser_impl.c | 23 ++-- app/src/parser_txdef.h | 3 +- tests/testvectors/manual.json | 209 +++++++++++++++++--------------- tests/utils/expected_output.cpp | 10 +- tests/utils/testcases.cpp | 3 +- tests/utils/types.h | 3 +- tests_zemu/yarn.lock | 12 +- tools/generate.js | 12 +- tools/package.json | 6 +- tools/template.json | 81 ++++++++----- tools/yarn.lock | 36 +++--- 15 files changed, 243 insertions(+), 189 deletions(-) delete mode 100644 .gdbinit diff --git a/.gdbinit b/.gdbinit deleted file mode 100644 index 8abe1fbb..00000000 --- a/.gdbinit +++ /dev/null @@ -1,11 +0,0 @@ -# https://www.jetbrains.com/help/clion/configuring-debugger-options.html#gdbinit-lldbinit -# -# You need to create `$HOME/.gdbinit` with the following content: -# set auto-load local-gdbinit on -# add-auto-load-safe-path / - -set architecture arm -handle SIGILL nostop pass noprint -add-symbol-file app/bin/app.elf 0x40000000 -set backtrace limit 20 -b *0x40000000 diff --git a/app/Makefile b/app/Makefile index 222f46fd..2d8b1728 100755 --- a/app/Makefile +++ b/app/Makefile @@ -47,8 +47,8 @@ COIN=FIL endif APPVERSION_M=0 -APPVERSION_N=17 -APPVERSION_P=3 +APPVERSION_N=18 +APPVERSION_P=0 $(info COIN = [$(COIN)]) ifeq ($(COIN),FIL) diff --git a/app/script.ld b/app/script.ld index 73e2a6e2..378509c1 100644 --- a/app/script.ld +++ b/app/script.ld @@ -30,7 +30,7 @@ MEMORY } PAGE_SIZE = 64; -STACK_SIZE = 2008; +STACK_SIZE = 1892; END_STACK = ORIGIN(SRAM) + LENGTH(SRAM); SECTIONS diff --git a/app/src/parser.c b/app/src/parser.c index 9a58987e..754a54e9 100644 --- a/app/src/parser.c +++ b/app/src/parser.c @@ -162,11 +162,6 @@ parser_error_t parser_getItem(const parser_context_t *ctx, } if (displayIdx == 4) { - snprintf(outKey, outKeyLen, "Gas Price"); - return parser_printBigIntFixedPoint(&parser_tx_obj.gasprice, outVal, outValLen, pageIdx, pageCount); - } - - if (displayIdx == 5) { snprintf(outKey, outKeyLen, "Gas Limit"); if (int64_to_str(outVal, outValLen, parser_tx_obj.gaslimit) != NULL) { return parser_unexepected_error; @@ -175,7 +170,17 @@ parser_error_t parser_getItem(const parser_context_t *ctx, return parser_ok; } + if (displayIdx == 5) { + snprintf(outKey, outKeyLen, "Gas Premium"); + return parser_printBigIntFixedPoint(&parser_tx_obj.gaspremium, outVal, outValLen, pageIdx, pageCount); + } + if (displayIdx == 6) { + snprintf(outKey, outKeyLen, "Gas Fee Cap"); + return parser_printBigIntFixedPoint(&parser_tx_obj.gasfeecap, outVal, outValLen, pageIdx, pageCount); + } + + if (displayIdx == 7) { snprintf(outKey, outKeyLen, "Method"); *pageCount = 1; switch(parser_tx_obj.method) { @@ -207,7 +212,7 @@ parser_error_t parser_getItem(const parser_context_t *ctx, return parser_unexpected_method; } - if (displayIdx == 7) { + if (displayIdx == 8) { *pageCount = 1; snprintf(outKey, outKeyLen, "Params"); snprintf(outVal, outValLen, "Not Available"); diff --git a/app/src/parser_impl.c b/app/src/parser_impl.c index 5d9a01d7..109d0fb5 100644 --- a/app/src/parser_impl.c +++ b/app/src/parser_impl.c @@ -249,7 +249,7 @@ parser_error_t _read(const parser_context_t *c, parser_tx_t *v) { CHECK_CBOR_MAP_ERR(cbor_value_get_array_length(&it, &arraySize)) // Depends if we have params or not - PARSER_ASSERT_OR_ERROR(arraySize == 9 || arraySize == 8, parser_unexpected_number_items); + PARSER_ASSERT_OR_ERROR(arraySize == 10 || arraySize == 9, parser_unexpected_number_items); CborValue arrayContainer; PARSER_ASSERT_OR_ERROR(cbor_value_is_container(&it), parser_unexpected_type) @@ -286,17 +286,22 @@ parser_error_t _read(const parser_context_t *c, parser_tx_t *v) { PARSER_ASSERT_OR_ERROR(arrayContainer.type != CborInvalidType, parser_unexpected_type) CHECK_CBOR_MAP_ERR(cbor_value_advance(&arrayContainer)) - // "gasPrice" field - CHECK_PARSER_ERR(_readBigInt(&v->gasprice, &arrayContainer)) - PARSER_ASSERT_OR_ERROR(arrayContainer.type != CborInvalidType, parser_unexpected_type) - CHECK_CBOR_MAP_ERR(cbor_value_advance(&arrayContainer)) - // "gasLimit" field PARSER_ASSERT_OR_ERROR(cbor_value_is_integer(&arrayContainer), parser_unexpected_type) CHECK_PARSER_ERR(cbor_value_get_int64(&arrayContainer, &v->gaslimit)) PARSER_ASSERT_OR_ERROR(arrayContainer.type != CborInvalidType, parser_unexpected_type) CHECK_CBOR_MAP_ERR(cbor_value_advance(&arrayContainer)) + // "gasPremium" field + CHECK_PARSER_ERR(_readBigInt(&v->gaspremium, &arrayContainer)) + PARSER_ASSERT_OR_ERROR(arrayContainer.type != CborInvalidType, parser_unexpected_type) + CHECK_CBOR_MAP_ERR(cbor_value_advance(&arrayContainer)) + + // "gasFeeCap" field + CHECK_PARSER_ERR(_readBigInt(&v->gasfeecap, &arrayContainer)) + PARSER_ASSERT_OR_ERROR(arrayContainer.type != CborInvalidType, parser_unexpected_type) + CHECK_CBOR_MAP_ERR(cbor_value_advance(&arrayContainer)) + // "method" field CHECK_PARSER_ERR(_readMethod(v, &arrayContainer)) PARSER_ASSERT_OR_ERROR(arrayContainer.type != CborInvalidType, parser_unexpected_type) @@ -321,11 +326,11 @@ parser_error_t _validateTx(const parser_context_t *c, const parser_tx_t *v) { } uint8_t _getNumItems(const parser_context_t *c, const parser_tx_t *v) { - uint8_t itemCount = 8; + uint8_t itemCount = 9; switch (v->method) { case method0: - itemCount = 6; + itemCount = 7; break; case method1: case method2: @@ -334,7 +339,7 @@ uint8_t _getNumItems(const parser_context_t *c, const parser_tx_t *v) { case method5: case method6: case method7: - itemCount = 8; + break; } return itemCount; diff --git a/app/src/parser_txdef.h b/app/src/parser_txdef.h index 9aa28152..9d04152f 100644 --- a/app/src/parser_txdef.h +++ b/app/src/parser_txdef.h @@ -60,8 +60,9 @@ typedef struct { address_t from; uint64_t nonce; bigint_t value; - bigint_t gasprice; int64_t gaslimit; + bigint_t gaspremium; + bigint_t gasfeecap; uint64_t method; // params are not supported at this moment // char *params diff --git a/tests/testvectors/manual.json b/tests/testvectors/manual.json index 8b9095f4..65b65d53 100644 --- a/tests/testvectors/manual.json +++ b/tests/testvectors/manual.json @@ -1,7 +1,7 @@ [ { "description": "TODO invalid test case ", - "encoded_tx": "iQBAQABCAABCAAAAAEA=", + "encoded_tx": "igBAQABCAAAAQgAAQgAAAEA=", "valid": false, "testnet": false, "message": { @@ -10,15 +10,16 @@ "from": "", "nonce": 0, "value": "0", - "gasprice": "0", "gaslimit": "0", + "gaspremium": "0", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "8900404000420000420000000040" + "encoded_tx_hex": "8a00404000420000004200004200000040" }, { "description": "Basic test case", - "encoded_tx": "iQBVAf0dD0381+ma/Lmagya33EWdMsYoVQG4gmGdRlWPPZ4xbRG0jc8hEycCWgFEAAGGoEMACcQZYagAQA==", + "encoded_tx": "igBVAf0dD0381+ma/Lmagya33EWdMsYoVQG4gmGdRlWPPZ4xbRG0jc8hEycCWgFEAAGGoBlhqEMACcRCAAAAQA==", "valid": true, "testnet": false, "message": { @@ -27,15 +28,16 @@ "from": "f1xcbgdhkgkwht3hrrnui3jdopeejsoas2rujnkdi", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "89005501fd1d0f4dfcd7e99afcb99a8326b7dc459d32c6285501b882619d46558f3d9e316d11b48dcf211327025a0144000186a0430009c41961a80040" + "encoded_tx_hex": "8a005501fd1d0f4dfcd7e99afcb99a8326b7dc459d32c6285501b882619d46558f3d9e316d11b48dcf211327025a0144000186a01961a8430009c44200000040" }, { "description": "Basic test case Testnet", - "encoded_tx": "iQBVAf0dD0381+ma/Lmagya33EWdMsYoVQG4gmGdRlWPPZ4xbRG0jc8hEycCWgFEAAGGoEMACcQZYagAQA==", + "encoded_tx": "igBVAf0dD0381+ma/Lmagya33EWdMsYoVQG4gmGdRlWPPZ4xbRG0jc8hEycCWgFEAAGGoBlhqEMACcRCAAAAQA==", "valid": true, "testnet": true, "message": { @@ -44,15 +46,16 @@ "from": "t1xcbgdhkgkwht3hrrnui3jdopeejsoas2rujnkdi", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "89005501fd1d0f4dfcd7e99afcb99a8326b7dc459d32c6285501b882619d46558f3d9e316d11b48dcf211327025a0144000186a0430009c41961a80040" + "encoded_tx_hex": "8a005501fd1d0f4dfcd7e99afcb99a8326b7dc459d32c6285501b882619d46558f3d9e316d11b48dcf211327025a0144000186a01961a8430009c44200000040" }, { "description": "Using Protocol 0 addresses", - "encoded_tx": "iQBCAABDAJYBAUQAAYagQwAJxBlhqABA", + "encoded_tx": "igBCAABDAJYBAUQAAYagGWGoQwAJxEIAAABA", "valid": true, "testnet": false, "message": { @@ -61,15 +64,16 @@ "from": "f0150", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "8900420000430096010144000186a0430009c41961a80040" + "encoded_tx_hex": "8a00420000430096010144000186a01961a8430009c44200000040" }, { "description": "Using Protocol 0 addresses 2", - "encoded_tx": "iQBDAIAIQwDBDQFEAAGGoEMACcQZYagAQA==", + "encoded_tx": "igBDAIAIQwDBDQFEAAGGoBlhqEMACcRCAAAAQA==", "valid": true, "testnet": false, "message": { @@ -78,15 +82,16 @@ "from": "f01729", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "8900430080084300c10d0144000186a0430009c41961a80040" + "encoded_tx_hex": "8a00430080084300c10d0144000186a01961a8430009c44200000040" }, { "description": "Using Protocol 0 addresses 3", - "encoded_tx": "iQBLAP///////////wFCAAABRAABhqBDAAnEGWGoAEA=", + "encoded_tx": "igBLAP///////////wFCAAABRAABhqAZYahDAAnEQgAAAEA=", "valid": true, "testnet": false, "message": { @@ -95,15 +100,16 @@ "from": "f00", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "89004b00ffffffffffffffffff014200000144000186a0430009c41961a80040" + "encoded_tx_hex": "8a004b00ffffffffffffffffff014200000144000186a01961a8430009c44200000040" }, { "description": "Using Protocol 1 addresses", - "encoded_tx": "iQBVAf0dD0381+ma/Lmagya33EWdMsYoVQG4gmGdRlWPPZ4xbRG0jc8hEycCagFEAAGGoEMACcQZYagAQA==", + "encoded_tx": "igBVAf0dD0381+ma/Lmagya33EWdMsYoVQG4gmGdRlWPPZ4xbRG0jc8hEycCagFEAAGGoBlhqEMACcRCAAAAQA==", "valid": true, "testnet": false, "message": { @@ -112,15 +118,16 @@ "from": "f1xcbgdhkgkwht3hrrnui3jdopeejsoatkzmoltqy", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "89005501fd1d0f4dfcd7e99afcb99a8326b7dc459d32c6285501b882619d46558f3d9e316d11b48dcf211327026a0144000186a0430009c41961a80040" + "encoded_tx_hex": "8a005501fd1d0f4dfcd7e99afcb99a8326b7dc459d32c6285501b882619d46558f3d9e316d11b48dcf211327026a0144000186a01961a8430009c44200000040" }, { "description": "Using Protocol 1 addresses 2", - "encoded_tx": "iQBVAbzsB8BeafkkaOKz4793yHTyxdqMVQGwbnpvD1Ud4mH+Om/hgrQi7gvGtgFEAAGGoEMACcQZYagAQA==", + "encoded_tx": "igBVAbzsB8BeafkkaOKz4793yHTyxdqMVQGwbnpvD1Ud4mH+Om/hgrQi7gvGtgFEAAGGoBlhqEMACcRCAAAAQA==", "valid": true, "testnet": false, "message": { @@ -129,15 +136,16 @@ "from": "f1wbxhu3ypkuo6eyp6hjx6davuelxaxrvwb2kuwva", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "89005501bcec07c05e69f92468e2b3e3bf77c874f2c5da8c5501b06e7a6f0f551de261fe3a6fe182b422ee0bc6b60144000186a0430009c41961a80040" + "encoded_tx_hex": "8a005501bcec07c05e69f92468e2b3e3bf77c874f2c5da8c5501b06e7a6f0f551de261fe3a6fe182b422ee0bc6b60144000186a01961a8430009c44200000040" }, { "description": "Using Protocol 1 addresses 3", - "encoded_tx": "iQBVAdFQBQTk0aw+iayJGkUCWG+r2bQXVQH9HQ9N/Nfpmvy5moMmt9xFnTLGKAFEAAGGoEMACcQZYagAQA==", + "encoded_tx": "igBVAdFQBQTk0aw+iayJGkUCWG+r2bQXVQH9HQ9N/Nfpmvy5moMmt9xFnTLGKAFEAAGGoBlhqEMACcRCAAAAQA==", "valid": true, "testnet": false, "message": { @@ -146,15 +154,16 @@ "from": "f17uoq6tp427uzv7fztkbsnn64iwotfrristwpryy", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "89005501d1500504e4d1ac3e89ac891a4502586fabd9b4175501fd1d0f4dfcd7e99afcb99a8326b7dc459d32c6280144000186a0430009c41961a80040" + "encoded_tx_hex": "8a005501d1500504e4d1ac3e89ac891a4502586fabd9b4175501fd1d0f4dfcd7e99afcb99a8326b7dc459d32c6280144000186a01961a8430009c44200000040" }, { "description": "Using Protocol 2 addresses", - "encoded_tx": "iQBVAuVN6k+bxbR9JhgZgm1eH7+LxVA7VQLrWL0IoVpq3hnQmJZ0FI+pWoFXxgFEAAGGoEMACcQZYagAQA==", + "encoded_tx": "igBVAuVN6k+bxbR9JhgZgm1eH7+LxVA7VQLrWL0IoVpq3hnQmJZ0FI+pWoFXxgFEAAGGoBlhqEMACcRCAAAAQA==", "valid": true, "testnet": false, "message": { @@ -163,15 +172,16 @@ "from": "f25nml2cfbljvn4goqtclhifepvfnicv6g7mfmmvq", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "89005502e54dea4f9bc5b47d261819826d5e1fbf8bc5503b5502eb58bd08a15a6ade19d0989674148fa95a8157c60144000186a0430009c41961a80040" + "encoded_tx_hex": "8a005502e54dea4f9bc5b47d261819826d5e1fbf8bc5503b5502eb58bd08a15a6ade19d0989674148fa95a8157c60144000186a01961a8430009c44200000040" }, { "description": "Using Protocol 2 addresses 2", - "encoded_tx": "iQBVAm0hE360xIFCaeiU0pbPZQDkPNcUVQLgx8dfgtVeXtVdsoAzYw30J0qYTwFEAAGGoEMACcQZYagAQA==", + "encoded_tx": "igBVAm0hE360xIFCaeiU0pbPZQDkPNcUVQLgx8dfgtVeXtVdsoAzYw30J0qYTwFEAAGGoBlhqEMACcRCAAAAQA==", "valid": true, "testnet": false, "message": { @@ -180,15 +190,16 @@ "from": "f24dd4ox4c2vpf5vk5wkadgyyn6qtuvgcpxxon64a", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "890055026d21137eb4c4814269e894d296cf6500e43cd7145502e0c7c75f82d55e5ed55db28033630df4274a984f0144000186a0430009c41961a80040" + "encoded_tx_hex": "8a0055026d21137eb4c4814269e894d296cf6500e43cd7145502e0c7c75f82d55e5ed55db28033630df4274a984f0144000186a01961a8430009c44200000040" }, { "description": "Using Protocol 2 addresses 3", - "encoded_tx": "iQBVAjFrTB/11K+3gmzqtbsPLD4PNkBTVQLlTepPm8W0fSYYGYJtXh+/i8VQOwFEAAGGoEMACcQZYagAQA==", + "encoded_tx": "igBVAjFrTB/11K+3gmzqtbsPLD4PNkBTVQLlTepPm8W0fSYYGYJtXh+/i8VQOwFEAAGGoBlhqEMACcRCAAAAQA==", "valid": true, "testnet": false, "message": { @@ -197,15 +208,16 @@ "from": "f24vg6ut43yw2h2jqydgbg2xq7x6f4kub3bg6as6i", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "89005502316b4c1ff5d4afb7826ceab5bb0f2c3e0f3640535502e54dea4f9bc5b47d261819826d5e1fbf8bc5503b0144000186a0430009c41961a80040" + "encoded_tx_hex": "8a005502316b4c1ff5d4afb7826ceab5bb0f2c3e0f3640535502e54dea4f9bc5b47d261819826d5e1fbf8bc5503b0144000186a01961a8430009c44200000040" }, { "description": "Using Protocol 3 addresses", - "encoded_tx": "iQBYMQOtWN9pbi1OkeqGyIHpOLpOqBs5XhJ5e4S5zzFLlUZwXoOcepnWBrJH3bT5rHo0FN1YMQOzKU8KLingxm68I10v7cpWl794SvYFx1r2COamPVzTjqhcqJieDv3pGIs4L5NyRg0BRAABhqBDAAnEGWGoAEA=", + "encoded_tx": "igBYMQOtWN9pbi1OkeqGyIHpOLpOqBs5XhJ5e4S5zzFLlUZwXoOcepnWBrJH3bT5rHo0FN1YMQOzKU8KLingxm68I10v7cpWl794SvYFx1r2COamPVzTjqhcqJieDv3pGIs4L5NyRg0BRAABhqAZYahDAAnEQgAAAEA=", "valid": true, "testnet": false, "message": { @@ -214,15 +226,16 @@ "from": "f3wmuu6crofhqmm3v4enos73okk2l366ck6yc4owxwbdtkmpk42ohkqxfitcpa57pjdcftql4tojda2poeruwa", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "8900583103ad58df696e2d4e91ea86c881e938ba4ea81b395e12797b84b9cf314b9546705e839c7a99d606b247ddb4f9ac7a3414dd583103b3294f0a2e29e0c66ebc235d2fedca5697bf784af605c75af608e6a63d5cd38ea85ca8989e0efde9188b382f9372460d0144000186a0430009c41961a80040" + "encoded_tx_hex": "8a00583103ad58df696e2d4e91ea86c881e938ba4ea81b395e12797b84b9cf314b9546705e839c7a99d606b247ddb4f9ac7a3414dd583103b3294f0a2e29e0c66ebc235d2fedca5697bf784af605c75af608e6a63d5cd38ea85ca8989e0efde9188b382f9372460d0144000186a01961a8430009c44200000040" }, { "description": "Using Protocol 3 addresses 2", - "encoded_tx": "iQBYMQOWoaPk6noU1JmF5mGyJAHUT+1ALR0JJbJDySNYnA+8fjLNBOKe140V0306qj/m2jNYMQOGtFQljFiUdffRb1qsAYp59sEWnSD8M5Id2LXOHKxsNI+Qo2A2JPauuRtkUYwugJUBRAABhqBDAAnEGWGoAEA=", + "encoded_tx": "igBYMQOWoaPk6noU1JmF5mGyJAHUT+1ALR0JJbJDySNYnA+8fjLNBOKe140V0306qj/m2jNYMQOGtFQljFiUdffRb1qsAYp59sEWnSD8M5Id2LXOHKxsNI+Qo2A2JPauuRtkUYwugJUBRAABhqAZYahDAAnEQgAAAEA=", "valid": true, "testnet": false, "message": { @@ -231,15 +244,16 @@ "from": "f3q22fijmmlckhl56rn5nkyamkph3mcfu5ed6dheq53c244hfmnq2i7efdma3cj5voxenwiummf2ajlsbxc65a", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "890058310396a1a3e4ea7a14d49985e661b22401d44fed402d1d0925b243c923589c0fbc7e32cd04e29ed78d15d37d3aaa3fe6da3358310386b454258c589475f7d16f5aac018a79f6c1169d20fc33921dd8b5ce1cac6c348f90a3603624f6aeb91b64518c2e80950144000186a0430009c41961a80040" + "encoded_tx_hex": "8a0058310396a1a3e4ea7a14d49985e661b22401d44fed402d1d0925b243c923589c0fbc7e32cd04e29ed78d15d37d3aaa3fe6da3358310386b454258c589475f7d16f5aac018a79f6c1169d20fc33921dd8b5ce1cac6c348f90a3603624f6aeb91b64518c2e80950144000186a01961a8430009c44200000040" }, { "description": "Using Protocol 3 addresses 3", - "encoded_tx": "iQBYMQOncmsDgCL3WjhGF1hTYM7mKQcKLZ0ocSll5fJuzECFg4KANyTtNPJyAzbwnbYx8HRYMQOtWN9pbi1OkeqGyIHpOLpOqBs5XhJ5e4S5zzFLlUZwXoOcepnWBrJH3bT5rHo0FN0BRAABhqBDAAnEGWGoAEA=", + "encoded_tx": "igBYMQOncmsDgCL3WjhGF1hTYM7mKQcKLZ0ocSll5fJuzECFg4KANyTtNPJyAzbwnbYx8HRYMQOtWN9pbi1OkeqGyIHpOLpOqBs5XhJ5e4S5zzFLlUZwXoOcepnWBrJH3bT5rHo0FN0BRAABhqAZYahDAAnEQgAAAEA=", "valid": true, "testnet": false, "message": { @@ -248,15 +262,16 @@ "from": "f3vvmn62lofvhjd2ugzca6sof2j2ubwok6cj4xxbfzz4yuxfkgobpihhd2thlanmsh3w2ptld2gqkn2jvlss4a", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "8900583103a7726b038022f75a384617585360cee629070a2d9d28712965e5f26ecc40858382803724ed34f2720336f09db631f074583103ad58df696e2d4e91ea86c881e938ba4ea81b395e12797b84b9cf314b9546705e839c7a99d606b247ddb4f9ac7a3414dd0144000186a0430009c41961a80040" + "encoded_tx_hex": "8a00583103a7726b038022f75a384617585360cee629070a2d9d28712965e5f26ecc40858382803724ed34f2720336f09db631f074583103ad58df696e2d4e91ea86c881e938ba4ea81b395e12797b84b9cf314b9546705e839c7a99d606b247ddb4f9ac7a3414dd0144000186a01961a8430009c44200000040" }, { "description": "Using Protocol 3 addresses 3", - "encoded_tx": "iQBYMQOncmsDgCL3WjhGF1hTYM7mKQcKLZ0ocSll5fJuzECFg4KANyTtNPJyAzbwnbYx8HRYMQOtWN9pbi1OkeqGyIHpOLpOqBs5XhJ5e4S5zzFLlUZwXoOcepnWBrJH3bT5rHo0FN0BRAABhqBDAAnEGWGoAEA=", + "encoded_tx": "igBYMQOncmsDgCL3WjhGF1hTYM7mKQcKLZ0ocSll5fJuzECFg4KANyTtNPJyAzbwnbYx8HRYMQOtWN9pbi1OkeqGyIHpOLpOqBs5XhJ5e4S5zzFLlUZwXoOcepnWBrJH3bT5rHo0FN0BRAABhqAZYahDAAnEQgAAAEA=", "valid": true, "testnet": false, "message": { @@ -265,15 +280,16 @@ "from": "f3vvmn62lofvhjd2ugzca6sof2j2ubwok6cj4xxbfzz4yuxfkgobpihhd2thlanmsh3w2ptld2gqkn2jvlss4a", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "8900583103a7726b038022f75a384617585360cee629070a2d9d28712965e5f26ecc40858382803724ed34f2720336f09db631f074583103ad58df696e2d4e91ea86c881e938ba4ea81b395e12797b84b9cf314b9546705e839c7a99d606b247ddb4f9ac7a3414dd0144000186a0430009c41961a80040" + "encoded_tx_hex": "8a00583103a7726b038022f75a384617585360cee629070a2d9d28712965e5f26ecc40858382803724ed34f2720336f09db631f074583103ad58df696e2d4e91ea86c881e938ba4ea81b395e12797b84b9cf314b9546705e839c7a99d606b247ddb4f9ac7a3414dd0144000186a01961a8430009c44200000040" }, { "description": "Address protocol 1 Invalid payload length of 21 bytes", - "encoded_tx": "iQBWAQAAAAAAAAAAAAAAAAAAAAAAAAAAAVYBAAAAAAAAAAAAAAAAAAAAAAAAAAABAUQAAYagQwAJxBlhqABA", + "encoded_tx": "igBWAQAAAAAAAAAAAAAAAAAAAAAAAAAAAVYBAAAAAAAAAAAAAAAAAAAAAAAAAAABAUQAAYagGWGoQwAJxEIAAABA", "valid": false, "testnet": false, "message": { @@ -282,15 +298,16 @@ "from": "f1aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaae6zk5dy", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "8900560100000000000000000000000000000000000000000156010000000000000000000000000000000000000000010144000186a0430009c41961a80040" + "encoded_tx_hex": "8a00560100000000000000000000000000000000000000000156010000000000000000000000000000000000000000010144000186a01961a8430009c44200000040" }, { "description": "Address protocol 1 Invalid payload length of 19 bytes", - "encoded_tx": "iQBUAQAAAAAAAAAAAAAAAAAAAAAAAABUAQAAAAAAAAAAAAAAAAAAAAAAAAABRAABhqBDAAnEGWGoAEA=", + "encoded_tx": "igBUAQAAAAAAAAAAAAAAAAAAAAAAAABUAQAAAAAAAAAAAAAAAAAAAAAAAAABRAABhqAZYahDAAnEQgAAAEA=", "valid": false, "testnet": false, "message": { @@ -299,15 +316,16 @@ "from": "f1aaaaaaaaaaaaaaaaaaaaaaaaaaaaaabh2wd2q", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "89005401000000000000000000000000000000000000005401000000000000000000000000000000000000000144000186a0430009c41961a80040" + "encoded_tx_hex": "8a005401000000000000000000000000000000000000005401000000000000000000000000000000000000000144000186a01961a8430009c44200000040" }, { "description": "Address protocol 0 Invalid payload length of 21 bytes", - "encoded_tx": "iQBWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUQAAYagQwAJxBlhqABA", + "encoded_tx": "igBWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUQAAYagGWGoQwAJxEIAAABA", "valid": false, "testnet": false, "message": { @@ -316,15 +334,16 @@ "from": "f00", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "8900560000000000000000000000000000000000000000000056000000000000000000000000000000000000000000000144000186a0430009c41961a80040" + "encoded_tx_hex": "8a00560000000000000000000000000000000000000000000056000000000000000000000000000000000000000000000144000186a01961a8430009c44200000040" }, { "description": "Address protocol 2 Invalid payload length of 21 bytes", - "encoded_tx": "iQBWAgAAAAAAAAAAAAAAAAAAAAAAAAAAAFYCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUQAAYagQwAJxBlhqABA", + "encoded_tx": "igBWAgAAAAAAAAAAAAAAAAAAAAAAAAAAAFYCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUQAAYagGWGoQwAJxEIAAABA", "valid": false, "testnet": false, "message": { @@ -333,15 +352,16 @@ "from": "f2aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa3sien4", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "8900560200000000000000000000000000000000000000000056020000000000000000000000000000000000000000000144000186a0430009c41961a80040" + "encoded_tx_hex": "8a00560200000000000000000000000000000000000000000056020000000000000000000000000000000000000000000144000186a01961a8430009c44200000040" }, { "description": "Address protocol 2 Invalid payload length of 19 bytes", - "encoded_tx": "iQBUAgAAAAAAAAAAAAAAAAAAAAAAAABUAgAAAAAAAAAAAAAAAAAAAAAAAAABRAABhqBDAAnEGWGoAEA=", + "encoded_tx": "igBUAgAAAAAAAAAAAAAAAAAAAAAAAABUAgAAAAAAAAAAAAAAAAAAAAAAAAABRAABhqAZYahDAAnEQgAAAEA=", "valid": false, "testnet": false, "message": { @@ -350,15 +370,16 @@ "from": "f2aaaaaaaaaaaaaaaaaaaaaaaaaaaaaab5nwlky", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "89005402000000000000000000000000000000000000005402000000000000000000000000000000000000000144000186a0430009c41961a80040" + "encoded_tx_hex": "8a005402000000000000000000000000000000000000005402000000000000000000000000000000000000000144000186a01961a8430009c44200000040" }, { "description": "Address protocol 3 Invalid payload length of 47 bytes", - "encoded_tx": "iQBYMAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgwAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUQAAYagQwAJxBlhqABA", + "encoded_tx": "igBYMAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgwAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUQAAYagGWGoQwAJxEIAAABA", "valid": false, "testnet": false, "message": { @@ -367,15 +388,16 @@ "from": "f3aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamqs4am4", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "8900583003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000058300300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000144000186a0430009c41961a80040" + "encoded_tx_hex": "8a00583003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000058300300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000144000186a01961a8430009c44200000040" }, { "description": "Address protocol 3 Invalid payload length of 49 bytes", - "encoded_tx": "iQBYMgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWDIDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFEAAGGoEMACcQZYagAQA==", + "encoded_tx": "igBYMgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWDIDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFEAAGGoBlhqEMACcRCAAAAQA==", "valid": false, "testnet": false, "message": { @@ -384,15 +406,16 @@ "from": "f3aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaddp6aeu", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "890058320300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000583203000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000144000186a0430009c41961a80040" + "encoded_tx_hex": "8a0058320300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000583203000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000144000186a01961a8430009c44200000040" }, { "description": "Address with unknown protocol", - "encoded_tx": "iQBVBAAAAAAAAAAAAAAAAAAAAAAAAAAAVQQAAAAAAAAAAAAAAAAAAAAAAAAAAAFEAAGGoEMACcQZYagAQA==", + "encoded_tx": "igBVBAAAAAAAAAAAAAAAAAAAAAAAAAAAVQQAAAAAAAAAAAAAAAAAAAAAAAAAAAFEAAGGoBlhqEMACcRCAAAAQA==", "valid": false, "testnet": false, "message": { @@ -401,15 +424,16 @@ "from": "faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaryyc34i", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "890055040000000000000000000000000000000000000000550400000000000000000000000000000000000000000144000186a0430009c41961a80040" + "encoded_tx_hex": "8a0055040000000000000000000000000000000000000000550400000000000000000000000000000000000000000144000186a01961a8430009c44200000040" }, { "description": "Negative sign byte", - "encoded_tx": "iQBVAdFQBQTk0aw+iayJGkUCWG+r2bQXVQG4gmGdRlWPPZ4xbRG0jc8hEycCagFBAUMACcQZYagAQA==", + "encoded_tx": "igBVAdFQBQTk0aw+iayJGkUCWG+r2bQXVQG4gmGdRlWPPZ4xbRG0jc8hEycCagFBARlhqEMACcRCAAAAQA==", "valid": false, "testnet": false, "message": { @@ -418,15 +442,16 @@ "from": "f1xcbgdhkgkwht3hrrnui3jdopeejsoatkzmoltqy", "nonce": 1, "value": "-100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "89005501d1500504e4d1ac3e89ac891a4502586fabd9b4175501b882619d46558f3d9e316d11b48dcf211327026a014101430009c41961a80040" + "encoded_tx_hex": "8a005501d1500504e4d1ac3e89ac891a4502586fabd9b4175501b882619d46558f3d9e316d11b48dcf211327026a0141011961a8430009c44200000040" }, { "description": "Empty value", - "encoded_tx": "iQBVAdFQBQTk0aw+iayJGkUCWG+r2bQXVQG4gmGdRlWPPZ4xbRG0jc8hEycCagFBAEMACcQZYagAQA==", + "encoded_tx": "igBVAdFQBQTk0aw+iayJGkUCWG+r2bQXVQG4gmGdRlWPPZ4xbRG0jc8hEycCagFBABlhqEMACcRCAAAAQA==", "valid": false, "testnet": false, "message": { @@ -435,15 +460,16 @@ "from": "f1xcbgdhkgkwht3hrrnui3jdopeejsoatkzmoltqy", "nonce": 1, "value": "", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "89005501d1500504e4d1ac3e89ac891a4502586fabd9b4175501b882619d46558f3d9e316d11b48dcf211327026a014100430009c41961a80040" + "encoded_tx_hex": "8a005501d1500504e4d1ac3e89ac891a4502586fabd9b4175501b882619d46558f3d9e316d11b48dcf211327026a0141001961a8430009c44200000040" }, { "description": "Wrong version", - "encoded_tx": "iRh7VQHRUAUE5NGsPomsiRpFAlhvq9m0F1UBuIJhnUZVjz2eMW0RtI3PIRMnAmoBQQBDAAnEGWGoAEA=", + "encoded_tx": "ihh7VQHRUAUE5NGsPomsiRpFAlhvq9m0F1UBuIJhnUZVjz2eMW0RtI3PIRMnAmoBQQAZYahDAAnEQgAAAEA=", "valid": false, "testnet": false, "message": { @@ -452,28 +478,11 @@ "from": "f1xcbgdhkgkwht3hrrnui3jdopeejsoatkzmoltqy", "nonce": 1, "value": "", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 }, - "encoded_tx_hex": "89187b5501d1500504e4d1ac3e89ac891a4502586fabd9b4175501b882619d46558f3d9e316d11b48dcf211327026a014100430009c41961a80040" - }, - { - "description": "Method 2", - "encoded_tx": "", - "valid": true, - "expert": true, - "testnet": false, - "message": { - "version": 123, - "to": "f01005", - "from": "f137sjdbgunloi7couiy4l5nc7pd6k2jmq32vizpy", - "nonce": 16, - "value": "0000000000000000000", - "gasprice": "1", - "gaslimit": "1000", - "method": 2 - }, - "encoded_tx_hex": "89004300ed075501dfe49184d46adc8f89d44638beb45f78fcad259010404200011903e8025823845501dfe49184d46adc8f89d44638beb45f78fcad259049000de0b6b3a76400000040" + "encoded_tx_hex": "8a187b5501d1500504e4d1ac3e89ac891a4502586fabd9b4175501b882619d46558f3d9e316d11b48dcf211327026a0141001961a8430009c44200000040" } -] +] \ No newline at end of file diff --git a/tests/utils/expected_output.cpp b/tests/utils/expected_output.cpp index 981581ad..f6681e43 100644 --- a/tests/utils/expected_output.cpp +++ b/tests/utils/expected_output.cpp @@ -77,17 +77,19 @@ std::vector GenerateExpectedUIOutput(const testcaseData_t &tcd) { addTo(answer, "3 | Value : {}", FormatAmount(tcd.value)); - addTo(answer, "4 | Gas Price : {}", FormatAmount(tcd.gasprice)); + addTo(answer, "4 | Gas Limit : {}", tcd.gaslimit); - addTo(answer, "5 | Gas Limit : {}", tcd.gaslimit); + addTo(answer, "5 | Gas Premium : {}", FormatAmount(tcd.gaspremium)); + + addTo(answer, "6 | Gas Fee Cap : {}", FormatAmount(tcd.gasfeecap)); if (tcd.method != 0) { - addTo(answer, "6 | Method : Method{}", tcd.method); + addTo(answer, "7 | Method : Method{}", tcd.method); } // If 0 we have a no parameters if (tcd.method != 0) { - addTo(answer, "7 | Params : Not Available"); + addTo(answer, "8 | Params : Not Available"); } return answer; diff --git a/tests/utils/testcases.cpp b/tests/utils/testcases.cpp index 501593c7..bb178767 100644 --- a/tests/utils/testcases.cpp +++ b/tests/utils/testcases.cpp @@ -45,8 +45,9 @@ testcaseData_t ReadRawTestCase(const std::shared_ptr &jsonSource, i message["from"].asString(), message["nonce"].asUInt64(), message["value"].asString(), - message["gasprice"].asString(), message["gaslimit"].asString(), + message["gaspremium"].asString(), + message["gasfeecap"].asString(), message["method"].asUInt64(), v["encoded_tx"].asString(), v["valid"].asBool(), diff --git a/tests/utils/types.h b/tests/utils/types.h index 76f5226e..12aced4f 100644 --- a/tests/utils/types.h +++ b/tests/utils/types.h @@ -21,8 +21,9 @@ typedef struct { std::string from; uint64_t nonce; std::string value; - std::string gasprice; std::string gaslimit; + std::string gaspremium; + std::string gasfeecap; uint64_t method; std::string encoded_tx; diff --git a/tests_zemu/yarn.lock b/tests_zemu/yarn.lock index aaeccfb3..cc2d243d 100644 --- a/tests_zemu/yarn.lock +++ b/tests_zemu/yarn.lock @@ -1528,7 +1528,7 @@ acorn@^7.1.1, acorn@^7.3.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c" integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w== -ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: +ajv@^6.10.0, ajv@^6.10.2: version "6.12.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd" integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== @@ -1538,6 +1538,16 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.12.3: + version "6.12.4" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" + integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + ansi-colors@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" diff --git a/tools/generate.js b/tools/generate.js index d3d43033..c032db17 100644 --- a/tools/generate.js +++ b/tools/generate.js @@ -44,13 +44,17 @@ function toCBOR(tc) { let buf = bigintToArray(tc.message.value); answer.push(buf); - // "gasprice" - buf = bigintToArray(tc.message.gasprice); - answer.push(buf); - // "gaslimit" answer.push( parseInt(tc.message.gaslimit, 10)); + // "gaspremium" + buf = bigintToArray(tc.message.gaspremium); + answer.push(buf); + + // "gasfeecap" + buf = bigintToArray(tc.message.gasfeecap); + answer.push(buf); + // "method" answer.push(tc.message.method); diff --git a/tools/package.json b/tools/package.json index 80807478..69dedee2 100644 --- a/tools/package.json +++ b/tools/package.json @@ -2,10 +2,10 @@ "name": "tools", "version": "1.0.0", "dependencies": { + "@webassemblyjs/leb128": "^1.9.0", "base32-encode": "^1.1.1", - "blake2": "^4.0.0", - "cbor": "^5.0.1", - "@webassemblyjs/leb128": "^1.9.0" + "blake2": "^4.0.1", + "cbor": "^5.1.0" }, "scripts": { "generate": "node generate.js" diff --git a/tools/template.json b/tools/template.json index 530b889e..5756f906 100644 --- a/tools/template.json +++ b/tools/template.json @@ -10,8 +10,9 @@ "from": "", "nonce": 0, "value": "0", - "gasprice": "0", "gaslimit": "0", + "gaspremium": "0", + "gasfeecap": "0", "method": 0 } }, @@ -26,8 +27,9 @@ "from": "01B882619D46558F3D9E316D11B48DCF211327025A", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 } }, @@ -42,8 +44,9 @@ "from": "01B882619D46558F3D9E316D11B48DCF211327025A", "nonce": 1, "value": "100000", - "gasprice": "2500", "gaslimit": "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method": 0 } }, @@ -58,8 +61,9 @@ "from": "009601", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -74,8 +78,9 @@ "from": "00c10d", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -90,8 +95,9 @@ "from": "0000", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -106,8 +112,9 @@ "from": "01b882619d46558f3d9e316d11b48dcf211327026a", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -122,8 +129,9 @@ "from": "01b06e7a6f0f551de261fe3a6fe182b422ee0bc6b6", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -138,8 +146,9 @@ "from": "01fd1d0f4dfcd7e99afcb99a8326b7dc459d32c628", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -154,8 +163,9 @@ "from": "02eb58bd08a15a6ade19d0989674148fa95a8157c6", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -170,8 +180,9 @@ "from": "02e0c7c75f82d55e5ed55db28033630df4274a984f", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -186,8 +197,9 @@ "from": "02e54dea4f9bc5b47d261819826d5e1fbf8bc5503b", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -202,8 +214,9 @@ "from": "03b3294f0a2e29e0c66ebc235d2fedca5697bf784af605c75af608e6a63d5cd38ea85ca8989e0efde9188b382f9372460d", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -218,8 +231,9 @@ "from": "0386b454258c589475f7d16f5aac018a79f6c1169d20fc33921dd8b5ce1cac6c348f90a3603624f6aeb91b64518c2e8095", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -234,8 +248,9 @@ "from": "03ad58df696e2d4e91ea86c881e938ba4ea81b395e12797b84b9cf314b9546705e839c7a99d606b247ddb4f9ac7a3414dd", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -250,8 +265,9 @@ "from": "03ad58df696e2d4e91ea86c881e938ba4ea81b395e12797b84b9cf314b9546705e839c7a99d606b247ddb4f9ac7a3414dd", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -266,8 +282,9 @@ "from": "01000000000000000000000000000000000000000001", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -282,8 +299,9 @@ "from": "0100000000000000000000000000000000000000", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -298,8 +316,9 @@ "from": "00000000000000000000000000000000000000000000", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -314,8 +333,9 @@ "from": "02000000000000000000000000000000000000000000", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -330,8 +350,9 @@ "from": "0200000000000000000000000000000000000000", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -346,8 +367,9 @@ "from": "030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -362,8 +384,9 @@ "from": "0300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -378,8 +401,9 @@ "from": "040000000000000000000000000000000000000000", "nonce": 1, "value" : "100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -394,8 +418,9 @@ "from": "01b882619d46558f3d9e316d11b48dcf211327026a", "nonce": 1, "value" : "-100000", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -410,8 +435,9 @@ "from": "01b882619d46558f3d9e316d11b48dcf211327026a", "nonce": 1, "value" : "", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } }, @@ -426,8 +452,9 @@ "from": "01b882619d46558f3d9e316d11b48dcf211327026a", "nonce": 1, "value" : "", - "gasprice" : "2500", "gaslimit" : "25000", + "gaspremium": "2500", + "gasfeecap": "0", "method" : 0 } } diff --git a/tools/yarn.lock b/tools/yarn.lock index 51859273..a50950a0 100644 --- a/tools/yarn.lock +++ b/tools/yarn.lock @@ -24,27 +24,27 @@ bignumber.js@^9.0.0: resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.0.0.tgz#805880f84a329b5eac6e7cb6f8274b6d82bdf075" integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== -blake2@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/blake2/-/blake2-4.0.0.tgz#32ae4c3568ef5ee4d74c50b99d774abf8fff4f60" - integrity sha512-PIOc6RXAZYBYcdpyMzI6/SCU3BH8EbmA9vr0BAVyQv48CQTXDN6viHOTM+8KQue2IPsyHNpIR3UDisz8rZDPTA== +blake2@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/blake2/-/blake2-4.0.1.tgz#b66072203b3c7fdf2155906a02db2a07d9496525" + integrity sha512-x154iqs8j4IMyxLyFOYb0tvTw+BZlXR8n1HBf/jVNJw5DGCvMNPl6wxHhWQDzIBHRYSc9sb3nsuM/G9AVO6psg== dependencies: - nan "^2.14.0" + nan "^2.14.1" -cbor@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/cbor/-/cbor-5.0.1.tgz#243eea46b19c6e54ffb18fb07fa52c1c627a6f05" - integrity sha512-l4ghwqioCyuAaD3LvY4ONwv8NMuERz62xjbMHGdWBqERJPygVmoFER1b4+VS6iW0rXwoVGuKZPPPTofwWOg3YQ== +cbor@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/cbor/-/cbor-5.1.0.tgz#c3be220dcbbd96a338d279a664237aed3f596904" + integrity sha512-qzEc7kUShdMbWTaUH7X+aHW8owvBU3FS0dfYR1lGYpoZr0mGJhhojLlZJH653x/DfeMZ56h315FRNBUIG1R7qg== dependencies: bignumber.js "^9.0.0" - nofilter "^1.0.3" + nofilter "^1.0.4" -nan@^2.14.0: - version "2.14.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" - integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== +nan@^2.14.1: + version "2.14.1" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" + integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== -nofilter@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.3.tgz#34e54b4cc9757de0cad38cc0d19462489b1b7f5d" - integrity sha512-FlUlqwRK6reQCaFLAhMcF+6VkVG2caYjKQY3YsRDTl4/SEch595Qb3oLjJRDr8dkHAAOVj2pOx3VknfnSgkE5g== +nofilter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.4.tgz#78d6f4b6a613e7ced8b015cec534625f7667006e" + integrity sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA== From 6800ef61b9e75a5d4ea5862428b08dff23772d95 Mon Sep 17 00:00:00 2001 From: Juan Leni Date: Wed, 26 Aug 2020 18:56:24 +0200 Subject: [PATCH 2/5] updating zemu tests --- tests_zemu/snapshots-tmp/.gitignore | 1 - .../snapshots-tmp/show-address/.gitkeep | 0 .../show_address}/0.png | Bin .../show_address}/1.png | Bin .../show_address}/2.png | Bin .../show_address}/3.png | Bin tests_zemu/snapshots-tmp/sign-basic/.gitkeep | 0 .../snapshots-tmp/sign-proposal/.gitkeep | 0 tests_zemu/snapshots-tmp/sign_basic/0.png | Bin 0 -> 920 bytes tests_zemu/snapshots-tmp/sign_basic/1.png | Bin 0 -> 859 bytes tests_zemu/snapshots-tmp/sign_basic/10.png | Bin 0 -> 669 bytes .../8.png => snapshots-tmp/sign_basic/11.png} | Bin tests_zemu/snapshots-tmp/sign_basic/12.png | Bin 0 -> 529 bytes tests_zemu/snapshots-tmp/sign_basic/2.png | Bin 0 -> 669 bytes tests_zemu/snapshots-tmp/sign_basic/3.png | Bin 0 -> 890 bytes tests_zemu/snapshots-tmp/sign_basic/4.png | Bin 0 -> 953 bytes tests_zemu/snapshots-tmp/sign_basic/5.png | Bin 0 -> 670 bytes .../4.png => snapshots-tmp/sign_basic/6.png} | Bin .../5.png => snapshots-tmp/sign_basic/7.png} | Bin .../7.png => snapshots-tmp/sign_basic/8.png} | Bin tests_zemu/snapshots-tmp/sign_basic/9.png | Bin 0 -> 678 bytes tests_zemu/snapshots/show_address/0.png | Bin 0 -> 1052 bytes tests_zemu/snapshots/show_address/1.png | Bin 0 -> 632 bytes tests_zemu/snapshots/show_address/2.png | Bin 0 -> 334 bytes tests_zemu/snapshots/show_address/3.png | Bin 0 -> 529 bytes tests_zemu/snapshots/sign-basic/0.png | Bin 879 -> 0 bytes tests_zemu/snapshots/sign-basic/1.png | Bin 463 -> 0 bytes tests_zemu/snapshots/sign-basic/2.png | Bin 1009 -> 0 bytes tests_zemu/snapshots/sign-basic/3.png | Bin 517 -> 0 bytes tests_zemu/snapshots/sign-basic/6.png | Bin 651 -> 0 bytes tests_zemu/snapshots/sign_basic/0.png | Bin 0 -> 920 bytes tests_zemu/snapshots/sign_basic/1.png | Bin 0 -> 859 bytes tests_zemu/snapshots/sign_basic/10.png | Bin 0 -> 669 bytes tests_zemu/snapshots/sign_basic/11.png | Bin 0 -> 443 bytes tests_zemu/snapshots/sign_basic/12.png | Bin 0 -> 529 bytes tests_zemu/snapshots/sign_basic/2.png | Bin 0 -> 669 bytes tests_zemu/snapshots/sign_basic/3.png | Bin 0 -> 890 bytes tests_zemu/snapshots/sign_basic/4.png | Bin 0 -> 953 bytes tests_zemu/snapshots/sign_basic/5.png | Bin 0 -> 670 bytes tests_zemu/snapshots/sign_basic/6.png | Bin 0 -> 341 bytes tests_zemu/snapshots/sign_basic/7.png | Bin 0 -> 576 bytes tests_zemu/snapshots/sign_basic/8.png | Bin 0 -> 456 bytes tests_zemu/snapshots/sign_basic/9.png | Bin 0 -> 678 bytes tests_zemu/tests/test.js | 39 ++---------------- 44 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 tests_zemu/snapshots-tmp/.gitignore delete mode 100644 tests_zemu/snapshots-tmp/show-address/.gitkeep rename tests_zemu/{snapshots/show-address => snapshots-tmp/show_address}/0.png (100%) rename tests_zemu/{snapshots/show-address => snapshots-tmp/show_address}/1.png (100%) rename tests_zemu/{snapshots/show-address => snapshots-tmp/show_address}/2.png (100%) rename tests_zemu/{snapshots/show-address => snapshots-tmp/show_address}/3.png (100%) delete mode 100644 tests_zemu/snapshots-tmp/sign-basic/.gitkeep delete mode 100644 tests_zemu/snapshots-tmp/sign-proposal/.gitkeep create mode 100644 tests_zemu/snapshots-tmp/sign_basic/0.png create mode 100644 tests_zemu/snapshots-tmp/sign_basic/1.png create mode 100644 tests_zemu/snapshots-tmp/sign_basic/10.png rename tests_zemu/{snapshots/sign-basic/8.png => snapshots-tmp/sign_basic/11.png} (100%) create mode 100644 tests_zemu/snapshots-tmp/sign_basic/12.png create mode 100644 tests_zemu/snapshots-tmp/sign_basic/2.png create mode 100644 tests_zemu/snapshots-tmp/sign_basic/3.png create mode 100644 tests_zemu/snapshots-tmp/sign_basic/4.png create mode 100644 tests_zemu/snapshots-tmp/sign_basic/5.png rename tests_zemu/{snapshots/sign-basic/4.png => snapshots-tmp/sign_basic/6.png} (100%) rename tests_zemu/{snapshots/sign-basic/5.png => snapshots-tmp/sign_basic/7.png} (100%) rename tests_zemu/{snapshots/sign-basic/7.png => snapshots-tmp/sign_basic/8.png} (100%) create mode 100644 tests_zemu/snapshots-tmp/sign_basic/9.png create mode 100644 tests_zemu/snapshots/show_address/0.png create mode 100644 tests_zemu/snapshots/show_address/1.png create mode 100644 tests_zemu/snapshots/show_address/2.png create mode 100644 tests_zemu/snapshots/show_address/3.png delete mode 100644 tests_zemu/snapshots/sign-basic/0.png delete mode 100644 tests_zemu/snapshots/sign-basic/1.png delete mode 100644 tests_zemu/snapshots/sign-basic/2.png delete mode 100644 tests_zemu/snapshots/sign-basic/3.png delete mode 100644 tests_zemu/snapshots/sign-basic/6.png create mode 100644 tests_zemu/snapshots/sign_basic/0.png create mode 100644 tests_zemu/snapshots/sign_basic/1.png create mode 100644 tests_zemu/snapshots/sign_basic/10.png create mode 100644 tests_zemu/snapshots/sign_basic/11.png create mode 100644 tests_zemu/snapshots/sign_basic/12.png create mode 100644 tests_zemu/snapshots/sign_basic/2.png create mode 100644 tests_zemu/snapshots/sign_basic/3.png create mode 100644 tests_zemu/snapshots/sign_basic/4.png create mode 100644 tests_zemu/snapshots/sign_basic/5.png create mode 100644 tests_zemu/snapshots/sign_basic/6.png create mode 100644 tests_zemu/snapshots/sign_basic/7.png create mode 100644 tests_zemu/snapshots/sign_basic/8.png create mode 100644 tests_zemu/snapshots/sign_basic/9.png diff --git a/tests_zemu/snapshots-tmp/.gitignore b/tests_zemu/snapshots-tmp/.gitignore deleted file mode 100644 index e33609d2..00000000 --- a/tests_zemu/snapshots-tmp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.png diff --git a/tests_zemu/snapshots-tmp/show-address/.gitkeep b/tests_zemu/snapshots-tmp/show-address/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/tests_zemu/snapshots/show-address/0.png b/tests_zemu/snapshots-tmp/show_address/0.png similarity index 100% rename from tests_zemu/snapshots/show-address/0.png rename to tests_zemu/snapshots-tmp/show_address/0.png diff --git a/tests_zemu/snapshots/show-address/1.png b/tests_zemu/snapshots-tmp/show_address/1.png similarity index 100% rename from tests_zemu/snapshots/show-address/1.png rename to tests_zemu/snapshots-tmp/show_address/1.png diff --git a/tests_zemu/snapshots/show-address/2.png b/tests_zemu/snapshots-tmp/show_address/2.png similarity index 100% rename from tests_zemu/snapshots/show-address/2.png rename to tests_zemu/snapshots-tmp/show_address/2.png diff --git a/tests_zemu/snapshots/show-address/3.png b/tests_zemu/snapshots-tmp/show_address/3.png similarity index 100% rename from tests_zemu/snapshots/show-address/3.png rename to tests_zemu/snapshots-tmp/show_address/3.png diff --git a/tests_zemu/snapshots-tmp/sign-basic/.gitkeep b/tests_zemu/snapshots-tmp/sign-basic/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/tests_zemu/snapshots-tmp/sign-proposal/.gitkeep b/tests_zemu/snapshots-tmp/sign-proposal/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/tests_zemu/snapshots-tmp/sign_basic/0.png b/tests_zemu/snapshots-tmp/sign_basic/0.png new file mode 100644 index 0000000000000000000000000000000000000000..f7c9c8452afddc2713e1a20918e80ab7d6dd8d83 GIT binary patch literal 920 zcmXYweMl2=7{@mUBVxabh;qN)Hb<|J$-GSpmCL!NMe&6m_NQZvX^T*<24 zWp9VpoV5~#9Qa4tqO_|xWz>`~6-!oe5Gfh{QASzMPy6HU_j1q6_xU`})$h)=poMs$ zOeRCwS($mT*1@A$poI5mLd80nOmQeXbI0Cl`DE{&;|aE9re0m#|OJHqyIiHNgXp-{=qn*Bn*_qp?p4aD|N~pg%P!~x=;w7ci zO}p;Oi52Yc>{IBUZO_VBnl_Mqz;0I{YAi?U*kBSmuKaG<@Z_=5xl^I{w>h|)ZF)*G z-J$!-z3`<_noeye9P=RlxM%ISg#?-URO_atD$A@qG)>$jSuEph!-Z|fot zifQTks+rdyaB)#}L0rGD{A-VeiY8%qbF58?-CZ`wUP_GxV=YYBaEUpHXV2?u4Uj4s zv)x%PN>h0~0vR@mr*B346;2-$1X+aw+ui0cNo@=$YT|5|i8NxsU?jqi%9qHHIyC20XeAQIf^z=C)qo>KjnnUWl+HC@dJ5rKL`%>B@-f^O z4K=DzxKA_fwxs6^tQwhI0L{!WUML`pp?RGL1h%FXnz%8pKe>dKeDF9h8<6vtA!4k@ zS8k?H4w0<&@eGn7b(;45_p)$m)x7d z5Cw+mw`3 zz`>D?SA|v>RQ#Lu&8c3c^Cb8NA!Na#-#>?D+nk&EFyrvqe+wUq Ad;kCd literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots-tmp/sign_basic/1.png b/tests_zemu/snapshots-tmp/sign_basic/1.png new file mode 100644 index 0000000000000000000000000000000000000000..f6b4430d622c74d521dfe6be486873a83a6ce2ed GIT binary patch literal 859 zcmXYwZAepL6vwv)Gi5g^quecZzV|^gu6JcAxSFq6vwSISnvI_3-NdpiTV*muuH>9; zV#X>ou_>aYA&N3fWF%J^G&Mv;(jo1GX=r|Mf>7rXKis$fbI$Xe|L>gp@~R?*@F9J8 zJRXsjnwSYsJzSE5Lbxx4l!o(of{?Vti`hE<`j|3PnRhgCET>Mn6;%2n+u*kzke}}F z6oeWsZ;l40RSVJA0oIRdoj!vYe=3qRwW+u$Lhe>-W$q`dhf^-Bn!^H<1=Mkk%-thI z@CGqrf~!yx+(@~pChXbA_QCiOA<1|)>qJCv$q1vH3Joj}Q0;unJ8dosY!E@@oG!Rs zh+1y#$pIEC-%>lRcSL(tn%i7mQpwhLIBr1DJK@}DB27C*pxBH{6Y;c|WF56qk(e~i zYy2r+x%(vlmslz(%Obe=Mq|-zAD3@+UGqMb&@x-4)D8`^HpY`lEKOAfWt6PkBw(W$ zT&`RV*^y*9_Ly!5A(B*Jn`+IRd0r!9+2DR!WSQy?ELT(Q! z>oSfexoaHY{@dO$5nFdrGu!)UIj*tIrKRYRZob99Ib{N>u!Ao~%+QZ^bQg?cC^K zGm7Ulo?S^pyCKlWXaHY2GP%Opfy};ES8Ea3EJ4HJ}^p05eDdB zJs_IVi-`N$JqltXj%o+BID!=xruzIPQ`U$uDlJ(O>|P)+B}~*OR3FVnK)^u_p^0C z%@;OI_*rCRqVV}yYdG)vs>7Qn&6E-|lE2n)=7NE#g0V@>j5Aj@OqeMJRrRVh+$hW8 zS*8h(k@I1BQ-#m&yxcPvK3v!Kf6c>{K<=|vbC6*oDH#zbcz7qDxzKPX)~NjC9o5eQ zKxHd|Quhv48=2I21M$qZ{H2UD?{jLLUzDh93~^oBWuOM2zAFYN?_Aw5K@#W|=fh6V zBsnyu|Bq)jI{)lJQ5Mswr(5{!oSAw5uWD@bW#*mDCS}HJk|ULI!{ow-%ms;;9S$$U zCh;(ky+6x=O;YL|m|Vt|GGSpNm6&pc1(sWzPp_1X@p}t&BK!1U;Q+a-1}A)YfvEY+ zqQnW2z#!{xb41CNmj(0CxzzZ}!@x?Kpn=KDG9oOA8q(<^n1N)lehuXX%{fXR-*)78&qol`;+ E0D}S*9smFU literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign-basic/8.png b/tests_zemu/snapshots-tmp/sign_basic/11.png similarity index 100% rename from tests_zemu/snapshots/sign-basic/8.png rename to tests_zemu/snapshots-tmp/sign_basic/11.png diff --git a/tests_zemu/snapshots-tmp/sign_basic/12.png b/tests_zemu/snapshots-tmp/sign_basic/12.png new file mode 100644 index 0000000000000000000000000000000000000000..66b03316d994c8024e78bfec91f8802f2279adfa GIT binary patch literal 529 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfiWmba4!+V0?QpFz<1gh|9st zEmi-y-}TEqR8lw-QTC>D%7xDns{bxod&XQ_bgyvv?t7k(Ht{h&U8lS2^;{Lb>>Cw} z%VVY~EtunY*xJa1XXZtNl(;NBI8l9b zwuI4QMoFnMqx!Di&6x`xo|bCk0ZN$gNTy7Xq3)mh}CrAJ(7P({je~@YDIZe^QL(CslepQ=BQ9`=`WcaU&bhL=f3_CPTt#wNSvm z#SepxOlmxy70F4TS8--Gnm#}Av8a^Z|IKafQul6Eh|N?iwgkF^PijJC_Txw?x5H0W zQZgiXPyD%iZ1V}8nWsBXTxd9>Y(8%(P*I)t;l?wUO?hT6JyDbLI41?D_-md`GY_x+ z^#TQBpy&9c?qy0C?QT=t+|`?&;n3DL9mqY=)27%A^4oQT6h5FHpu@Cxe$?Uh2L@9a z@9ws8DY>j2HF;q3oQ+N>0L^n|o0&f`^6oKzh0oC``<4KM(#^rLxlPd+=&yAT9nwtp zC~wZTm~hkdO-h*Zf;DS^3NjvV+R{4}=(bQ!jp?bmG1ImcM&8n2F!^Bcv2}a)0Hd10 M)78&qol`;+01JlXApigX literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots-tmp/sign_basic/2.png b/tests_zemu/snapshots-tmp/sign_basic/2.png new file mode 100644 index 0000000000000000000000000000000000000000..f5a4b0b347a0647703fcfc34f60a69bd35aa3069 GIT binary patch literal 669 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfgTfx;TbZFupw)SajKe!R4U2 z*4e-OHuBAzS)&7UJamMTluNtkS1EEzO{mP^4NrM@$>8J#gOf3t4sC6oX&Ez8hz-yjUbYsX~hP#G6YEXMA~2`0$ip4<=u3lR+tqo}BO^|&+R|2gJXErja@i^Re#_e#v zsgF_cVHIZ}Vm1l}qxvf!Lc_jg%}AL5^bF7dAlb{7VwSSbL}ByAhBNu5JVw$Wr63JJ zGk`8v*{o=M@$G8g|DO)yI&z_ND=L6J~HfiC*Wx#;tXM9=`!M)r$+Cui$p_doL{Mxq_ zh44xnxo;^70XjKwtxV`)PO&~8wwcNxC8s8u%FG3YcI)MZe;ID+3U67Z?HB+|b_|}b KelF{r5}E+O#RnahHW6V8a=5@ zXDQ0T(kyf>NhAZ;9}zJj^J54FDEj%kg{f#O8wb8{nr)Ub5w(cxhw(Lpsy%Uo4a;Km+;#ii$+9`C6Vc`qH>?x(EZ81u1 z40C4E$PBgpd~E<*Lw%$?IJA#VHdOCrj-rMUuhyiEdNpIRVM!T^K)j(k8l8;mrsVe5 zi%Bfk_9uf;f0xY`ptHC1j5##JNt5nq)R0hp)BF8LdzdplpGLM<-!AnEzCnjFvVQN$ z>G2J59d&rbL^CPnkL&QGFit!?W>Ulnx2FaF4OZqVtz0I}@WXv$kh3xsD4@|%^pui& z2;1A5XmYttE}P31a@;*K=GAPI0h=<~rxpkM5|%D74kf;yHzaW&U5!(WMh>NkFnfZH z{g4a~+TF7|NF!Z>59Dja)A42+EyVw?00@U-Wz^yiq;-%33X?#*v_m_rfE#i#>O(jj zum*^*a_3CRffzfDN%{_lb`RpcO-dko0H3P^QP8#eM)Y=xX=Q+TY1CLM$3$`c{S zk_gDHP6BWtf&eX$dV&BYLcTOfBK>OOX=e>_!l8f@e&7Ixe>|UBuZe*|8l|`cMKp@b zBw97!WtjobOqNp&$a?hV1jY+rZ#?yN2xE%<@T3F pqk)Y%O}&(S4CGw+a>HLSAJ^IV;3}O~ei8mDo!y#k>CHG-{|~ANcSryL literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots-tmp/sign_basic/4.png b/tests_zemu/snapshots-tmp/sign_basic/4.png new file mode 100644 index 0000000000000000000000000000000000000000..c4894d6d523214f6a93f7b9ffe422ef71f97da11 GIT binary patch literal 953 zcmXAoeMl2w9LKi~hQyxi1#P=Z=ayI@Dc4Pl%4XB_GNxG;;_KkF&C&)7T_$=3orqee z_QEPNwTLpykm%Jcu9qt=TV_^c1uM9JdKLdj!J^+Y;qH03=Xrj==llKqe%F*^%RqC< zxhjE)SVvnkH-bMrh>?{#}Q@v$!J&IlZfZ{syo6q zs?$lxlyzHsl8k6ja!n zpYP}n2E7`#{(*)q_Ins5qYab>3Pk~Ob@DOp8n)PUVZ%%bK_$QAj#@ zloM6ozbUX)v=N9tHtq#>>d~+cPaZ+hOPx9@OB@{le(NbXaLJyb zw6|uFLO!{LpnC0>F7a<9jG4jkz ze%@B@ywk)dw?Pnp#Y~2NrAJijc>t&aqulC3m?HiRAr$N zYLgFQPimnELU-^LE_t&S-KfxkJV~o3c@V|^GtYTB+@tn3e)}5??hfGtE{QCd$P$mq z=@8sU3U`|T`u5qSp@lgqI|ynI7}zyCxsg=Zul9D8el?NR>_~-0>EUCn7)}en+x%UE zbf*ABGrp0N8LZwAY9PSE$sp_3&52?RtHx;o|ARmXM)2bJ0QPZ*meXJu6M`ICycv3M z-THu9a3~2Y+CTogjI_1qgWNN+V`{#hjD%)6?w^7}oP#!5;7y1fq-R!8(YGe_q;Sxa z%Jb>UDtv(y7=3o=h0m2MLaY|*yj)MFTnlE3f*u#w1S>`iEFFLSnV(Yy6)SiendbSD?*CtWgiI7Z7x0Fs)a`ClbUr*`=cNW7Ugxw-2_yci z4QH}nNv2!9o~bg=iP@+=hS?}T%OTA~p?E3d%!>_Y4x1``UhONSU$t!WJkLj&raUv3 zCZ6bN<2EwknHf8AA>&MWvpADIFC_0bp2+}dGfr`1Hu64vR!VGUxv7qkzjqs3N?gvK z34zQ;{!1S=opC;)!wW(&6C$N1RC@8A__N_-GY{_x8{V0R#j_lqg{#-8Iv;+he+B3+ z>GdaTv_Tf>Uo}XX#+IT7WG+|!EXMfsLol;Z{3^zo>01hST-$Ksk3R2tKL^V<*E-!Z zDrT@rxiRya+*y-ovS;Y)b#!|q*Ge~heJV6rdjh;5e z&%1MKrU5?GxPIoGJ(46gk~;HRQ{X=GHY?7@@5kSW2rdTv`mLI zlReUsQWGkR9(VRgP58N5s_jfhMIf`0epWP?lV9q zFHfnPeMS=~xVQQJ$qOGcPh2SY$;*4<&x>RIDffDLc=uoV;B#2%vw$SfaqT8G9!B=c z3u63UKPbv#pB}vXqZrVZZXjNkcp`^rN(X4QGRqWqkkcnrE@PZ|u>t6mG%y$9bvK~j z$QAzV!)&y^w7_y}^XZkcF?Q?OQsfE?e$D~fbmidF&zTO-bU8Hovm`*_=Y4p>O%tA( zzC=@?kdIhoL-tsb_71Hss!1&9QFq++_`1$Hx3+9>WQWM}_h`)L8>6N@Wj)#?s zf1dAM@0XUj;|)ZkDdSV^?1&UIUgxyS1}Xcj7@rnJ0mJh*`}!{mwfDdI+X2%bgQu&X J%Q~loCIBPdB}4!K literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/show_address/0.png b/tests_zemu/snapshots/show_address/0.png new file mode 100644 index 0000000000000000000000000000000000000000..40074695cf0c07e24cff40e4efef993142418bc1 GIT binary patch literal 1052 zcmX|=eP|PB9LEz5PFM4Y%u&s?Y7*8?h8yL2@dZ0QO;T;^GKovq(iazYgftaRDOfu; zjgB4EI(Ka`FM>}=vLReU#)y;z1B6Qy;$o{yO=eg&8 zzvuh;exI(r-d&`CD=?W%q-wX@hi4R*Z7GZU14pF9WMZ;a?j0W)8SHECOjz^6|Sj;sM{p@|bwyx%DG)H?nY9X%N z+eCjkd*#-&zu}<6rG>=YKBvv4rEFgqV^O1u=o@$)W4{!7@vyXO|3dZm3)QcmzZlR@ zu~H?2I?B*)t)KITX-%b`lZ~-5>0WQ=dMl^Qf08}6aI#?}ef`zyb&mEQ@Ef`Wg&8^* zlh>$>nkaQK{H+5oOS^`9;+b)$EvcuY#_vwLSuewHY7ui6%qoP;-M!N>@z1ohT#B($ zp?bxv4ntNc6ih9fI%nba&t9`~ho#V9KPw%?_NO+k^~kb4IUea@CCrPgmGkz-GcGCg z|91VHvIV16eOo-@{J*P-UeUMeXhkhUMt5R7`e~+?2s1)Daz^gsLKiZRxzOgTnHpy? zroR2EArIF=I!ekpWvH8#2AZ`U44;}DtkuS@gWX%s89iMlE$5WZecEx#CMMfm^cxgH z+g7rKrzqq#;PqPzxBzyjjw@7K4>Z=uth8+prjkN2ZA1%RGE>>-C^`>5%N95UTi;9y zwsLAnw-Ks?&|tn)yA5DdlSe9vUQCyP_`UE89~lj1ts~e#)5s&g=9mk>x_VMW&2Qc~ za0VrRx(c+t@jy>!pV6elKMQU7xFtKB2L~BSJV0}y4ApCjmAHb5jJkCF_IHsqs1j_{ z=e4t6u3Hq$f8E{Qn&q%Wu&5otQPIfoOUPFKqgF9@O}4lD82bECv(iys>%L;%2%Qn4g3SVCl_0aEQN@v7`R32ZJeAx=CoR z71@Jx(`}Sb4knN^oEyj73aUD0ye|!m+;QR|r6h5as?Ckl$?&rrSwehtO45vbo9QZj5E{K=Yd?~oVmk#Cb!XQkV+t72bAGARrsvSdt%R)50iL! z`CZv0Q~rq?ndF?f@L?fP!Ig$H+kw{H>b#!v&Z(_Uar4E3$!sZRK$o&fO0Ao;@L@10 zOjZLWvLuY=UorrB!RhdXoiopvGM#$(9>`OVwD=RtYw|~g=~Uu&zc-GD+s;e}df2@@ zi9f~d@N}T&?+KZ0Vtm(uX5OCrBNybd_dsW@ZUY9gV_VzQ zGZPj*6y(&X2I{O|$2ik{L&1%$t%uifYP8>tvUqdrP~vqlzTMj(g1RzgxeqsFbGOGv c1Eu6YIelL}@m>F4V2Wb!boFyt=akR{07p_4p#T5? literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/show_address/2.png b/tests_zemu/snapshots/show_address/2.png new file mode 100644 index 0000000000000000000000000000000000000000..9c74268512a23aafb8593c178d33cd633316e2e4 GIT binary patch literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFffXGx;TbZFupx_F-sUvo|uNIdc2=s`7scV3~7%;QxyrcKn3Df#Fsl+DNZEJ-@HX5x`qia(n5*95Z6 zFb&(_#(gd0pp}3B6)-&avuUJI|tCTv+@ue#e2MEA1-M_2j0Qi1T~R>Sk9x zdsN-4ps@JjlsPU9mJ_?D10{S#gm>-$N}gr)iVONQX;OahCq9-Lmw|fafJU4>+C1smBS+8T zj|-OU{NZx)>`~v7o-8xIngVUw%?Wa>Z$o4<#I%Ixl`ubGI5Bv- L`njxgN@xNAj>U`8 literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/show_address/3.png b/tests_zemu/snapshots/show_address/3.png new file mode 100644 index 0000000000000000000000000000000000000000..66b03316d994c8024e78bfec91f8802f2279adfa GIT binary patch literal 529 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfiWmba4!+V0?QpFz<1gh|9st zEmi-y-}TEqR8lw-QTC>D%7xDns{bxod&XQ_bgyvv?t7k(Ht{h&U8lS2^;{Lb>>Cw} z%VVY~EtunY*xJa1XXZtNl(;NBI8l9b zwuI4QMoFnMqx!Di&6x`xo|bCk0ZN$gNTy7Xq3)mh}CrAJ(7P({je~@YDIZe^QL(CslepQ=BQ9`=`WcaU&bhL=f3_CPTt#wNSvm z#SepxOlmxy70F4TS8--Gnm#}Av8a^Z|IKafQul6Eh|N?iwgkF^PijJC_Txw?x5H0W zQZgiXPyD%iZ1V}8nWsBXTxd9>Y(8%(P*I)t;l?wUO?hT6JyDbLI41?D_-md`GY_x+ z^#TQBpy&9c?qy0C?QT=t+|`?&;n3DL9mqY=)27%A^4oQT6h5FHpu@Cxe$?Uh2L@9a z@9ws8DY>j2HF;q3oQ+N>0L^n|o0&f`^6oKzh0oC``<4KM(#^rLxlPd+=&yAT9nwtp zC~wZTm~hkdO-h*Zf;DS^3NjvV+R{4}=(bQ!jp?bmG1ImcM&8n2F!^Bcv2}a)0Hd10 M)78&qol`;+01JlXApigX literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign-basic/0.png b/tests_zemu/snapshots/sign-basic/0.png deleted file mode 100644 index 9ea9bf785e4761d2132243b277a3d649f56468eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 879 zcmYjQeMl2w7~i-!O!ro_NOwdXYYk&%<94&4pqnmiHPif>XekljjQ{)|AXO73QA|Qt6Eu(vn6scigr@DqG9e9!7tozd?UPXH2Os^lgL7n6G<_j zybq(&30@%hh6*G#oeN$yG(H-5w(cl~=m}@yZK!>!L%ZSEjgA@y*RkG9e;AHi+PbLs z51I&m2=G%hIrmC?>Z_Hk-=R2|t_|btipOf<+tx)|iGHz$N#uxz`V{JON@m{^wQvNU z8q)fD-26h2>sVblc{Dy8A#kDH9c)NNChGc#IXaWijCZMp-PKH@lP2rENSdi~cXRE4 zDG^)bQD0K}^%e*~ALfVP?QNX(GM;LN!`U)|2WL8>jD^c15YCY(2G76C$M%7x&S3y`#^ zMa>F_D>nkz64jvXAtjl-^0ECGwRA&%$9gl^I(@E4*4rTTg-<@YW6MmZJ2>PJODTGy z2Tqlu5ryQ@)1`{VNfnC*i`7Z}UR8LrO)aD$sfQ*9p5yET=;pEW)88L1&ph>Z#3#G% zk5!5uWI`9K+Aecxh&~zbcZh@hxaf~Wo4Tg1$Sra{aKPI*u2ZdJC*y19<32fNj>gQi zMk%`(gV|^S3tU}R4O9{XO09=KnWIjWPCN}Bs>(=`sTMlbLS)OXyRrdbVP$m4ByG)d zQbW#4OZxQ#A3>Rw@0$Ol>AE%$pY3J&_Nih-#~@21l6G}#1BPY|DsbRJI7;S<1!tyr zO0n4!u%I_RQjEclr7BJ4tU;D7}%>PRUCodSBw8?O2Yx8^tWYu`{ zo~T(8SGaU_oaZAGsR=(dc~96}Z8&qK;Y>4I$}+Z;eQViL@__a)3g4A=`laawhr?yg zZEexb=Dhh;M{k-cH1iml1fi9&I9fp=S*s;R=~m24?~%Nb|(>(!_fXBnCJ7{y-$x(sM3&{-lW^8^FJfG)@f z>Y5o75qa40*>saRQyVtvW^b^)?r?ay)VZ7wtEBd=dFaP%bfU)V*%_88#@RcRoe#^- z1Y$|4f0NH#F*qp$bi``zbai7>nUoBNv@9U9I03W+Xfn`ke7x%)9lB}y$CP*dvqRbw zEKU9d8m&*;p!@cac1Fdjhd__<{s&T@r||GjKBFxFcF-%f+n0cdWlC;jb8aRs^q--n Xc%5d=wfR?o5yjx?>gTe~DWM4f0?x_A diff --git a/tests_zemu/snapshots/sign-basic/2.png b/tests_zemu/snapshots/sign-basic/2.png deleted file mode 100644 index 3735a4221615583f83c203c5baa4e8c68820fea2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1009 zcmYLIe{2(F7;b5DA@n|`(J1{!x~?fxL7_SBL=%VIS{bXgL(7;Nsm@%QYx%WgMm9>| z1bYc1#?zTdfXOmp#$-NMP;>8nzwZ6s z=Y5~|xntYHZDa*qVX;_9`_{lKm}R`KTL2bZ@^R9eJHsXS7{+Edj9PjF- z+?zogcV<#HZb$Ea!IF+TpnXr(#qz|E_|wA<+LZ3NEE`)iPw!gp^76+!marS9>a(X( zXTDWhX8rWnu&@8G@1kQ}HWINBemqm%N%kfBB3hO1O`LpB@$*HmQ1sczCgHiat4^Y4 z^$-CA2L}{Qm~(GLE;&YgTHJiao)lQZ&rQijC*g~^67F;fuHH^W&GI2qPxLn?akeip zEv=#wLXUJyCxKRvC;8Oe8o!PEvF6W3w2Ew0a+l0VCfW?PSj~9g0vj|cGK=c-C2zrX z?`R#-=g#$f!ieFQ6qNM<(N~9KiRrJc>Ew9N`;54QDhySWx?MnCMK^y197zS+#H z&tMg)8BkfW4kUDvu0octrBTee^Dk-xEb(h*#c)LVmt>aIo3MUpqxli%eL5h{`=1Ty z4D^K%?H*14jV6Ug#alp`A#xPs|JFcG;ys7F%VAMOO6^p zl)d`F)2UM?D<)_?vYKx+Czcyz;qU}R4#E6Q>~|6;#Fgb-qhI?Bwb#fDas2p5H*|h$ z3W@y7V4d}PChm)&bHmp32aLE9f^DSgYarIV+Fu9< J&bGdF81afUps%?b*LrPvw@4#Y+l~SVDm`}7-#BV|KRX!ezrtPhD3^-iGuTCh0Q?Dz7S?3 z{gu*Yw@Q>doiiMs?ay|27Rq~qhxdd{hC>=q;Iyg2=Q~=Rv-7sRbQ5a7YH;F>6x+;& z5Bqp{o6jsgaiQVN!akXt@&5p`Tw$ zu}MlzsJvisLZ<6XHp`Tk)7et&LYa-+w;0)G-8lJYYTIJrfMutnX2_Xda5$WATEnh= zc`sYazZDO6M_6>XElkXika}kVl$y&Xm9gNVGsr9lW?qvyM^BXloda})g0Tq@@fbNX z8?B!tDRnOCsZL79jgve^CT~*gTFKWlm$Q*x!U(CEOC$Q#pE9f{vNiG}xs&5|~0qw>s%6E&+DXD+|ea3=kgX!x#I zQ&r@Gn2q+YW1JbwY^1-Eab~~Xq>9Vhv0uG}{Ff&x8cUTK{r5iX*T$Ao#%n$E;)cnU z8b&4xpWhvt-DbY`QRK-tQesB-YM+;~rHJvK=xJ+Lab`Bk*V{8OklDz8aUxJ8-&EoA z+P1l8Vx{Dwn2p}+?U}p~XupE9*U2izEjucme{I@Pq@pCZKsh1nf{Mxqxt>9h{ z6xp0DVbtBG`1zHdOyikeB$sR7wvfHms+@7-xU6EIq! ip|)B$z^@(TVtcW>0-Z^^m1}{CjKR~@&t;ucLK6Tg)EcS) diff --git a/tests_zemu/snapshots/sign_basic/0.png b/tests_zemu/snapshots/sign_basic/0.png new file mode 100644 index 0000000000000000000000000000000000000000..f7c9c8452afddc2713e1a20918e80ab7d6dd8d83 GIT binary patch literal 920 zcmXYweMl2=7{@mUBVxabh;qN)Hb<|J$-GSpmCL!NMe&6m_NQZvX^T*<24 zWp9VpoV5~#9Qa4tqO_|xWz>`~6-!oe5Gfh{QASzMPy6HU_j1q6_xU`})$h)=poMs$ zOeRCwS($mT*1@A$poI5mLd80nOmQeXbI0Cl`DE{&;|aE9re0m#|OJHqyIiHNgXp-{=qn*Bn*_qp?p4aD|N~pg%P!~x=;w7ci zO}p;Oi52Yc>{IBUZO_VBnl_Mqz;0I{YAi?U*kBSmuKaG<@Z_=5xl^I{w>h|)ZF)*G z-J$!-z3`<_noeye9P=RlxM%ISg#?-URO_atD$A@qG)>$jSuEph!-Z|fot zifQTks+rdyaB)#}L0rGD{A-VeiY8%qbF58?-CZ`wUP_GxV=YYBaEUpHXV2?u4Uj4s zv)x%PN>h0~0vR@mr*B346;2-$1X+aw+ui0cNo@=$YT|5|i8NxsU?jqi%9qHHIyC20XeAQIf^z=C)qo>KjnnUWl+HC@dJ5rKL`%>B@-f^O z4K=DzxKA_fwxs6^tQwhI0L{!WUML`pp?RGL1h%FXnz%8pKe>dKeDF9h8<6vtA!4k@ zS8k?H4w0<&@eGn7b(;45_p)$m)x7d z5Cw+mw`3 zz`>D?SA|v>RQ#Lu&8c3c^Cb8NA!Na#-#>?D+nk&EFyrvqe+wUq Ad;kCd literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_basic/1.png b/tests_zemu/snapshots/sign_basic/1.png new file mode 100644 index 0000000000000000000000000000000000000000..f6b4430d622c74d521dfe6be486873a83a6ce2ed GIT binary patch literal 859 zcmXYwZAepL6vwv)Gi5g^quecZzV|^gu6JcAxSFq6vwSISnvI_3-NdpiTV*muuH>9; zV#X>ou_>aYA&N3fWF%J^G&Mv;(jo1GX=r|Mf>7rXKis$fbI$Xe|L>gp@~R?*@F9J8 zJRXsjnwSYsJzSE5Lbxx4l!o(of{?Vti`hE<`j|3PnRhgCET>Mn6;%2n+u*kzke}}F z6oeWsZ;l40RSVJA0oIRdoj!vYe=3qRwW+u$Lhe>-W$q`dhf^-Bn!^H<1=Mkk%-thI z@CGqrf~!yx+(@~pChXbA_QCiOA<1|)>qJCv$q1vH3Joj}Q0;unJ8dosY!E@@oG!Rs zh+1y#$pIEC-%>lRcSL(tn%i7mQpwhLIBr1DJK@}DB27C*pxBH{6Y;c|WF56qk(e~i zYy2r+x%(vlmslz(%Obe=Mq|-zAD3@+UGqMb&@x-4)D8`^HpY`lEKOAfWt6PkBw(W$ zT&`RV*^y*9_Ly!5A(B*Jn`+IRd0r!9+2DR!WSQy?ELT(Q! z>oSfexoaHY{@dO$5nFdrGu!)UIj*tIrKRYRZob99Ib{N>u!Ao~%+QZ^bQg?cC^K zGm7Ulo?S^pyCKlWXaHY2GP%Opfy};ES8Ea3EJ4HJ}^p05eDdB zJs_IVi-`N$JqltXj%o+BID!=xruzIPQ`U$uDlJ(O>|P)+B}~*OR3FVnK)^u_p^0C z%@;OI_*rCRqVV}yYdG)vs>7Qn&6E-|lE2n)=7NE#g0V@>j5Aj@OqeMJRrRVh+$hW8 zS*8h(k@I1BQ-#m&yxcPvK3v!Kf6c>{K<=|vbC6*oDH#zbcz7qDxzKPX)~NjC9o5eQ zKxHd|Quhv48=2I21M$qZ{H2UD?{jLLUzDh93~^oBWuOM2zAFYN?_Aw5K@#W|=fh6V zBsnyu|Bq)jI{)lJQ5Mswr(5{!oSAw5uWD@bW#*mDCS}HJk|ULI!{ow-%ms;;9S$$U zCh;(ky+6x=O;YL|m|Vt|GGSpNm6&pc1(sWzPp_1X@p}t&BK!1U;Q+a-1}A)YfvEY+ zqQnW2z#!{xb41CNmj(0CxzzZ}!@x?Kpn=KDG9oOA8q(<^n1N)lehuXX%{fXR-*)78&qol`;+ E0D}S*9smFU literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_basic/11.png b/tests_zemu/snapshots/sign_basic/11.png new file mode 100644 index 0000000000000000000000000000000000000000..4aa28b6bfdc9668cf49edfe790ea290941e99f83 GIT binary patch literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfcZGx;TbZFupx_ah0?ugY&_~ z$A10izt(JIlDMPq?NOb^iaW8Yb*~+TZbw~VW|ys+aAX@F2fe%lSYt`0Y+ znckRYhK6=bVw2joKfOSdcX`{}_d7oFO39t@;pIUI^X^2+-^OFnU-frt0RpUe+0rTmOe%#n(lRO$IlbLR3C zkdc#Srr1pbO4}Ik;F>x4Ofav$=^ocKphfqTj7={%96mmw($!(-t~SqSj)zq?+e+nl zOXqkC2W(5_-L@2t?*3roEl;_3so~5iw);+Ok|`M#-Dmz^`k?^21W{l Mr>mdKI;Vst03N8v5&!@I literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_basic/12.png b/tests_zemu/snapshots/sign_basic/12.png new file mode 100644 index 0000000000000000000000000000000000000000..66b03316d994c8024e78bfec91f8802f2279adfa GIT binary patch literal 529 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfiWmba4!+V0?QpFz<1gh|9st zEmi-y-}TEqR8lw-QTC>D%7xDns{bxod&XQ_bgyvv?t7k(Ht{h&U8lS2^;{Lb>>Cw} z%VVY~EtunY*xJa1XXZtNl(;NBI8l9b zwuI4QMoFnMqx!Di&6x`xo|bCk0ZN$gNTy7Xq3)mh}CrAJ(7P({je~@YDIZe^QL(CslepQ=BQ9`=`WcaU&bhL=f3_CPTt#wNSvm z#SepxOlmxy70F4TS8--Gnm#}Av8a^Z|IKafQul6Eh|N?iwgkF^PijJC_Txw?x5H0W zQZgiXPyD%iZ1V}8nWsBXTxd9>Y(8%(P*I)t;l?wUO?hT6JyDbLI41?D_-md`GY_x+ z^#TQBpy&9c?qy0C?QT=t+|`?&;n3DL9mqY=)27%A^4oQT6h5FHpu@Cxe$?Uh2L@9a z@9ws8DY>j2HF;q3oQ+N>0L^n|o0&f`^6oKzh0oC``<4KM(#^rLxlPd+=&yAT9nwtp zC~wZTm~hkdO-h*Zf;DS^3NjvV+R{4}=(bQ!jp?bmG1ImcM&8n2F!^Bcv2}a)0Hd10 M)78&qol`;+01JlXApigX literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_basic/2.png b/tests_zemu/snapshots/sign_basic/2.png new file mode 100644 index 0000000000000000000000000000000000000000..f5a4b0b347a0647703fcfc34f60a69bd35aa3069 GIT binary patch literal 669 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfgTfx;TbZFupw)SajKe!R4U2 z*4e-OHuBAzS)&7UJamMTluNtkS1EEzO{mP^4NrM@$>8J#gOf3t4sC6oX&Ez8hz-yjUbYsX~hP#G6YEXMA~2`0$ip4<=u3lR+tqo}BO^|&+R|2gJXErja@i^Re#_e#v zsgF_cVHIZ}Vm1l}qxvf!Lc_jg%}AL5^bF7dAlb{7VwSSbL}ByAhBNu5JVw$Wr63JJ zGk`8v*{o=M@$G8g|DO)yI&z_ND=L6J~HfiC*Wx#;tXM9=`!M)r$+Cui$p_doL{Mxq_ zh44xnxo;^70XjKwtxV`)PO&~8wwcNxC8s8u%FG3YcI)MZe;ID+3U67Z?HB+|b_|}b KelF{r5}E+O#RnahHW6V8a=5@ zXDQ0T(kyf>NhAZ;9}zJj^J54FDEj%kg{f#O8wb8{nr)Ub5w(cxhw(Lpsy%Uo4a;Km+;#ii$+9`C6Vc`qH>?x(EZ81u1 z40C4E$PBgpd~E<*Lw%$?IJA#VHdOCrj-rMUuhyiEdNpIRVM!T^K)j(k8l8;mrsVe5 zi%Bfk_9uf;f0xY`ptHC1j5##JNt5nq)R0hp)BF8LdzdplpGLM<-!AnEzCnjFvVQN$ z>G2J59d&rbL^CPnkL&QGFit!?W>Ulnx2FaF4OZqVtz0I}@WXv$kh3xsD4@|%^pui& z2;1A5XmYttE}P31a@;*K=GAPI0h=<~rxpkM5|%D74kf;yHzaW&U5!(WMh>NkFnfZH z{g4a~+TF7|NF!Z>59Dja)A42+EyVw?00@U-Wz^yiq;-%33X?#*v_m_rfE#i#>O(jj zum*^*a_3CRffzfDN%{_lb`RpcO-dko0H3P^QP8#eM)Y=xX=Q+TY1CLM$3$`c{S zk_gDHP6BWtf&eX$dV&BYLcTOfBK>OOX=e>_!l8f@e&7Ixe>|UBuZe*|8l|`cMKp@b zBw97!WtjobOqNp&$a?hV1jY+rZ#?yN2xE%<@T3F pqk)Y%O}&(S4CGw+a>HLSAJ^IV;3}O~ei8mDo!y#k>CHG-{|~ANcSryL literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_basic/4.png b/tests_zemu/snapshots/sign_basic/4.png new file mode 100644 index 0000000000000000000000000000000000000000..c4894d6d523214f6a93f7b9ffe422ef71f97da11 GIT binary patch literal 953 zcmXAoeMl2w9LKi~hQyxi1#P=Z=ayI@Dc4Pl%4XB_GNxG;;_KkF&C&)7T_$=3orqee z_QEPNwTLpykm%Jcu9qt=TV_^c1uM9JdKLdj!J^+Y;qH03=Xrj==llKqe%F*^%RqC< zxhjE)SVvnkH-bMrh>?{#}Q@v$!J&IlZfZ{syo6q zs?$lxlyzHsl8k6ja!n zpYP}n2E7`#{(*)q_Ins5qYab>3Pk~Ob@DOp8n)PUVZ%%bK_$QAj#@ zloM6ozbUX)v=N9tHtq#>>d~+cPaZ+hOPx9@OB@{le(NbXaLJyb zw6|uFLO!{LpnC0>F7a<9jG4jkz ze%@B@ywk)dw?Pnp#Y~2NrAJijc>t&aqulC3m?HiRAr$N zYLgFQPimnELU-^LE_t&S-KfxkJV~o3c@V|^GtYTB+@tn3e)}5??hfGtE{QCd$P$mq z=@8sU3U`|T`u5qSp@lgqI|ynI7}zyCxsg=Zul9D8el?NR>_~-0>EUCn7)}en+x%UE zbf*ABGrp0N8LZwAY9PSE$sp_3&52?RtHx;o|ARmXM)2bJ0QPZ*meXJu6M`ICycv3M z-THu9a3~2Y+CTogjI_1qgWNN+V`{#hjD%)6?w^7}oP#!5;7y1fq-R!8(YGe_q;Sxa z%Jb>UDtv(y7=3o=h0m2MLaY|*yj)MFTnlE3f*u#w1S>`iEFFLSnV(Yy6)SiendbSD?*CtWgiI7Z7x0Fs)a`ClbUr*`=cNW7Ugxw-2_yci z4QH}nNv2!9o~bg=iP@+=hS?}T%OTA~p?E3d%!>_Y4x1``UhONSU$t!WJkLj&raUv3 zCZ6bN<2EwknHf8AA>&MWvpADIFC_0bp2+}dGfr`1Hu64vR!VGUxv7qkzjqs3N?gvK z34zQ;{!1S=opC;)!wW(&6C$N1RC@8A__N_-GY{_x8{V0R#j_lqg{#-8Iv;+he+B3+ z>GdaTv_Tf>Uo}XX#+IT7WG+|!EXMfsLol;Z{3^zo>01hST-$Ksk3R2tKL^V<*E-!Z zDrT@rxiRya+*y-ovS;Y)b#!|q*Ge~heJV6rdjh;5e z&%1MKrU5GOZ~&jyj4mktT_+?Xz7mNK>Cl%voR$7ey86h5o*8ok!!HJY#GZ>7RG)7xwFKc_a6 z`FWFeoOW!NQ7N=E0;-G7^fOv+lAm&KiRDQfAdYF{$(&HRvvB$|J@$X@nG-CRIzCe= z_G&)kECp2K_)PKa(-RZeX6}|QHv$SSJqcvjYn@F6s(N~?8>ltXe!|WrCMRk_YgC@tl)7TuE68-@_9XV?{@Gz*LoA>x>wCA84l0Nq$bQXQTXi5dt%QXwv>HRe?9qg9iL50 z$=H$MkXAim;ltI6oSt7C`Ex5hc}*@j9NsRa2ZR|59s-s8$oa7DVXS;bsL=_9&*4%N z9G_hS3Vt|dEorJyoNZ*H;LL2ayluJZoj7JA`FlS=Tz&6n7e0iio7Q-@wM{;=_C$@l!_8@?H>Q~Z(GPK{j2~;+q||s#e55jF zm|QT(T#$Il;qa2iHcw{W$yg=QdFNei;4w0(S<;QzM!TIn?T#A9A1UEpk`R)J7KjYbMUxFi+De0y%DL^ykNbwno z^RmzEZfic{df4&VqK68_7Yior%&<5SV8M~eusr;)?aEkGnp;rpBJ-{{%XdV=dUoc z%T`S|ayrxD*=bXS&rhW$R9f<$sQEJC$ZWZi7mh;ry$-jYxl%CcXEN^zA6{`IlQ}8N z*itfPNU6=7uIS8c^j>aHX2oUZ`xDQseCYIS{>eE~6J|=yJ8_}mjQ6C4j5E#o@10n| zI5U4?;-r~U|H7G#Zu9e=*dx7X^1_GF6DpOO&$RLwndG#yrPxW;s5l>fd*Z@|EkI87 zhnZ(iPh9wLyVN|Og>@jKy-j?K^c|mtvrNg2Y|hODBK~)a9;y^)?U-O`>SH9%JNb<3 zVU=QW{&!B#t~8wSeCEk)6pV_>4Q@>PmcYuZKJ)Ez_VUXhMOQY&^1fTbIP>j!-gk?D z)O!w%@(Tru#-?*p^nhOMZu5M$C~?wGZpPH;YYEY}2%>uDCo^lBa~_@q#t?(2tDnm{ Hr-UW|%yh&v literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_basic/9.png b/tests_zemu/snapshots/sign_basic/9.png new file mode 100644 index 0000000000000000000000000000000000000000..35e5a6c4317d40202833e6a8606988404138b60c GIT binary patch literal 678 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfiqMx;TbZFupx_F-XQ!#QEUj zzKj3sH^^-{+*`W#v_$*#gAy;!iTr;xS0%&Y*?GxPIoGJ(46gk~;HRQ{X=GHY?7@@5kSW2rdTv`mLI zlReUsQWGkR9(VRgP58N5s_jfhMIf`0epWP?lV9q zFHfnPeMS=~xVQQJ$qOGcPh2SY$;*4<&x>RIDffDLc=uoV;B#2%vw$SfaqT8G9!B=c z3u63UKPbv#pB}vXqZrVZZXjNkcp`^rN(X4QGRqWqkkcnrE@PZ|u>t6mG%y$9bvK~j z$QAzV!)&y^w7_y}^XZkcF?Q?OQsfE?e$D~fbmidF&zTO-bU8Hovm`*_=Y4p>O%tA( zzC=@?kdIhoL-tsb_71Hss!1&9QFq++_`1$Hx3+9>WQWM}_h`)L8>6N@Wj)#?s zf1dAM@0XUj;|)ZkDdSV^?1&UIUgxyS1}Xcj7@rnJ0mJh*`}!{mwfDdI+X2%bgQu&X J%Q~loCIBPdB}4!K literal 0 HcmV?d00001 diff --git a/tests_zemu/tests/test.js b/tests_zemu/tests/test.js index 15a04677..ca65d811 100644 --- a/tests_zemu/tests/test.js +++ b/tests_zemu/tests/test.js @@ -33,14 +33,6 @@ const sim_options = { jest.setTimeout(25000) -function compareSnapshots(snapshotPrefixTmp, snapshotPrefixGolden, snapshotCount) { - for (let i = 0; i < snapshotCount; i++) { - const img1 = Zemu.LoadPng2RGB(`${snapshotPrefixTmp}${i}.png`); - const img2 = Zemu.LoadPng2RGB(`${snapshotPrefixGolden}${i}.png`); - expect(img1).toEqual(img2); - } -} - describe('Basic checks', function () { it('can start and stop container', async function () { const sim = new Zemu(APP_PATH); @@ -133,16 +125,11 @@ describe('Basic checks', function () { await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot()); // Now navigate the address / path - await sim.snapshot(`${snapshotPrefixTmp}${snapshotCount++}.png`); - await sim.clickRight(`${snapshotPrefixTmp}${snapshotCount++}.png`); - await sim.clickRight(`${snapshotPrefixTmp}${snapshotCount++}.png`); - await sim.clickBoth(`${snapshotPrefixTmp}${snapshotCount++}.png`); + await sim.compareSnapshotsAndAccept(".", "show_address", 3); const resp = await respRequest; console.log(resp); - compareSnapshots(snapshotPrefixTmp, snapshotPrefixGolden, snapshotCount); - expect(resp.return_code).toEqual(0x9000); expect(resp.error_message).toEqual("No errors"); @@ -157,10 +144,6 @@ describe('Basic checks', function () { }); it('sign basic & verify', async function () { - const snapshotPrefixGolden = "snapshots/sign-basic/"; - const snapshotPrefixTmp = "snapshots-tmp/sign-basic/"; - let snapshotCount = 0; - const sim = new Zemu(APP_PATH); try { await sim.start(sim_options); @@ -168,7 +151,7 @@ describe('Basic checks', function () { const path = "m/44'/461'/0'/0/1"; const txBlob = Buffer.from( - "890055026d21137eb4c4814269e894d296cf6500e43cd7145502e0c7c75f82d55e5ed55db28033630df4274a984f0144000186a0430009c41961a80040", + "8a0058310396a1a3e4ea7a14d49985e661b22401d44fed402d1d0925b243c923589c0fbc7e32cd04e29ed78d15d37d3aaa3fe6da3358310386b454258c589475f7d16f5aac018a79f6c1169d20fc33921dd8b5ce1cac6c348f90a3603624f6aeb91b64518c2e80950144000186a01961a8430009c44200000040", "hex", ); @@ -182,18 +165,11 @@ describe('Basic checks', function () { // Wait until we are not in the main menu await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot()); - // Reference window - await sim.snapshot(`${snapshotPrefixTmp}${snapshotCount++}.png`); - for (let i = 0; i < 8; i++) { - await sim.clickRight(Resolve(`${snapshotPrefixTmp}${snapshotCount++}.png`)); - } - await sim.clickBoth(); + await sim.compareSnapshotsAndAccept(".", "sign_basic", 12); let resp = await signatureRequest; console.log(resp); - compareSnapshots(snapshotPrefixTmp, snapshotPrefixGolden, snapshotCount); - expect(resp.return_code).toEqual(0x9000); expect(resp.error_message).toEqual("No errors"); @@ -268,18 +244,11 @@ describe('Basic checks', function () { // Wait until we are not in the main menu await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot()); - // Reference window - await sim.snapshot(`${snapshotPrefixTmp}${snapshotCount++}.png`); - for (let i = 0; i < 9; i++) { - await sim.clickRight(Resolve(`${snapshotPrefixTmp}${snapshotCount++}.png`)); - } - await sim.clickBoth(); + await sim.compareSnapshotsAndAccept(".", "sign_proposal", 9); let resp = await signatureRequest; console.log(resp); - compareSnapshots(snapshotPrefixTmp, snapshotPrefixGolden, snapshotCount); - expect(resp.return_code).toEqual(0x9000); expect(resp.error_message).toEqual("No errors"); } finally { From a09ae7f9958ea625c688743c19f2f8c6fba426c3 Mon Sep 17 00:00:00 2001 From: Juan Leni Date: Wed, 26 Aug 2020 20:49:04 +0200 Subject: [PATCH 3/5] update zemu tests --- app/Makefile | 4 ++-- tests_zemu/snapshots-tmp/sign_proposal/0.png | Bin 0 -> 380 bytes .../sign_proposal}/1.png | Bin .../9.png => snapshots-tmp/sign_proposal/10.png} | Bin tests_zemu/snapshots-tmp/sign_proposal/11.png | Bin 0 -> 529 bytes .../sign_proposal}/2.png | Bin tests_zemu/snapshots-tmp/sign_proposal/3.png | Bin 0 -> 341 bytes .../sign_proposal}/4.png | Bin tests_zemu/snapshots-tmp/sign_proposal/5.png | Bin 0 -> 460 bytes tests_zemu/snapshots-tmp/sign_proposal/6.png | Bin 0 -> 678 bytes tests_zemu/snapshots-tmp/sign_proposal/7.png | Bin 0 -> 695 bytes .../7.png => snapshots-tmp/sign_proposal/8.png} | Bin .../8.png => snapshots-tmp/sign_proposal/9.png} | Bin tests_zemu/snapshots/sign-proposal/0.png | Bin 376 -> 0 bytes tests_zemu/snapshots/sign-proposal/3.png | Bin 364 -> 0 bytes tests_zemu/snapshots/sign-proposal/5.png | Bin 621 -> 0 bytes tests_zemu/snapshots/sign-proposal/6.png | Bin 422 -> 0 bytes tests_zemu/snapshots/sign_proposal/0.png | Bin 0 -> 380 bytes tests_zemu/snapshots/sign_proposal/1.png | Bin 0 -> 883 bytes tests_zemu/snapshots/sign_proposal/10.png | Bin 0 -> 443 bytes tests_zemu/snapshots/sign_proposal/11.png | Bin 0 -> 529 bytes tests_zemu/snapshots/sign_proposal/2.png | Bin 0 -> 528 bytes tests_zemu/snapshots/sign_proposal/3.png | Bin 0 -> 341 bytes tests_zemu/snapshots/sign_proposal/4.png | Bin 0 -> 576 bytes tests_zemu/snapshots/sign_proposal/5.png | Bin 0 -> 460 bytes tests_zemu/snapshots/sign_proposal/6.png | Bin 0 -> 678 bytes tests_zemu/snapshots/sign_proposal/7.png | Bin 0 -> 695 bytes tests_zemu/snapshots/sign_proposal/8.png | Bin 0 -> 475 bytes tests_zemu/snapshots/sign_proposal/9.png | Bin 0 -> 539 bytes tests_zemu/tests/test.js | 4 ++-- 30 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 tests_zemu/snapshots-tmp/sign_proposal/0.png rename tests_zemu/{snapshots/sign-proposal => snapshots-tmp/sign_proposal}/1.png (100%) rename tests_zemu/{snapshots/sign-proposal/9.png => snapshots-tmp/sign_proposal/10.png} (100%) create mode 100644 tests_zemu/snapshots-tmp/sign_proposal/11.png rename tests_zemu/{snapshots/sign-proposal => snapshots-tmp/sign_proposal}/2.png (100%) create mode 100644 tests_zemu/snapshots-tmp/sign_proposal/3.png rename tests_zemu/{snapshots/sign-proposal => snapshots-tmp/sign_proposal}/4.png (100%) create mode 100644 tests_zemu/snapshots-tmp/sign_proposal/5.png create mode 100644 tests_zemu/snapshots-tmp/sign_proposal/6.png create mode 100644 tests_zemu/snapshots-tmp/sign_proposal/7.png rename tests_zemu/{snapshots/sign-proposal/7.png => snapshots-tmp/sign_proposal/8.png} (100%) rename tests_zemu/{snapshots/sign-proposal/8.png => snapshots-tmp/sign_proposal/9.png} (100%) delete mode 100644 tests_zemu/snapshots/sign-proposal/0.png delete mode 100644 tests_zemu/snapshots/sign-proposal/3.png delete mode 100644 tests_zemu/snapshots/sign-proposal/5.png delete mode 100644 tests_zemu/snapshots/sign-proposal/6.png create mode 100644 tests_zemu/snapshots/sign_proposal/0.png create mode 100644 tests_zemu/snapshots/sign_proposal/1.png create mode 100644 tests_zemu/snapshots/sign_proposal/10.png create mode 100644 tests_zemu/snapshots/sign_proposal/11.png create mode 100644 tests_zemu/snapshots/sign_proposal/2.png create mode 100644 tests_zemu/snapshots/sign_proposal/3.png create mode 100644 tests_zemu/snapshots/sign_proposal/4.png create mode 100644 tests_zemu/snapshots/sign_proposal/5.png create mode 100644 tests_zemu/snapshots/sign_proposal/6.png create mode 100644 tests_zemu/snapshots/sign_proposal/7.png create mode 100644 tests_zemu/snapshots/sign_proposal/8.png create mode 100644 tests_zemu/snapshots/sign_proposal/9.png diff --git a/app/Makefile b/app/Makefile index 2d8b1728..e8311dbb 100755 --- a/app/Makefile +++ b/app/Makefile @@ -48,7 +48,7 @@ endif APPVERSION_M=0 APPVERSION_N=18 -APPVERSION_P=0 +APPVERSION_P=1 $(info COIN = [$(COIN)]) ifeq ($(COIN),FIL) @@ -123,7 +123,7 @@ SDK_SOURCE_PATH += lib_blewbxx lib_blewbxx_impl else # Assume Nano S DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=128 -DEFINES += HAVE_BOLOS_UX COMPLIANCE_UX_160 HAVE_UX_LEGACY +DEFINES += COMPLIANCE_UX_160 HAVE_UX_LEGACY endif # X specific diff --git a/tests_zemu/snapshots-tmp/sign_proposal/0.png b/tests_zemu/snapshots-tmp/sign_proposal/0.png new file mode 100644 index 0000000000000000000000000000000000000000..4eef9982dce60efb0e4c3fb2ae9db4ec41073901 GIT binary patch literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfclMx;TbZFupx_F-tj+$K~MV zuCKQbiq~(Gt7=y?^OG@Snbs<~(yQi!o6z#7k6I_0#VmNDU3u6|I$xzQOE2KkB)N9&>)vn3+f#7xt1O5y=hCi5?rXifA9R|RJYiDRaOBkU^XAlh zr&lxKNX7wHuXjxs+kr-KyYcG!IP3HHSP_PxvYz~CTtOtnadqh^N2}Y zKjy)sR_>TR1&!VNiwaW?PTc9h=_MDlfJJpjMM2{valL>hp%|MTK*55Ky5jEQGE=*O zI{$c_w13K^3gS+hD>UU#xL!aJ+rbQ7iT#h0o->JCi@TR5{^^_K5A@awy*a%?F>j{) z@!-@e^OBqLAZhuNH7qkOh8aY0yJds)tcAF!=UUUnD1_i&#zz&6GPP|Bnt`Fp;OXk; Jvd$@?2>_MxoHYOd literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign-proposal/1.png b/tests_zemu/snapshots-tmp/sign_proposal/1.png similarity index 100% rename from tests_zemu/snapshots/sign-proposal/1.png rename to tests_zemu/snapshots-tmp/sign_proposal/1.png diff --git a/tests_zemu/snapshots/sign-proposal/9.png b/tests_zemu/snapshots-tmp/sign_proposal/10.png similarity index 100% rename from tests_zemu/snapshots/sign-proposal/9.png rename to tests_zemu/snapshots-tmp/sign_proposal/10.png diff --git a/tests_zemu/snapshots-tmp/sign_proposal/11.png b/tests_zemu/snapshots-tmp/sign_proposal/11.png new file mode 100644 index 0000000000000000000000000000000000000000..66b03316d994c8024e78bfec91f8802f2279adfa GIT binary patch literal 529 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfiWmba4!+V0?QpFz<1gh|9st zEmi-y-}TEqR8lw-QTC>D%7xDns{bxod&XQ_bgyvv?t7k(Ht{h&U8lS2^;{Lb>>Cw} z%VVY~EtunY*xJa1XXZtNl(;NBI8l9b zwuI4QMoFnMqx!Di&6x`xo|bCk0ZN$gNTy7Xq3)mh}CrAJ(7P({je~@YDIZe^QL(CslepQ=BQ9`=`WcaU&bhL=f3_CPTt#wNSvm z#SepxOlmxy70F4TS8--Gnm#}Av8a^Z|IKafQul6Eh|N?iwgkF^PijJC_Txw?x5H0W zQZgiXPyD%iZ1V}8nWsBXTxd9>Y(8%(P*I)t;l?wUO?hT6JyDbLI41?D_-md`GY_x+ z^#TQBpy&9c?qy0C?QT=t+|`?&;n3DL9mqY=)27%A^4oQT6h5FHpu@Cxe$?Uh2L@9a z@9ws8DY>j2HF;q3oQ+N>0L^n|o0&f`^6oKzh0oC``<4KM(#^rLxlPd+=&yAT9nwtp zC~wZTm~hkdO-h*Zf;DS^3NjvV+R{4}=(bQ!jp?bmG1ImcM&8n2F!^Bcv2}a)0Hd10 M)78&qol`;+01JlXApigX literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign-proposal/2.png b/tests_zemu/snapshots-tmp/sign_proposal/2.png similarity index 100% rename from tests_zemu/snapshots/sign-proposal/2.png rename to tests_zemu/snapshots-tmp/sign_proposal/2.png diff --git a/tests_zemu/snapshots-tmp/sign_proposal/3.png b/tests_zemu/snapshots-tmp/sign_proposal/3.png new file mode 100644 index 0000000000000000000000000000000000000000..fe67dbb4e57eace1536fc23d07e1ab87db67f725 GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfht^x;TbZFupzLm?zE1!*Wp0 z>GOZ~&jyj4mktT_+?Xz7mNK>Cl%voR$7ey86h5o*8ok!!HJY#GZ>7RG)7xwFKc_a6 z`FWFeoOW!NQ7N=E0;-G7^fOv+lAm&KiRDQfAdYF{$(&HRvvB$|J@$X@nG-CRIzCe= z_G&)kECp2K_)PKa(-RZeX6}|QHv$SSJqcvjYn@F6s(N~?8>ltXe!|WrCMRk_YgC@tl)7TuE68-@_9XV?{K3wclc*};|)=f`X$Z>#e0O0U^nk4Irreko@)XYYdEv+p-Wp^^O<#w zl2T>7)-$IoIx`!+m$NaoDLpKEQU<7SpYO8^AZ1Q%Kw~EH@Sd=-t(X+ZY_$EthRHWg z|Aa9cou18>a*y}k$qNPCM&d>%=A2M)KD-I&q{Ro_jZFTOr)12CVm6v@`@`qi(-Rjy zxbunwt=2c4bK*}&+uSqW6Ml9zZ1Tz8;FAkP1@62iF(wxZE;<}`Wd6EOgLh+>y zlPxoEoSb9wCdE&x%t#&R)yY8H?{a9I-okeJ3PDuI7+bMX>VtCVJ76p^c)I$ztaD0e F0sthd!pi^v literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots-tmp/sign_proposal/6.png b/tests_zemu/snapshots-tmp/sign_proposal/6.png new file mode 100644 index 0000000000000000000000000000000000000000..35e5a6c4317d40202833e6a8606988404138b60c GIT binary patch literal 678 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfiqMx;TbZFupx_F-XQ!#QEUj zzKj3sH^^-{+*`W#v_$*#gAy;!iTr;xS0%&Y*?GxPIoGJ(46gk~;HRQ{X=GHY?7@@5kSW2rdTv`mLI zlReUsQWGkR9(VRgP58N5s_jfhMIf`0epWP?lV9q zFHfnPeMS=~xVQQJ$qOGcPh2SY$;*4<&x>RIDffDLc=uoV;B#2%vw$SfaqT8G9!B=c z3u63UKPbv#pB}vXqZrVZZXjNkcp`^rN(X4QGRqWqkkcnrE@PZ|u>t6mG%y$9bvK~j z$QAzV!)&y^w7_y}^XZkcF?Q?OQsfE?e$D~fbmidF&zTO-bU8Hovm`*_=Y4p>O%tA( zzC=@?kdIhoL-tsb_71Hss!1&9QFq++_`1$Hx3+9>WQWM}_h`)L8>6N@Wj)#?s zf1dAM@0XUj;|)ZkDdSV^?1&UIUgxyS1}Xcj7@rnJ0mJh*`}!{mwfDdI+X2%bgQu&X J%Q~loCIBPdB}4!K literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots-tmp/sign_proposal/7.png b/tests_zemu/snapshots-tmp/sign_proposal/7.png new file mode 100644 index 0000000000000000000000000000000000000000..2e97f38f0697d00fe58299432a1e8bbdbb076717 GIT binary patch literal 695 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfi45x;TbZFupw)7^EC2;(Ty1 zSN4DIYwgGGNMu#yer8O|a1LGeBYeGzBePMx>tWuR?Iw37R7M0zKU)V9 zi8xVXEh#mjvh<rABD&SX@CGaJ3nia62Jwp+?>?L&|=ULDc~nZ;#fqLbnVw8uoDc>0-Gqwt< zQ-SWeRpH&%ChytSmVf!fVxWQQj87wh9+3oEdJ*WTiw$RDd97#09`=K|t_SEyV}Ss_ z|NGfe=AAwE@&e10%Zaf+xOknP#qv6*T{K7$Bbq7$8tu-Z(VqeIokH>F_^!H=U#=ot6x9^lgNW7 z+kiOrakokoBT%zZMyZA4!QGCl4{~ztyPdIsL7km-`{D=rEHlEcEtqPSu{8Hi<7C%^ z2Tv|~a0CfIc;a#}G&g3hu*e*s_D3wN-NHaqk8pB{scS^cS&&fJ)YRN$EfF(w@=;E| zx}^)|=ElrqnzP`+{^Fv5f>7zV_cbjnc5ZUi&b{DudxtWsMWo0dFGfExR(23mW{!+V r%uI&Mr=+%AVq3cftV$Xy^EdM(%fhVE9VeCoLzKbO)z4*}Q$iB}N=2p} diff --git a/tests_zemu/snapshots/sign-proposal/3.png b/tests_zemu/snapshots/sign-proposal/3.png deleted file mode 100644 index da800c791a9c809ece43ddd5b0396db54654e657..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfbZ>x;TbZFupzL*mv7OfaTyC z#@GM(-#O2`Ct#5xa;;rMOGtzc77wT#xrYAPGFi@uXQwcsl&6k4}9B1PW0GM*tt~X zM9uaeer+P#)ttLN0#(oFvpacb9*?G(B+!C-*EW&aJVrq4@*JP3GabsvHjIkyxyHB4 z^P@`f#H7hDA1#T(_X5@nPi!I)Yof*HnCU^1#uZ>N>P-O6Q^>bP0l+XkKUXqi& diff --git a/tests_zemu/snapshots/sign-proposal/5.png b/tests_zemu/snapshots/sign-proposal/5.png deleted file mode 100644 index b70d608bc0ed88bff1399535c7eae6e6a8c16ce4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 621 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFff^Tx;TbZFupx_Fi+W%!TI3v zwx9py&oEyXQ*)Z)$9AKT&+kg;qyBrIO>8M~L5Dlf1WSn-#b-G@a|dGOuYJ~czxoO3 zuVkE=f4$+%m4-9xfwm``QFJ#`Y&&oAStCb^Z(MsNedZgu1uT+;!Rg_W;V*t zvoW#x(l_5LEi2;0ALE(+rV5)g9MUo>JdI2gJ{LT8bmKkoM}oKc%!Ln2*;4jhF*s?n z^x;xdh0o89NlQvi_$io@5pjZtck-DF4QH08?CU*q8t96AI3UmrG3m8oH8EG9_aMm6+)=G26-tZr(bWn$13at!&ITwFNe- z6DQ1+0wT7Vu7`mEC6OWq44OrW6CzD`jJn$#(=HmE(7`47Op@tTYBa>CvJK5_Qhrhy z7MTkY+1dBUG8>(^U|_1y%)=YZY_!{A$C{L~B4n$}9&ew#5NLM_(8@B^1u@%7fwJ{x Y`?S|?zP!2sn2Z=aUHx3vIVCg!00~S3A^-pY diff --git a/tests_zemu/snapshots/sign-proposal/6.png b/tests_zemu/snapshots/sign-proposal/6.png deleted file mode 100644 index d039658208bf679b3727fbbc123069fc7f372710..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfitNx;TbZFupzLn0MQO!TI9( z#>)T9#RpG0CAkDfE%6ZBmUd4#f7e77-V-)++k|JzXF5Dv!Z`E)rG_(?vmBlommYST zou~4#L~6p%Qr;7PcCn?*^J6xWzpGMsz1Qrn$D^etGAG_h$))UD%Q!Rka3c>dztL{C zl#CmuZ&K#9@$jD5v%Bzm!FAsC9?up&ba-|=MNVqMP189iE;O78p0tp0=5Fb7BcL^^ zCT~*8c_QTTlEfwH8Oo_kx{N>hc;H+#>g z%+ ju*oNTgHJ9Y^p^i^>14a@wnDpr;m_dd>gTe~DWM4f6|c7R diff --git a/tests_zemu/snapshots/sign_proposal/0.png b/tests_zemu/snapshots/sign_proposal/0.png new file mode 100644 index 0000000000000000000000000000000000000000..4eef9982dce60efb0e4c3fb2ae9db4ec41073901 GIT binary patch literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfclMx;TbZFupx_F-tj+$K~MV zuCKQbiq~(Gt7=y?^OG@Snbs<~(yQi!o6z#7k6I_0#VmNDU3u6|I$xzQOE2KkB)N9&>)vn3+f#7xt1O5y=hCi5?rXifA9R|RJYiDRaOBkU^XAlh zr&lxKNX7wHuXjxs+kr-KyYcG!IP3HHSP_PxvYz~CTtOtnadqh^N2}Y zKjy)sR_>TR1&!VNiwaW?PTc9h=_MDlfJJpjMM2{valL>hp%|MTK*55Ky5jEQGE=*O zI{$c_w13K^3gS+hD>UU#xL!aJ+rbQ7iT#h0o->JCi@TR5{^^_K5A@awy*a%?F>j{) z@!-@e^OBqLAZhuNH7qkOh8aY0yJds)tcAF!=UUUnD1_i&#zz&6GPP|Bnt`Fp;OXk; Jvd$@?2>_MxoHYOd literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_proposal/1.png b/tests_zemu/snapshots/sign_proposal/1.png new file mode 100644 index 0000000000000000000000000000000000000000..0acc9b796d502417322eaa6f10d1837794073046 GIT binary patch literal 883 zcmXAoYfKYC5XakGJb83|;Il_81tr#Kz?@gb2U2aVQWQm{*kII}Qn4l4Kn$QwEW}P09J{@FJD?0q{5Y#$ES?R@44>!IaK_JBU z`y|e$*H+BMv-*EDQd|bi1J-nqpO$jyqnLQ$W!3+*lcZsC@WS zTf8oF`{!pJdaq3|3#BbJB$e?71K4}R9)N{e=%GqmWRnnB_Wp`=nekepE;=B)ka%?) zR_@T0$Vs4ubXXB?5un1%p5Cz=odGE5HXh}J2uf4J4Z_#J$&`uS!52@kI~YNzjbf$$ z;JE4{f=-4Id?5s~LxeI$TQL(mwc9c1jP9;V*eHT@$w=%CD)}c_u{abYDJ!ac>ysj( zu;;px&$c~UtOnSST*>#HR^g^_LrwlXz4r{XV=e%ZCZRV*maPnhyBb&L3EX3Fdz-Z5 qYnzgfxD3%&ihFD!=>5k4(r==sE~xm_JRF0^q{!WrZ|dB5p!P2~SaCf7 literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_proposal/10.png b/tests_zemu/snapshots/sign_proposal/10.png new file mode 100644 index 0000000000000000000000000000000000000000..4aa28b6bfdc9668cf49edfe790ea290941e99f83 GIT binary patch literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfcZGx;TbZFupx_ah0?ugY&_~ z$A10izt(JIlDMPq?NOb^iaW8Yb*~+TZbw~VW|ys+aAX@F2fe%lSYt`0Y+ znckRYhK6=bVw2joKfOSdcX`{}_d7oFO39t@;pIUI^X^2+-^OFnU-frt0RpUe+0rTmOe%#n(lRO$IlbLR3C zkdc#Srr1pbO4}Ik;F>x4Ofav$=^ocKphfqTj7={%96mmw($!(-t~SqSj)zq?+e+nl zOXqkC2W(5_-L@2t?*3roEl;_3so~5iw);+Ok|`M#-Dmz^`k?^21W{l Mr>mdKI;Vst03N8v5&!@I literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_proposal/11.png b/tests_zemu/snapshots/sign_proposal/11.png new file mode 100644 index 0000000000000000000000000000000000000000..66b03316d994c8024e78bfec91f8802f2279adfa GIT binary patch literal 529 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfiWmba4!+V0?QpFz<1gh|9st zEmi-y-}TEqR8lw-QTC>D%7xDns{bxod&XQ_bgyvv?t7k(Ht{h&U8lS2^;{Lb>>Cw} z%VVY~EtunY*xJa1XXZtNl(;NBI8l9b zwuI4QMoFnMqx!Di&6x`xo|bCk0ZN$gNTy7Xq3)mh}CrAJ(7P({je~@YDIZe^QL(CslepQ=BQ9`=`WcaU&bhL=f3_CPTt#wNSvm z#SepxOlmxy70F4TS8--Gnm#}Av8a^Z|IKafQul6Eh|N?iwgkF^PijJC_Txw?x5H0W zQZgiXPyD%iZ1V}8nWsBXTxd9>Y(8%(P*I)t;l?wUO?hT6JyDbLI41?D_-md`GY_x+ z^#TQBpy&9c?qy0C?QT=t+|`?&;n3DL9mqY=)27%A^4oQT6h5FHpu@Cxe$?Uh2L@9a z@9ws8DY>j2HF;q3oQ+N>0L^n|o0&f`^6oKzh0oC``<4KM(#^rLxlPd+=&yAT9nwtp zC~wZTm~hkdO-h*Zf;DS^3NjvV+R{4}=(bQ!jp?bmG1ImcM&8n2F!^Bcv2}a)0Hd10 M)78&qol`;+01JlXApigX literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_proposal/2.png b/tests_zemu/snapshots/sign_proposal/2.png new file mode 100644 index 0000000000000000000000000000000000000000..da85b150eee8edeb0c322ff029ea12747fba407c GIT binary patch literal 528 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfd;Cba4!+V0?QpI_RzkgUi8S zuB-pVW8_m~k6vJ7IVNX6At1f$e~B`u)P$cUyzEBxv4<6$4=WU3XyD;(KC>=y!p{)i z6ML5B-N?AytKzqiac2EG#+l}(3dSZNHD`cmdA7r|ouNYfcfl%FCr-F&%46hwnA^yN z$7s8fGqaI@n4FZ{u7_MHZEPUKHWO${>|x!LK)r`gHTOtOu$joh8 zjzE`d8RZKGEPD@BwHRph;;AoJB&vUomOAI>Ff%Xv=_)Cp{Xky9UsVSboqGLzFBN3d?^_>PVQOBICH+5^I^YdU1951B~GXW zS+2>uyUj5T=;Rtzrc+<`v8CJtdL~rYXZtpzzxF`uw1oqf-Hw`(mz%h2YwOEvV#}hV c(Kv6VWfd+uz3#tT3yf(7Pgg&ebxsLQ00 literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_proposal/3.png b/tests_zemu/snapshots/sign_proposal/3.png new file mode 100644 index 0000000000000000000000000000000000000000..fe67dbb4e57eace1536fc23d07e1ab87db67f725 GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfht^x;TbZFupzLm?zE1!*Wp0 z>GOZ~&jyj4mktT_+?Xz7mNK>Cl%voR$7ey86h5o*8ok!!HJY#GZ>7RG)7xwFKc_a6 z`FWFeoOW!NQ7N=E0;-G7^fOv+lAm&KiRDQfAdYF{$(&HRvvB$|J@$X@nG-CRIzCe= z_G&)kECp2K_)PKa(-RZeX6}|QHv$SSJqcvjYn@F6s(N~?8>ltXe!|WrCMRk_YgC@tl)7TuE68-@_9XV?{7Y1}TN!N>d^mn$WhU>5KbarY zC8hezfojX;Yt%nqO383|w(Oz3=^u}_HrHoMPyBIlu-s;9vCRyKe%J%8TrZWeBXhyS zWsPmK*`)G_;H2};yV}5GWb$VPqhv}(gwzDbwzj3zVOAV_aN`ydn$_@WO`B(0rbAlh zj1)a7wVB;*p3fE~PTHA4ELW20)W)?3H*N(XKDg&(dG5tB8=bhY0T{eIyxt(@hj(np zuOTCrDdpDV;vKC@dmpf8uVZ|z^E)yis-vy^86lLP~Ur>mdKI;Vst0Q9^4 AqyPW_ literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_proposal/5.png b/tests_zemu/snapshots/sign_proposal/5.png new file mode 100644 index 0000000000000000000000000000000000000000..464144f45a4a08dea2e5d4ab88b2586fd85df94e GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfdN`ba4!+V0?SfG4GB81M|UW z2|xd{e?E}G8ofbB-6KIhZ01U#{9O}Scu(w^)5bkBKhxpaBF35Zmm1ET&T@EWTzc4T zcAm<|BB=>K3wclc*};|)=f`X$Z>#e0O0U^nk4Irreko@)XYYdEv+p-Wp^^O<#w zl2T>7)-$IoIx`!+m$NaoDLpKEQU<7SpYO8^AZ1Q%Kw~EH@Sd=-t(X+ZY_$EthRHWg z|Aa9cou18>a*y}k$qNPCM&d>%=A2M)KD-I&q{Ro_jZFTOr)12CVm6v@`@`qi(-Rjy zxbunwt=2c4bK*}&+uSqW6Ml9zZ1Tz8;FAkP1@62iF(wxZE;<}`Wd6EOgLh+>y zlPxoEoSb9wCdE&x%t#&R)yY8H?{a9I-okeJ3PDuI7+bMX>VtCVJ76p^c)I$ztaD0e F0sthd!pi^v literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_proposal/6.png b/tests_zemu/snapshots/sign_proposal/6.png new file mode 100644 index 0000000000000000000000000000000000000000..35e5a6c4317d40202833e6a8606988404138b60c GIT binary patch literal 678 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfiqMx;TbZFupx_F-XQ!#QEUj zzKj3sH^^-{+*`W#v_$*#gAy;!iTr;xS0%&Y*?GxPIoGJ(46gk~;HRQ{X=GHY?7@@5kSW2rdTv`mLI zlReUsQWGkR9(VRgP58N5s_jfhMIf`0epWP?lV9q zFHfnPeMS=~xVQQJ$qOGcPh2SY$;*4<&x>RIDffDLc=uoV;B#2%vw$SfaqT8G9!B=c z3u63UKPbv#pB}vXqZrVZZXjNkcp`^rN(X4QGRqWqkkcnrE@PZ|u>t6mG%y$9bvK~j z$QAzV!)&y^w7_y}^XZkcF?Q?OQsfE?e$D~fbmidF&zTO-bU8Hovm`*_=Y4p>O%tA( zzC=@?kdIhoL-tsb_71Hss!1&9QFq++_`1$Hx3+9>WQWM}_h`)L8>6N@Wj)#?s zf1dAM@0XUj;|)ZkDdSV^?1&UIUgxyS1}Xcj7@rnJ0mJh*`}!{mwfDdI+X2%bgQu&X J%Q~loCIBPdB}4!K literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_proposal/7.png b/tests_zemu/snapshots/sign_proposal/7.png new file mode 100644 index 0000000000000000000000000000000000000000..2e97f38f0697d00fe58299432a1e8bbdbb076717 GIT binary patch literal 695 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfi45x;TbZFupw)7^EC2;(Ty1 zSN4DIYwgGGNMu#yer8O|a1LGeBYeGzBePMx>tWuR?Iw37R7M0zKU)V9 zi8xVXEh#mjvh<rABD&SX@CGaJ3nia62Jwp+?>?L&|=ULDc~nZ;#fqLbnVw8uoDc>0-Gqwt< zQ-SWeRpH&%ChytSmVf!fVxWQQj87wh9+3oEdJ*WTiw$RDd97#09`=K|t_SEyV}Ss_ z|NGfe=AAwE@&e10%Zaf+xOknP#qv6*T{K7$Bbq7$8tu-Z(VqeIokH7Km@-rQt^_wbu)&=5=FSKp9 zu+BW4y+c+~%FasV<0Ag57tJbqixVdfwr4mC=hGjo$=#2*ivJQ9gEsr+uBwp zPMRqt2J~h3naORdEi8m3r6$ajny@f2(;*G$8=wz5&s=IabEN@B7NoIT<6XKt3rsrP3#N-ruf1^U&<8z`YF2{ajKM|@U9%06qx)ZJ?jmSs1; uy~cKXE$_ByX^1N~+`W~sdn>ZUZ^q9DH|Fz{f2#vV8iS{+pUXO@geCy$g~}`d literal 0 HcmV?d00001 diff --git a/tests_zemu/snapshots/sign_proposal/9.png b/tests_zemu/snapshots/sign_proposal/9.png new file mode 100644 index 0000000000000000000000000000000000000000..90747c0c070162f77682501e7a7828e1342718e1 GIT binary patch literal 539 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfcyyba4!+V0?QpI`6dygY!XW z$2ZyF{u(=;oMBgs2KkLOOEnu8^IQz!LnRyuw&vd^wamRjf67pZjI1`9o zwy~weMXMHGg$S-qbWgi%aN@!S<;|HlCN4~zaMOgxs9oKe*+@TZoz%LjgYgQ+CT~vg z7&#yAJ9DAo%(6uHXDd$t8COqD?U9;Lsm0rT=E4V6Ui)heXD$P6J9>&+5-2QXG=I`f zlRGM#Gk45Bvkc@Khi6+`ucu_pc&Flgc%iAn=WC~;jq05aPdBNFKCDojVI(gYuSryA4UN`v@arnXqf8P077PDI2vwuu$n=LhA;Y0V7f19SdPX_vh-;~E_ zcAM{Ew`bl`6K-ZYw6)33^kp`B4{|WjUCX7|X1YgMZemLT`gsCS{ce!Mfv)KVI@urQ zBWvChIZ|?|PdQS6&JQ6x3OErled*nnu}+%}-84QKjzcu(B9QZT&@ Date: Wed, 26 Aug 2020 20:50:56 +0200 Subject: [PATCH 4/5] put gdbinit back --- .gdbinit | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .gdbinit diff --git a/.gdbinit b/.gdbinit new file mode 100644 index 00000000..8abe1fbb --- /dev/null +++ b/.gdbinit @@ -0,0 +1,11 @@ +# https://www.jetbrains.com/help/clion/configuring-debugger-options.html#gdbinit-lldbinit +# +# You need to create `$HOME/.gdbinit` with the following content: +# set auto-load local-gdbinit on +# add-auto-load-safe-path / + +set architecture arm +handle SIGILL nostop pass noprint +add-symbol-file app/bin/app.elf 0x40000000 +set backtrace limit 20 +b *0x40000000 From 3e02e50a15e0816ee837ca57659000af321c6605 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 17:49:08 +0000 Subject: [PATCH 5/5] Bump bl from 4.0.2 to 4.0.3 in /tests_zemu Bumps [bl](https://github.com/rvagg/bl) from 4.0.2 to 4.0.3. - [Release notes](https://github.com/rvagg/bl/releases) - [Commits](https://github.com/rvagg/bl/compare/v4.0.2...v4.0.3) Signed-off-by: dependabot[bot] --- tests_zemu/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests_zemu/yarn.lock b/tests_zemu/yarn.lock index cc2d243d..1c315a23 100644 --- a/tests_zemu/yarn.lock +++ b/tests_zemu/yarn.lock @@ -1884,9 +1884,9 @@ bindings@^1.5.0: file-uri-to-path "1.0.0" bl@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a" - integrity sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ== + version "4.0.3" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" + integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== dependencies: buffer "^5.5.0" inherits "^2.0.4"