From d40352e31519727eb41c8d761add3e42bfafad34 Mon Sep 17 00:00:00 2001 From: Juan Leni Date: Wed, 8 Sep 2021 12:54:18 +0200 Subject: [PATCH 1/3] do not show To for staking txs --- app/Makefile | 2 +- app/src/parser.c | 109 +++++++++++++++++++++++++++++++++++++++--- app/src/parser_impl.c | 9 ++-- 3 files changed, 110 insertions(+), 10 deletions(-) diff --git a/app/Makefile b/app/Makefile index 3a46f451..026b542f 100755 --- a/app/Makefile +++ b/app/Makefile @@ -56,7 +56,7 @@ endif APPVERSION_M=1 APPVERSION_N=0 -APPVERSION_P=1 +APPVERSION_P=2 $(info COIN = [$(COIN)]) diff --git a/app/src/parser.c b/app/src/parser.c index aebb644a..7db0f2d6 100644 --- a/app/src/parser.c +++ b/app/src/parser.c @@ -330,14 +330,14 @@ parser_error_t parser_getItemTokenTransfer(const parser_context_t *ctx, return parser_no_data; } - bool is_stake_tx = parser_tx_obj.tx_fields.call.special_transfer_type == neuron_stake_transaction; + const bool is_stake_tx = parser_tx_obj.tx_fields.call.special_transfer_type == neuron_stake_transaction; + if (is_stake_tx) { + return parser_unexepected_error; + } + if (displayIdx == 0) { snprintf(outKey, outKeyLen, "Transaction type"); - if(is_stake_tx){ - snprintf(outVal, outValLen, "Stake Neuron"); - }else { - snprintf(outVal, outValLen, "Send ICP"); - } + snprintf(outVal, outValLen, "Send ICP"); return parser_ok; } @@ -411,6 +411,94 @@ parser_error_t parser_getItemTokenTransfer(const parser_context_t *ctx, return parser_no_data; } +parser_error_t parser_getItemStakeNeuron(const parser_context_t *ctx, + uint8_t displayIdx, + char *outKey, uint16_t outKeyLen, + char *outVal, uint16_t outValLen, + uint8_t pageIdx, uint8_t *pageCount) { + MEMZERO(outKey, outKeyLen); + MEMZERO(outVal, outValLen); + snprintf(outKey, outKeyLen, "?"); + snprintf(outVal, outValLen, "?"); + *pageCount = 1; + + uint8_t numItems = 0; + CHECK_PARSER_ERR(parser_getNumItems(ctx, &numItems)) + CHECK_APP_CANARY() + + call_t *fields = &parser_tx_obj.tx_fields.call; + + if (displayIdx < 0 || displayIdx >= numItems) { + return parser_no_data; + } + + const bool is_stake_tx = parser_tx_obj.tx_fields.call.special_transfer_type == neuron_stake_transaction; + if (!is_stake_tx) { + return parser_unexepected_error; + } + + if (displayIdx == 0) { + snprintf(outKey, outKeyLen, "Transaction type"); + snprintf(outVal, outValLen, "Stake Neuron"); + return parser_ok; + } + + if(app_mode_expert()){ + if (displayIdx == 1) { + snprintf(outKey, outKeyLen, "Sender "); + return print_textual(fields->sender.data, fields->sender.len, outVal, outValLen, pageIdx, pageCount); + } + + if (displayIdx == 2) { + snprintf(outKey, outKeyLen, "Subaccount "); + snprintf(outVal, outValLen, "Not set"); + + if (fields->pb_fields.SendRequest.has_from_subaccount) { + char buffer[100]; + zxerr_t err = print_hexstring(buffer, sizeof(buffer), fields->pb_fields.SendRequest.from_subaccount.sub_account, 32); + if (err != zxerr_ok) { + return parser_unexepected_error; + } + pageString(outVal, outValLen, buffer, pageIdx, pageCount); + } + + return parser_ok; + } + displayIdx -= 2; + } + + if (displayIdx == 1) { + snprintf(outKey, outKeyLen, "From account"); + return print_accountBytes(fields->sender, &fields->pb_fields.SendRequest, + outVal, outValLen, + pageIdx, pageCount); + } + + if (displayIdx == 2) { + snprintf(outKey, outKeyLen, "Payment (ICP)"); + PARSER_ASSERT_OR_ERROR(fields->pb_fields.SendRequest.payment.has_receiver_gets, parser_unexpected_number_items) + return print_ICP(fields->pb_fields.SendRequest.payment.receiver_gets.e8s, + outVal, outValLen, + pageIdx, pageCount); + } + + if (displayIdx == 3) { + snprintf(outKey, outKeyLen, "Maximum fee (ICP)"); + PARSER_ASSERT_OR_ERROR(fields->pb_fields.SendRequest.has_max_fee, parser_unexpected_number_items) + return print_ICP(fields->pb_fields.SendRequest.max_fee.e8s, + outVal, outValLen, + pageIdx, pageCount); + } + + if (displayIdx == 4) { + snprintf(outKey, outKeyLen, "Memo"); + PARSER_ASSERT_OR_ERROR(fields->pb_fields.SendRequest.has_memo, parser_unexpected_number_items) + return print_u64(fields->pb_fields.SendRequest.memo.memo, outVal, outValLen, pageIdx, pageCount); + } + + return parser_no_data; +} + parser_error_t parser_getItemStartStopDissolve(uint8_t displayIdx, char *outKey, uint16_t outKeyLen, char *outVal, uint16_t outValLen, @@ -666,6 +754,15 @@ parser_error_t parser_getItem(const parser_context_t *ctx, case call: { switch(parser_tx_obj.tx_fields.call.pbtype) { case pb_sendrequest : { + const bool is_stake_tx = parser_tx_obj.tx_fields.call.special_transfer_type == neuron_stake_transaction; + + if (is_stake_tx) { + return parser_getItemStakeNeuron(ctx, displayIdx, + outKey, outKeyLen, + outVal, outValLen, + pageIdx, pageCount); + } + return parser_getItemTokenTransfer(ctx, displayIdx, outKey, outKeyLen, outVal, outValLen, diff --git a/app/src/parser_impl.c b/app/src/parser_impl.c index 4b553001..dd74b5a8 100644 --- a/app/src/parser_impl.c +++ b/app/src/parser_impl.c @@ -527,10 +527,13 @@ uint8_t _getNumItems(const parser_context_t *c, const parser_tx_t *v) { case call: { switch(v->tx_fields.call.pbtype) { case pb_sendrequest: { - if (!app_mode_expert()) { - return 6; + const bool is_stake_tx = v->tx_fields.call.special_transfer_type == neuron_stake_transaction; + + if (is_stake_tx) { + return app_mode_expert() ? 7 : 5; } - return 8; + + return app_mode_expert() ? 8 : 6; } case pb_listneurons : { From 7eb2d3771d49d82c316b79868fa514786c6bf968 Mon Sep 17 00:00:00 2001 From: Juan Leni Date: Wed, 8 Sep 2021 13:02:28 +0200 Subject: [PATCH 2/3] bump version number --- tests_zemu/snapshots/s-mainmenu/00004.png | Bin 540 -> 556 bytes tests_zemu/snapshots/s-mainmenu/00011.png | Bin 540 -> 556 bytes tests_zemu/snapshots/x-mainmenu/00004.png | Bin 537 -> 551 bytes tests_zemu/snapshots/x-mainmenu/00011.png | Bin 537 -> 551 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png index a09bdc6729d76a7cfe8985549a57c3b670a81946..38ca0bdfbf7193e18ed56ec2b5d4542d2d7fb932 100644 GIT binary patch delta 531 zcmbQkvW8`XO8sX~7srqa#vVU$o~tq~`$om$a-Hc)3;tY}YCDr5VYJ`p@Px>Jg^#sT zrlp(z`^K9c$Q^$&M8fO^JGb0lM5f#u}J~#Y)^4JJYlC2<5Od)eXePi{k`ueI6hOA zOquriR>jhXu|_5r8qU-UOG;%pr2RZA#b>%_YvB?`Nh!XQ7dB)&q=D>bocYvz(!z(1 z%traSf7US0RCGSvZlYi;HBETJ!bB5=&zpOipQiU314D0d;t3w0sScK5p~_0FeKW^pfMPcP-r_`kJH(O9bO%=SzPqtpBIVp`99 zy4Cx?xsBauF{7kZ8xJpkire7{H%;H9l<}Upuwn8~>D)Q7hbK7JrhoXHLpoqeWA$;d>Z*u~*zN1LMa;R!&i(@c1PUO%(k zlxLvVU$o~tq~`$om$a-Hc)3;tY}YCDr5VYJ`p@Px>Jg^#sT zrlp(z`^K9c$Q^$&M8fO^JGb0lM5f#u}J~#Y)^4JJYlC2<5Od)eXePi{k`ueI6hOA zOquriR>jhXu|_5r8qU-UOG;%pr2RZA#b>%_YvB?`Nh!XQ7dB)&q=D>bocYvz(!z(1 z%traSf7US0RCGSvZlYi;HBETJ!bB5=&zpOipQiU314D0d;t3w0sScK5p~_0FeKW^pfMPcP-r_`kJH(O9bO%=SzPqtpBIVp`99 zy4Cx?xsBauF{7kZ8xJpkire7{H%;H9l<}Upuwn8~>D)Q7hbK7JrhoXHLpoqeWA$;d>Z*u~*zN1LMa;R!&i(@c1PUO%(k zlxL>>m+cJ{h#=iF(GbvK#R=77k<(f)zT7uzhcFTkUK{ov1x%E*z?|8H_rj&GNXSt zll}lzly8*S4>Z)zZU^VouF0q7hb=5J@AeIi3DMFD(Gy*-rKR=m5rbS$?&RBy8k65J b3W>(gZ~Zvy%|6~V1|aZs^>bP0l+XkKqXo>& delta 424 zcmV;Z0ayN~1epYoBvjx@L_t(|0qw!jZ5&4w0Kwh?GwJ+8>R3*<02eqDM_DlRVeY)D zgHMmA<2V?5IUY|u9Z!#^<2V@mIDiLFkH>@K>G5rJ;++bWJNV#cRQ`lY z#ic@JH;Wrk`7cydzN7Mv%3UnpsQAB9f4Qh!R8AEY6~9waQE^gvN99y;Qu&E0-Z_8= zFDg{V{Zy#DTD+)G8TX`8@oMp@LS@{WO2uXINu^@kTZPJH@j|6y+*5_htHl>872{qi zRK7ZZ2RB!7Qu$8BN##2gCzZQc++2mq?^LL$RJ>E6ayN?`sQ9Ylr1CeY+|l9&CR8de z6)NN3EymUsV{0GWgi6IpW&D}NrYbHf6%{I%in}|22V+~4-T^clVr*?Ow)P9Vt>A2= S{;#M20000>>m+cJ{h#=iF(GbvK#R=77k<(f)zT7uzhcFTkUK{ov1x%E*z?|8H_rj&GNXSt zll}lzly8*S4>Z)zZU^VouF0q7hb=5J@AeIi3DMFD(Gy*-rKR=m5rbS$?&RBy8k65J b3W>(gZ~Zvy%|6~V1|aZs^>bP0l+XkKqXo>& delta 424 zcmV;Z0ayN~1epYoBvjx@L_t(|0qw!jZ5&4w0Kwh?GwJ+8>R3*<02eqDM_DlRVeY)D zgHMmA<2V?5IUY|u9Z!#^<2V@mIDiLFkH>@K>G5rJ;++bWJNV#cRQ`lY z#ic@JH;Wrk`7cydzN7Mv%3UnpsQAB9f4Qh!R8AEY6~9waQE^gvN99y;Qu&E0-Z_8= zFDg{V{Zy#DTD+)G8TX`8@oMp@LS@{WO2uXINu^@kTZPJH@j|6y+*5_htHl>872{qi zRK7ZZ2RB!7Qu$8BN##2gCzZQc++2mq?^LL$RJ>E6ayN?`sQ9Ylr1CeY+|l9&CR8de z6)NN3EymUsV{0GWgi6IpW&D}NrYbHf6%{I%in}|22V+~4-T^clVr*?Ow)P9Vt>A2= S{;#M20000 Date: Wed, 8 Sep 2021 13:19:44 +0200 Subject: [PATCH 3/3] adjust zemu tests --- .../snapshots/s-sign_staketx_normal/00003.png | Bin 991 -> 493 bytes .../snapshots/s-sign_staketx_normal/00004.png | Bin 1051 -> 560 bytes .../snapshots/s-sign_staketx_normal/00005.png | Bin 493 -> 690 bytes .../snapshots/s-sign_staketx_normal/00006.png | Bin 560 -> 390 bytes .../snapshots/s-sign_staketx_normal/00007.png | Bin 690 -> 589 bytes .../snapshots/s-sign_staketx_normal/00008.png | Bin 390 -> 0 bytes .../snapshots/s-sign_staketx_normal/00009.png | Bin 589 -> 0 bytes .../snapshots/x-sign_staketx_normal/00004.png | Bin 1463 -> 613 bytes .../snapshots/x-sign_staketx_normal/00005.png | Bin 932 -> 700 bytes .../snapshots/x-sign_staketx_normal/00006.png | Bin 613 -> 809 bytes .../snapshots/x-sign_staketx_normal/00007.png | Bin 700 -> 531 bytes .../snapshots/x-sign_staketx_normal/00008.png | Bin 809 -> 669 bytes .../snapshots/x-sign_staketx_normal/00009.png | Bin 531 -> 0 bytes .../snapshots/x-sign_staketx_normal/00010.png | Bin 669 -> 0 bytes tests_zemu/tests/phase2.test.ts | 2 +- 15 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 tests_zemu/snapshots/s-sign_staketx_normal/00008.png delete mode 100644 tests_zemu/snapshots/s-sign_staketx_normal/00009.png delete mode 100644 tests_zemu/snapshots/x-sign_staketx_normal/00009.png delete mode 100644 tests_zemu/snapshots/x-sign_staketx_normal/00010.png diff --git a/tests_zemu/snapshots/s-sign_staketx_normal/00003.png b/tests_zemu/snapshots/s-sign_staketx_normal/00003.png index ae7db8f54f759c296941634f55ae60154a485eb1..a3af314b731204d348933cce4f945802e8a9da45 100644 GIT binary patch delta 468 zcmcc5{+4-yay{b~PZ!6K3dXkwJ^P{!8JrKgAKdf5ac4q~qV5)J;|H4mRteqz>LX;L zP#n%1p7PI{_k<7c2^}DFS(~7X8VMNj5E*sP1^Bd=D8}h&gGdql$@E3!lfoGeAvaq+g*R=(gvW3Amdg7wPYLV zd$zHq*v;9IvEzm0d9}?ZK1L=A#-<9Jfp!Ab0WAzZEDAJNG9|;|89VQZJ5zXo#8e;= zGiS$yKxQNU%Nu}7%P)T@;q5+i*i_;3!z1jHQWGjUX2wsNDV68->}ATlWk46P%|ChJ z!=#k@j0KD{r(gR}BsJmZt0Un?{?`kNjZAcm>X#-?iUiwXWO8A{i9bM-%auPHGoAXs z2&n!-!+>Mbv;zw%~4?`6L*n1;L*7&~G`tB*<-)E)wyZc`X4>*VIfYf~mC6l27T*X$a|89Rr&V^@nL;mtpH% zJ@|sbg9EI1BDp^8aU^=jK^wO8tv$WLBzn$3LYW}1A$nomY$(I}k;e*R`9@m8c_ngO zaF@qc$6350j^#)CgqGA)eEAwnNby-JvVoqO{tPnvs8i9(chk?u<}`%enGKc`px_Py zF#O5gB8W8QQ{iNqSOd&LX0_2lcOgloU`KqT-0&C9QbG!VtC|~pP~64^!nab!_dlIc zs~_1!1MNq5XlbIEw&pTLZw$CgaJU z_Yai)bT5v%+ngP-H{|`qiNc=SvI*vNtDH_yE~A*CBH{=tfO6R$su9~W)E@#s52J{J zIfLM?aAq?r5kG1*avbEs_H0*?KgN12BHz3HAM6=v26tv2A-QZW1JePpA_{OvS-jzk zP=l;fzPQzZUcDNU3&dgdfD2blMIMRLmFyJtT_MnKP(8I4@x6Ay3w7uoDWjl6TS4$b zBxd)~p(T8VKCK5-IsONsRUn-E9#xIQw$RXOgN{5Dbad)q2tEf`ws-o`g}qRSe~1=q zJ43}^#q?TfkgmbHf;wbK(BjQmGT^EG_RLfJee2uzlPc=U@#k=G6{(gCb4Svlvwr}- C9jN;N diff --git a/tests_zemu/snapshots/s-sign_staketx_normal/00004.png b/tests_zemu/snapshots/s-sign_staketx_normal/00004.png index dfda824c5d0e63d21f438b5091576f955b15c0f4..a6d9fc54f258f030670d2f0115d4372a49ac94d1 100644 GIT binary patch literal 560 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfe}iba4!+V0?SO~hf9;tK{RYdo2a>SGS8e9q-P;lq1E zhnL+b_;BNyOATk*O%y)gTN)noa#i@GAMq1@K9-tLxuebVncmE$j5GZwFJzp#U2jsw zMeW$HUPAWk9y+9D!I8y;g^3eqN==BAnlMv}FC`-)g->c(n`c^PM9Q=_*Jr^ga(-=W zDRHqC7e6ctuW980TYX^z(DwOin@tpqO>1U=TyUkp8K{g8WXLqOlx1zwyeIx>NJ>rk zX#gZD3m>-j0I3;myHhe|r2OOJEjP7sIjrf!(|E;d-^=>1Uiz z{OMpzxhJ(p)%kG#)dn6TlR06BolSwhZ2g`hx9s6VDLJpUHrKRCK*w870Qyhb$OP!9 zKg-!t>|CD7F{b{u1=?*047=kA)~1Z9)@u)L&RFm;-ti8~tjz=WC6fB`z?8t?>FVdQ&MBb@ E0Ge9zg8%>k literal 1051 zcmXw(e`phD7{_zm$fnEH4W%__w_PHwgN0eHm+H`&bV-b%TUvD?cKzWFj`Y$N8wt1; z+M2EKy3kcG)lF_z7uTho4wpcfi%ewhpqzNLwMo?#bY#W+<&Ta2u@s8k^F|8K-TT}< z?>+DL`8*F7ZSuOQ_4In3PDgq6IS;@Zfs1)X5BCLgs7j|J|MocRKkg--+`MyOOG~-) zrq6kA^?2z0-0#tU%YJQPOrNxNtD9Eub&SRd`5;%Ru4HLspd5ubVWg2ZS0n8Cfsk#N zW_l+&2CAc3E3-5s+6&+7g?Bsc0gegJMl^U4TSHkS!tcSMJOm#_4+~;(RFIattW4NPvKz7y?b(Imc>`th<|3MpQg?qy zvd0&Sr?pAxBClS*oVO!n8iE=jJJP&L8(l8{go{=yIfH!gR;xL_va^w7C*i!;>juY? zd~8`l?u|`@{ViKgK~8ZqJI;el3+uO9u-lre5spDF@enNK@;Qi%^X>pF9j`ULd6AD@ z`;m}`pnkn@WGepD7$1DNT{)?> z3DZ}PCiOxYE%o^nb2^(+EdVqPrO$;(;3glKiAXk^Qr7V6MDLg7I%Jx1Kg}#@sbeFG?UbS3mG?wW&77K zElr@$V0hN7;Gm^uFk!DEzF?aVQ0iC{X0Or}H6NPUJV0$o212TqUPB6L@M}h0CD77LRT7OK0Bt>+VL|jbB!YtBzMI*G-4m*)WrAZ{o4$KnTex}Li4}}9^VdJTA~m71^f6HNiJC|w6P}snC+CDQ z8`j-}#v>)2XLh%=DITE417y?GAK+4zF`s zW(3%^mo}Vu12kr7;>4So5LWr&ab4o?6{%4azMB_~!sI~Hif zFEv4u_XJQMlO*!Z?#3sOtP33#YWq8<`c;L5@MCz;20@k^|E}<4r+M`)M-sV!@H#^AjSa=1qd& zy4hzgeF!<65doB4E#-FjQp1_|y9z5+HeYTy6R!>;)9+X;N}L!83{+rnp;0Lr5=P#K zl{TNaV35K$8RpJNknnspkVBmucFwtW?CBL~JoKJknH%Gm`?x4edV28f9dmA>Nd0Br Y@>lxK{tv6p0@EUcr>mdKI;Vst08+gthX4Qo delta 468 zcmdnQ`j&Zuay{b~PZ!6K3dXkwJ^P{!8JrKgAKdf5ac4q~qV5)J;|H4mRteqz>LX;L zP#n%1p7PI{_k<7c2^}DFS(~7X8VMNj5E*sP1^Bd=D8}h&gGdql$@E3!lfoGeAvaq+g*R=(gvW3Amdg7wPYLV zd$zHq*v;9IvEzm0d9}?ZK1L=A#-<9Jfp!Ab0WAzZEDAJNG9|;|89VQZJ5zXo#8e;= zGiS$yKxQNU%Nu}7%P)T@;q5+i*i_;3!z1jHQWGjUX2wsNDV68->}ATlWk46P%|ChJ z!=#k@j0KD{r(gR}BsJmZt0Un?{?`kNjZAcm>X#-?iUiwXWO8A{i9bM-%auPHGoAXs z2&n!-!@iTq$Bk!CWb7Gc{R_CZCzYG;_Dei9H^TJVr|# z(ts{e`K-&9o6Y|A`_dUHb~g_$_ij8hmq&BL%pf15Zjs4nl#Z%=_D=yS*PIY}qNck! zf5Ic(ncGwDP1>2_y>atF^9hb@Gvn2ryJBT)HUS+2RC%Ue(YZ_9h+8s9;WJ40NtTvv vYaMUjT9BIyb@^J}Ti1YgHgDUCB>bCMzqfRvo3xxI0}yz+`njxgN@xNA0N9%Z literal 560 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfe}iba4!+V0?SO~hf9;tK{RYdo2a>SGS8e9q-P;lq1E zhnL+b_;BNyOATk*O%y)gTN)noa#i@GAMq1@K9-tLxuebVncmE$j5GZwFJzp#U2jsw zMeW$HUPAWk9y+9D!I8y;g^3eqN==BAnlMv}FC`-)g->c(n`c^PM9Q=_*Jr^ga(-=W zDRHqC7e6ctuW980TYX^z(DwOin@tpqO>1U=TyUkp8K{g8WXLqOlx1zwyeIx>NJ>rk zX#gZD3m>-j0I3;myHhe|r2OOJEjP7sIjrf!(|E;d-^=>1Uiz z{OMpzxhJ(p)%kG#)dn6TlR06BolSwhZ2g`hx9s6VDLJpUHrKRCK*w870Qyhb$OP!9 zKg-!t>|CD7F{b{u1=?*047=kA)~1Z9)@u)L&RFm;-ti8~tjz=WC6fB`z?8t?>FVdQ&MBb@ E0Ge9zg8%>k diff --git a/tests_zemu/snapshots/s-sign_staketx_normal/00007.png b/tests_zemu/snapshots/s-sign_staketx_normal/00007.png index bd1f101f89f7ccace661c5c713b79a9c3ac34495..6c609bb9ddf64560e1fe479eb40e6ff0e38cf922 100644 GIT binary patch delta 564 zcmdnQdX{B^O1+4ui(^OyA9;Wd9c* zq4w*G<`pj6JkRsd2P>8-o437KlRn8}Pg}2f)vrv$eg|nGR_tGGz{JZ5JEPyf=I2 z`)q@1wg zo_F!Xe5rTK5+_DNLSX|?O?isj;R*GiFxgm*)WrAZ{o4$KnTex}Li4}}9^VdJTA~m71^f6HNiJC|w6P}snC+CDQ z8`j-}#v>)2XLh%=DITE417y?GAK+4zF`s zW(3%^mo}Vu12kr7;>4So5LWr&ab4o?6{%4azMB_~!sI~Hif zFEv4u_XJQMlO*!Z?#3sOtP33#YWq8<`c;L5@MCz;20@k^|E}<4r+M`)M-sV!@H#^AjSa=1qd& zy4hzgeF!<65doB4E#-FjQp1_|y9z5+HeYTy6R!>;)9+X;N}L!83{+rnp;0Lr5=P#K zl{TNaV35K$8RpJNknnspkVBmucFwtW?CBL~JoKJknH%Gm`?x4edV28f9dmA>Nd0Br Y@>lxK{tv6p0@EUcr>mdKI;Vst08+gthX4Qo diff --git a/tests_zemu/snapshots/s-sign_staketx_normal/00008.png b/tests_zemu/snapshots/s-sign_staketx_normal/00008.png deleted file mode 100644 index 06ec16e68c157053878c06f5d97f613c0b28de7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^4M42G!3HF6DHW(PFfjUhx;TbZFupx_uusZSz~$id zwI~1oe_*wQJtgXk65q6ILO$UwKeW|7Cos({Gt`{$)6=r>lBT-nmTs@cGscV$r?AW| zn&h&3g~$mTp1hztPh57JNe0<)aF}aO$P}N>G_(C+Gmqx2)};>5Za$a^WU&HS>Wm9> zvoCBj%ZQfVvR1aHTjYdJkWR`n5$>6qN1f6pK59J^%aszh#Gwr+;$QZGH%P&mD@DvG zm@7qXrY5V=GG@@P(& z8RTQsEi(Cx(ovPq{wYA^niC>V)O0uJPk5v|b9>6YNjtqaZa!!}!I5odyt;E&tZdCD zpj&_n&(teAcZnNuO9m-?25COY(z0!>t}ltZKXfzrAd+f3ld(g=SZcz;#1j`9czC-|W-S3fR0<_+Znb#!77szxttYj>eQBlHl zs@&v`%d-vg(%UCEJ_|NFA@eQ!ag>qCg@!ZMVDe$RY0Zjxq+gqLKkY*xN=Frx5vEj^nvvJ7eCCGdbccbVk9ICHUQO>r??#k2gn8!o|zX5 z9Men`oDWa9xw+RJQd3HNx-pS7QlYVNaWGqOWC<*kYLCU&oA67!*Vgb+~ zXJ%jwC<_I|IUb&1`6v7Fhf8LB`o0d9d)D+G_P%YgXG=Z9ihEzA=ckxO1Ct4Zr>mdK II;Vst0K{4e0RR91 diff --git a/tests_zemu/snapshots/x-sign_staketx_normal/00004.png b/tests_zemu/snapshots/x-sign_staketx_normal/00004.png index 26d2626221473f4919720b9f4ce727542bdb1af7..6359eb672fd2f28b635665ad34097b9dadfa57bb 100644 GIT binary patch literal 613 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|`bmba4!+V0?R!G3$;81H-{< z59WXQKmSVp#kUSDNuFo!CR%?x7b5$o$WG??!EMtX*F1PwVIkl5I3fBt;~bkg&rg0V z0L!!;Jp1#&wkgaOH>a82m}Yik+P7okD=U_Lx*WQ~M|AS3rH}klS5+)C3SCjtdQd$0 zr>2(Hza@`sMJIQ4oid(!f8`IZ{2FG_a;@N_ONv&`2+<1BQk&Y<4bc{`a>t607@$D7 z@ej6;kdS3vo~f&50Qugnr$QEfT9XtMI8#ecRI6M|Ty*O0F3+cnSNe#~f7`1c_HoUl z%|M;|W_Rs>*{i>-DBKVzQ?4Z{@A!0g;Lq7?_AW=4e2QO@Q*ZX;G|$;DpqsW;R| z>-KT$hRL~+&AFK%Bpx34ab8zfx~S;-oDYYzLhc1GTohEeG9YkeMQF45vQ2yQH|XZV z(FbYK^=lq23JP3U6u5Flz|WUjbT@PMZWWHl%z|FYHUPtdfn9eoz?bekc zF>L!+gygJW>-5xUN8rjEalx&p?mp=BI{Gb2D`cMRfs@ZqRKmb-jL{qH%e QfXRo!)78&qol`;+0Kd>ScmMzZ literal 1463 zcmZ9MZA?>F7{}{2$Lx^A50}UWnn;!{$EpEmtcc)%77K&+mQ#_G>C$+^2g!KZf)Wg6 zCPlgU5@W7p3&FMZx^rQawabPKg_(I1a+8H*AKaLz@w$GQZ)yFYWW?=%svnkpIHx`L z-t#>F^Lzf!8SvCsueQErwOA~xU3;p$`0c~k{l@Ev>|8t-tygc`?oz?jz7sN%P$))&(F!~dVJ3^ zywqNHVaHK>(4L?3;P%gFPd&-%YD-#%7p{&MPEU3ne0rn4)TM7Dk4Gz{v4FTRx{sch z!^MP-B~vsWD-6oA;f*uKY{H=7O);yoNeM?fYxPJmrM)$h zcBH>>%ifMUU6o~dTs}l%+T}~8yCKe+p>2P1Zha&mirt5W*}HRtT5~l0o^puB#3^Ue zeX(=U*jTW%5+Wm=E=gmTFD5AEq8$!B!qpEEx=zKjMXVMZkc2TPGPdUTZJqvlY#$xb z0%CW6;q;KFTTohdSX#Q;?$13MFIc$xJ*QjUKEE8ThbPAVYMsc2aJ%r(PBOz>Yk<3 zvKkPVVsbeB(Yw97C7P{(9y=+|V{B5yaDswd6p5{h7*|m!Y|RrY9nj*{Jqx2);Qa34 zXP<)|FNbPwBr{QSyJkb;T74IZnrnplcJnwCS0mOLPZL?ErYD(a>S8*(x~uKsbwMC! z01stq^&NHS+k{GqL5M>QuvU#OdW&d(4X+ny^pJj|h4P8e%>{j1-xkR9tUF}fID5*f z+`8jZ1NZ033GE7QSLBXA*AroS)*mwLiLf{R_f8*cEtvWW|E4KxF0r)CunbU;Gu)Id zdc$d!@nTH--J6Fxf$|TT3S=u2C8>h~nN`gZc>?dq8Sn#1gvCgmuqqeqsXCZ+4YWf# zQ1O=?b*PC7wusy5)^R{ofi*Y4r?z)zToMK37li#JS|N#ff?pt$5ZAyzk0f657B$b( zD#S$LX8yYVCLsES17fO8Y$CKQT1-YXGZ)-<)-P{RCcI6=siPx+TMbaQ+=xQVe`c2N zk;W<{0A>%K-x+8dT}vua_&oAL@3`F3fS&SWH5TBa(yhV}=l$6Je^a7`Pd~W*$G`y( z+7?day9QB?TtzIRv6n&MS^l(;Kjp5;1s_Yxeijg?F2Ok5uW3NzCJGt5;Gm3c)e1?2 zJLsd#3@^dQ0x9n>SMfw1?OBYQ74A#A8-cKZ%y*i{;R7FP$Gu}CgEb*zFQTVT$d2R~ zc17^ws8gb)kpL^bIS?E`=3;Ks9^U9q=GtvGwM6hZmuNfWig!o5S`@I z8-45w?h)QNZ6&E!a5xhD(W)Fq{ugG>D`T=R`vdZ3)$jw)K|qSK0fv@U+I_| diff --git a/tests_zemu/snapshots/x-sign_staketx_normal/00005.png b/tests_zemu/snapshots/x-sign_staketx_normal/00005.png index f636e65c288e33d1c3607404b44f32e2273e9d06..2f99be64ff91edcf9eac2e76c2b47e6f9f31cbca 100644 GIT binary patch literal 700 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|?$Yba4!+V0?R!(ND&bf#INB z_xvya=U>Uc8SO2ZxuuDNR21m}Yik+P6dOA#+0fMAfI-2O6&Yb6?9(D}JR@>Z%z) zv2d;6qsmiPIz3g6`*D25A8swRsq4c&T8mCT6&<1_7rJ84b?*5g3xht+>e8ON^3jr@ z!l0EiLY8q&?ebjuXo*p%j}}lRP~LDQ(1vwden8&JM_x}u3YUJ;m#z^O6`i^=DX6md zRJ0aIQ~#=fnOY(D78L~rS^~8Ktqw6Ku3!%@A6DtRbi$T4)n_VWuHXZ>K8mR2D*6VBlUpF?o<9IKiIT_ zU5|zy&DPrI)OxBsaHf_PP+zdCE69(Jbiu6Z5Ff4gr3~iV_OD6``soFeq6EWQK0M5#a&(L1{F-AT3Vv(R|W*Gv%h9T<)X@0Gcx=BF4ge)uq2KG9jOIHJVfvu8bg=d#Wzp$Py}%|K89 literal 932 zcmbtT?MqWp7@tIv6F=SzXZj(~I1V94FH3DX9CIr3-n(;6F~SBzs98EFw23d7Qdjbo zYf30Oo!&c1v=?nu(;?Rn^MmvzQc7!b5rPdG1uZ0du3!2C`f$$qo#(*w{C>aZIS)v) zF-e)CR45clrlLX`&Q@3#kHo|NZlk3|p*VEiR9Ju;;==y6T9sCz@DpFn3;X>GN8cpe zTQ2B5t{sfF^=Oity}nnMv+cVMuWx5t+WxsMIj-jRB-R1EBSj;>BM$G}$VxEyyE}}t zm$~rs_|HPpg2lO$fFhK3M#;IYl$SXrloDM5dOWIb&m^fzjGOye)`(M?Qe+YHVNK>R zsZ8FQs--}5Im*Po00j%zLs*SU#7SCCfQYVQ5l~*Sq#=x`Wi2S83{D885di~1$ma^(JodUbkdJz3uTe_locPaSw1_XbqQ%L*b(grP_I(yF@n*Cf3<plQpY?&oS3uO`rv zWnMngsY(P<)+9md?gN!p+RKbb?<+Yc6k}@|b{?ZqaJ`}PpiC|pOAaI4JRK^-dGA$U z#-8HWdJ)fKelJ~a43-;1lpI9VX#K~k&MfhIDU;TE$VT_s2v5dFScAk{VNk$JgWF2S zSk_>pz{;aCku(l&o|kTzg*`J!I0<)&BG4iXV7rnF?+TF zeu>9+T~$XQ=Nu_)HiJzQ{v?hK*9fHdR@|(8`t+u`c5dWTb?%FQ-B_@w?9*rd?_ob~ XK2D>3w$X75exJf*Fc;41tMC2=>iDrj diff --git a/tests_zemu/snapshots/x-sign_staketx_normal/00006.png b/tests_zemu/snapshots/x-sign_staketx_normal/00006.png index 6359eb672fd2f28b635665ad34097b9dadfa57bb..58c07d71c080dada175a3b5c5dc498b1df01158b 100644 GIT binary patch literal 809 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|{;->Eakt!T9!IV{WoJ6T?Np zg?`KaPg*8+^oVXFzq?)b^_|=~pY}@cx4CyG&%AH%9l899;_A;8#k=oXd@E#@+f!*H zcjq2N(w0Y0F5hBX5wo1kZ7G>(X_@HVpU;NsXn7x9RAggrv90Vm`^tcoKRk|3Jr%Mr z$Z%x{SnAVUUNazPg^#FrD^UDX+|eaQp*88vz9BlIqWf1rn%VXK)j9r!K^s?u*eovk zbNoU3$_lrqt3&1m{#?f<9XL}Mlo6OPqiT0)L*F zE5341_(G%56+T*EN8)0MY6XM*0F>Sn{xJ^942c2iL&${GEP1q-YwCSN3p=21wWiiL zovIIB_{o3A=S4uL83S$C2D&yp#7C>!>*$hCl2bvhbb4Cvxil%L(zW%JJJ99l?^HIP z3Mvf!*aNg}6EIwWHtL9;hg-8L1mfI3_F${yml}ocd2~)3sAhg(q?X;{O(B0Yr!IYD zEE;??XyK>)RWr1vaZR-^ef~pw>T0g3^|Mcfww?;VQ@O|~b!7x7#4sr_ptC@tAo^*j z7SPq{AwXxl0v-8N3+m*((jOiya(eosQY&N~o4Baf@$*Z93Qd131q$5^(VBKpUrY4( z`LKnXc=STF`sS~6dYbj2&+F*N%^@rHlq1p*Fd0!1{pQZfKX_LD!IvGtEWqID>gTe~ HDWM4f7(`vL literal 613 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|`bmba4!+V0?R!G3$;81H-{< z59WXQKmSVp#kUSDNuFo!CR%?x7b5$o$WG??!EMtX*F1PwVIkl5I3fBt;~bkg&rg0V z0L!!;Jp1#&wkgaOH>a82m}Yik+P7okD=U_Lx*WQ~M|AS3rH}klS5+)C3SCjtdQd$0 zr>2(Hza@`sMJIQ4oid(!f8`IZ{2FG_a;@N_ONv&`2+<1BQk&Y<4bc{`a>t607@$D7 z@ej6;kdS3vo~f&50Qugnr$QEfT9XtMI8#ecRI6M|Ty*O0F3+cnSNe#~f7`1c_HoUl z%|M;|W_Rs>*{i>-DBKVzQ?4Z{@A!0g;Lq7?_AW=4e2QO@Q*ZX;G|$;DpqsW;R| z>-KT$hRL~+&AFK%Bpx34ab8zfx~S;-oDYYzLhc1GTohEeG9YkeMQF45vQ2yQH|XZV z(FbYK^=lq23JP3U6u5Flz|WUjbT@PMZWWHl%z|FYHUPtdfn9eoz?bekc zF>L!+gygJW>-5xUN8rjEalx&p?mp=BI{Gb2D`cMRfs@ZqRKmb-jL{qH%e QfXRo!)78&qol`;+0Kd>ScmMzZ diff --git a/tests_zemu/snapshots/x-sign_staketx_normal/00007.png b/tests_zemu/snapshots/x-sign_staketx_normal/00007.png index 2f99be64ff91edcf9eac2e76c2b47e6f9f31cbca..03398bcd55997434845033d9e2c240909c2ae245 100644 GIT binary patch literal 531 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|_uE>Eakt!T9#z#opTy0!q%C1R*Sao78AfTlWgpF0i$(B9XO|cI(I4_t{klHN zPYo8b(wG$xSn2k3N{e1sTFAQ)KhGCSGL$&gr%pbl$$3{NVX@#;_emE5FZu|*n{*-c zW5X$R??alLvMX#hHS}^%Rp~jucv8#iM^37okBwCwpRW3`Y*Nd|o0Aq4Y3);WOsz4S zsxqgmTV+Mh`6VD_YMfe+H?L56n8zr+c&+}umQ#wH;acUM7Ax+kK3q^VwZ(esZWWmj zKA?aM(1@um;h}pNfeumjtWe`TuL4xEw8+CrXi`DI&sa~7L)suub_eeau4LEJTK}fo zd}2%UDP^tmD{K}Qc^sPW(bNU>Lbzu|Y5X3}sqvnNj6ud|X?ea_R*|T+Tt(&K5~F`{ zAK4}qcpch54X9OW=^b literal 700 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|?$Yba4!+V0?R!(ND&bf#INB z_xvya=U>Uc8SO2ZxuuDNR21m}Yik+P6dOA#+0fMAfI-2O6&Yb6?9(D}JR@>Z%z) zv2d;6qsmiPIz3g6`*D25A8swRsq4c&T8mCT6&<1_7rJ84b?*5g3xht+>e8ON^3jr@ z!l0EiLY8q&?ebjuXo*p%j}}lRP~LDQ(1vwden8&JM_x}u3YUJ;m#z^O6`i^=DX6md zRJ0aIQ~#=fnOY(D78L~rS^~8Ktqw6Ku3!%@A6DtRbi$T4)n_VWuHXZ>K8mR2D*6VBlUpF?o<9IKiIT_ zU5|zy&DPrI)OxBsaHf_PP+zdCE69(Jbiu6Z5Ff4gr3~iV_OD6``soFeq6EWQK0M5#a&(L1{F-AT3Vv(R|W*Gv%h9T<)X@0Gcx=BF4ge)uq2KG9jOIHJVfvu8bg=d#Wzp$Py}%|K89 diff --git a/tests_zemu/snapshots/x-sign_staketx_normal/00008.png b/tests_zemu/snapshots/x-sign_staketx_normal/00008.png index 58c07d71c080dada175a3b5c5dc498b1df01158b..cefc39ac9d6d72a62165397da42d91c3eb99e0f5 100644 GIT binary patch literal 669 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|>q|ba4!+V0?R!F-zN=f#G80 z!`Wy4_M4>NjJm*@JZYOf=as%M_YU4axBIchjcY}7%J0aQKfhZjlk?i5Ve;xz(&6*j>uR|G^J zOc2x(oz6A2+w163r>EPcb=Ekgu8O#r;G7z2E*7{j$Z(~P=;Tu&hATtUCeAz$qX`aVNhY<%8F$`^MYn-g=ncw<(k^neQN0=pc><;;lT@yc<)8Do>HFL z-379Jg^%d;u5?kY^IB@6Q&&1YU9{*^mR5+KxmZBq${#(a_OIL#vS%{aRCjZ+#h-#h z?zy&}+I)~Hq^|3fbkFXX;EO{Ot6C=1$|t_mcQ(gvgrNLkIS|6L`CHT11n9FVdQ&MBb@0L)4^DgXcg literal 809 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|{;->Eakt!T9!IV{WoJ6T?Np zg?`KaPg*8+^oVXFzq?)b^_|=~pY}@cx4CyG&%AH%9l899;_A;8#k=oXd@E#@+f!*H zcjq2N(w0Y0F5hBX5wo1kZ7G>(X_@HVpU;NsXn7x9RAggrv90Vm`^tcoKRk|3Jr%Mr z$Z%x{SnAVUUNazPg^#FrD^UDX+|eaQp*88vz9BlIqWf1rn%VXK)j9r!K^s?u*eovk zbNoU3$_lrqt3&1m{#?f<9XL}Mlo6OPqiT0)L*F zE5341_(G%56+T*EN8)0MY6XM*0F>Sn{xJ^942c2iL&${GEP1q-YwCSN3p=21wWiiL zovIIB_{o3A=S4uL83S$C2D&yp#7C>!>*$hCl2bvhbb4Cvxil%L(zW%JJJ99l?^HIP z3Mvf!*aNg}6EIwWHtL9;hg-8L1mfI3_F${yml}ocd2~)3sAhg(q?X;{O(B0Yr!IYD zEE;??XyK>)RWr1vaZR-^ef~pw>T0g3^|Mcfww?;VQ@O|~b!7x7#4sr_ptC@tAo^*j z7SPq{AwXxl0v-8N3+m*((jOiya(eosQY&N~o4Baf@$*Z93Qd131q$5^(VBKpUrY4( z`LKnXc=STF`sS~6dYbj2&+F*N%^@rHlq1p*Fd0!1{pQZfKX_LD!IvGtEWqID>gTe~ HDWM4f7(`vL diff --git a/tests_zemu/snapshots/x-sign_staketx_normal/00009.png b/tests_zemu/snapshots/x-sign_staketx_normal/00009.png deleted file mode 100644 index 03398bcd55997434845033d9e2c240909c2ae245..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 531 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|_uE>Eakt!T9#z#opTy0!q%C1R*Sao78AfTlWgpF0i$(B9XO|cI(I4_t{klHN zPYo8b(wG$xSn2k3N{e1sTFAQ)KhGCSGL$&gr%pbl$$3{NVX@#;_emE5FZu|*n{*-c zW5X$R??alLvMX#hHS}^%Rp~jucv8#iM^37okBwCwpRW3`Y*Nd|o0Aq4Y3);WOsz4S zsxqgmTV+Mh`6VD_YMfe+H?L56n8zr+c&+}umQ#wH;acUM7Ax+kK3q^VwZ(esZWWmj zKA?aM(1@um;h}pNfeumjtWe`TuL4xEw8+CrXi`DI&sa~7L)suub_eeau4LEJTK}fo zd}2%UDP^tmD{K}Qc^sPW(bNU>Lbzu|Y5X3}sqvnNj6ud|X?ea_R*|T+Tt(&K5~F`{ zAK4}qcpch54X9OW=^b diff --git a/tests_zemu/snapshots/x-sign_staketx_normal/00010.png b/tests_zemu/snapshots/x-sign_staketx_normal/00010.png deleted file mode 100644 index cefc39ac9d6d72a62165397da42d91c3eb99e0f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 669 zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3HERU8}EWU|>q|ba4!+V0?R!F-zN=f#G80 z!`Wy4_M4>NjJm*@JZYOf=as%M_YU4axBIchjcY}7%J0aQKfhZjlk?i5Ve;xz(&6*j>uR|G^J zOc2x(oz6A2+w163r>EPcb=Ekgu8O#r;G7z2E*7{j$Z(~P=;Tu&hATtUCeAz$qX`aVNhY<%8F$`^MYn-g=ncw<(k^neQN0=pc><;;lT@yc<)8Do>HFL z-379Jg^%d;u5?kY^IB@6Q&&1YU9{*^mR5+KxmZBq${#(a_OIL#vS%{aRCjZ+#h-#h z?zy&}+I)~Hq^|3fbkFXX;EO{Ot6C=1$|t_mcQ(gvgrNLkIS|6L`CHT11n9FVdQ&MBb@0L)4^DgXcg diff --git a/tests_zemu/tests/phase2.test.ts b/tests_zemu/tests/phase2.test.ts index 3965ebca..a1a9c483 100644 --- a/tests_zemu/tests/phase2.test.ts +++ b/tests_zemu/tests/phase2.test.ts @@ -107,7 +107,7 @@ describe('Phase2', function () { // Wait until we are not in the main menu await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot()) - await sim.compareSnapshotsAndAccept('.', `${m.prefix.toLowerCase()}-sign_staketx_normal`, m.name === 'nanos' ? 8 : 9) + await sim.compareSnapshotsAndAccept('.', `${m.prefix.toLowerCase()}-sign_staketx_normal`, m.name === 'nanos' ? 6 : 7) const signatureResponse = await respRequest console.log(signatureResponse)