From 2c891d3506655fe8dd9e39727257c40fc3cba29b Mon Sep 17 00:00:00 2001
From: emmanuelm41 <emmanuelm41@gmail.com>
Date: Wed, 20 Nov 2024 17:52:59 -0300
Subject: [PATCH 1/7] feat: udpate consensus branch id for nu6

---
 app/src/refactor/sighash.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/refactor/sighash.c b/app/src/refactor/sighash.c
index c43e2375..c95834ef 100644
--- a/app/src/refactor/sighash.c
+++ b/app/src/refactor/sighash.c
@@ -36,6 +36,7 @@ const uint8_t CTX_ZCASH_SHIELDED_OUTPUTS_HASH_PERSONALIZATION[] = "ZcashSOutputH
 
 const uint8_t CONSENSUS_BRANCH_ID_SAPLING[4] = {0xBB, 0x09, 0xB8, 0x76};  // sapling
 const uint8_t CONSENSUS_BRANCH_ID_ORCHARD[4] = {0xB4, 0xD0, 0xD6, 0xC2};  // orchard
+const uint8_t CONSENSUS_BRANCH_ID_NU6[4] = {0x55, 0x10, 0xE7, 0xC8};      // nu6
 
 zxerr_t sapling_transparent_prevouts_hash(const uint8_t *input, uint8_t *output) {
     const uint8_t n = t_inlist_len();
@@ -148,7 +149,7 @@ static zxerr_t signature_hash_v4(const uint8_t *input, uint16_t inputlen, uint8_
     cx_blake2b_t ctx = {0};
 
     uint8_t personalization[16] = "ZcashSigHash";
-    MEMCPY(personalization + 12, CONSENSUS_BRANCH_ID_ORCHARD, 4);
+    MEMCPY(personalization + 12, CONSENSUS_BRANCH_ID_NU6, 4);
 
     CHECK_CX_OK(cx_blake2b_init2_no_throw(&ctx, 256, NULL, 0, (uint8_t *)personalization, PERSONALIZATION_SIZE));
     CHECK_CX_OK(cx_hash_no_throw(&ctx.header, CX_LAST, input, inputlen, output, HASH_SIZE));
@@ -166,7 +167,7 @@ static zxerr_t signature_hash_v5(
     cx_blake2b_t ctx = {0};
 
     uint8_t personalization[16] = "ZcashTxHash_";
-    MEMCPY(personalization + 12, CONSENSUS_BRANCH_ID_ORCHARD, 4);
+    MEMCPY(personalization + 12, CONSENSUS_BRANCH_ID_NU6, 4);
     CHECK_CX_OK(cx_blake2b_init2_no_throw(&ctx, 256, NULL, 0, (uint8_t *)personalization, PERSONALIZATION_SIZE));
 
     uint8_t header_digest[32] = {0};
@@ -215,7 +216,7 @@ static zxerr_t signature_script_hash_v4(
 
     cx_blake2b_t ctx = {0};
     uint8_t personalization[16] = "ZcashSigHash";
-    MEMCPY(personalization + 12, CONSENSUS_BRANCH_ID_ORCHARD, 4);
+    MEMCPY(personalization + 12, CONSENSUS_BRANCH_ID_NU6, 4);
 
     CHECK_CX_OK(cx_blake2b_init2_no_throw(&ctx, 256, NULL, 0, (uint8_t *)personalization, PERSONALIZATION_SIZE));
     CHECK_CX_OK(cx_hash_no_throw(&ctx.header, 0, input, inputlen, NULL, 0));

From 87ceb7cff8154fa742bf9988bdb8b68f646f8916 Mon Sep 17 00:00:00 2001
From: emmanuelm41 <emmanuelm41@gmail.com>
Date: Wed, 20 Nov 2024 17:57:06 -0300
Subject: [PATCH 2/7] chore: bump app version

---
 app/Makefile.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Makefile.version b/app/Makefile.version
index 4f5f98ca..82feb033 100644
--- a/app/Makefile.version
+++ b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=4
 # This is the minor version
 APPVERSION_N=2
 # This is the patch version
-APPVERSION_P=2
+APPVERSION_P=3

From 2a38a075b156fb9fa5e01e405860f2577db3b901 Mon Sep 17 00:00:00 2001
From: emmanuelm41 <emmanuelm41@gmail.com>
Date: Thu, 21 Nov 2024 08:54:06 -0300
Subject: [PATCH 3/7] feat: bump snapshots

---
 tests_zemu/snapshots/fl-mainmenu/00004.png | Bin 9640 -> 9838 bytes
 tests_zemu/snapshots/sp-mainmenu/00004.png | Bin 437 -> 452 bytes
 tests_zemu/snapshots/sp-mainmenu/00010.png | Bin 437 -> 452 bytes
 tests_zemu/snapshots/st-mainmenu/00004.png | Bin 11444 -> 11634 bytes
 tests_zemu/snapshots/x-mainmenu/00004.png  | Bin 437 -> 452 bytes
 tests_zemu/snapshots/x-mainmenu/00010.png  | Bin 437 -> 452 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png
index e82292883edd031c12391069d5e5d5927549d1bc..fa946076174bbdd91ec7bba6992550e8db2cd27c 100644
GIT binary patch
literal 9838
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

literal 9640
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
AcmMzZ

diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
index cf1ce0a4397871e343259ef2c27d6d3b5ac21f0b..500d0b8f1c73c8212f68f3adafa1ac60fe9622ed 100644
GIT binary patch
delta 426
zcmV;b0agCB1H=Q6B!7!ZL_t(|obB0La>F1DKvB2Tov{BUv6p^i!Y~pDVFXDg_k1NT
z0xTYJ@pS<J00000000000Dvui)~m=l>x(I+#R`oY>K0Q<&GODlW}|MDwEZo{i%vv!
z%iwHcYaapy3_zimLUXE?ugx+#)|pCCUW`+(6{GXLsAkFAet!e&dJr8=PvWz<jdESr
z)1<TD*=?FlU!(1)jtXDmVJpCxaiWYT+)!3h&e^|N8?D=2t^XQ3_a9;gz|*rj#l5Y`
znbX-ZC{fOmy{H`n5V-}_eVw{nz5fKd_jB#PxJa&msX0|b#E0vd)0}ht+gN|q;n&Rb
zpTE3rT1Pee)_;uZ-G$R2y*ri|gl>|_{xOYIll{XOgI8h~dZj^<8H25KdIL^F4{JWj
z8IPE=XG*XPpTUQx9q%UoFm91ZlQ@cD7N1}rgxy#HEC0Lh_I4{^MQ@3ebCL618v2X@
zC}*Gbp}a1`1{KEGG-ls4OqDq=@|EOy^{m&gB*nW2)*}Z10000000000003X*AEt~(
U6uMo2KmY&$07*qoM6N<$f)e+~?f?J)

delta 411
zcmV;M0c8Hf1GNK?B!7HKL_t(|obB0Lj>8}fKv8DYov{BUv6uO%ijWP)Bu+{+_k6V}
z24WtGXi5M800000000000N@fo=c_2C=!-e$lNA~@v@PbGyXBpgtVSIuX?vZF7oCXe
zmciM?rF{q#FaVWa3f-w%zjn*$SZ69lc`;6-R*cS%qPisy`+p6r>rHete~8cGHtKa<
zPnXVuXSeA#oo3rn8x_99!&ZPX<3t%xxS_73Qi^}GHd?p4+Ws0l_upa$z|*rf#iOms
znbXxVs8P<6qo^weAaV<8`?_?udjAP@>~ZbCc#>QJOLMA*h!5$L(^5+NY;3>k@U-&&
z=P$3D)=}NQb$_Eqci}Wi?-ff7!Z68X|2Caell_}92H(Uk^i7i_GX|H^=?ypyy;=87
z&UnRKJyU{Z`VKxl?buEHVcba~P2wnqS$qfkAdD5TFJp;pyLz560QKy%J(SmF9+&-n
z84ufI|1@mt87p8!JS5s-GkyX900000000000095N9~1$%PRhz`Vut_#002ovPDHLk
FV1j&vzVrY9

diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
index cf1ce0a4397871e343259ef2c27d6d3b5ac21f0b..500d0b8f1c73c8212f68f3adafa1ac60fe9622ed 100644
GIT binary patch
delta 426
zcmV;b0agCB1H=Q6B!7!ZL_t(|obB0La>F1DKvB2Tov{BUv6p^i!Y~pDVFXDg_k1NT
z0xTYJ@pS<J00000000000Dvui)~m=l>x(I+#R`oY>K0Q<&GODlW}|MDwEZo{i%vv!
z%iwHcYaapy3_zimLUXE?ugx+#)|pCCUW`+(6{GXLsAkFAet!e&dJr8=PvWz<jdESr
z)1<TD*=?FlU!(1)jtXDmVJpCxaiWYT+)!3h&e^|N8?D=2t^XQ3_a9;gz|*rj#l5Y`
znbX-ZC{fOmy{H`n5V-}_eVw{nz5fKd_jB#PxJa&msX0|b#E0vd)0}ht+gN|q;n&Rb
zpTE3rT1Pee)_;uZ-G$R2y*ri|gl>|_{xOYIll{XOgI8h~dZj^<8H25KdIL^F4{JWj
z8IPE=XG*XPpTUQx9q%UoFm91ZlQ@cD7N1}rgxy#HEC0Lh_I4{^MQ@3ebCL618v2X@
zC}*Gbp}a1`1{KEGG-ls4OqDq=@|EOy^{m&gB*nW2)*}Z10000000000003X*AEt~(
U6uMo2KmY&$07*qoM6N<$f)e+~?f?J)

delta 411
zcmV;M0c8Hf1GNK?B!7HKL_t(|obB0Lj>8}fKv8DYov{BUv6uO%ijWP)Bu+{+_k6V}
z24WtGXi5M800000000000N@fo=c_2C=!-e$lNA~@v@PbGyXBpgtVSIuX?vZF7oCXe
zmciM?rF{q#FaVWa3f-w%zjn*$SZ69lc`;6-R*cS%qPisy`+p6r>rHete~8cGHtKa<
zPnXVuXSeA#oo3rn8x_99!&ZPX<3t%xxS_73Qi^}GHd?p4+Ws0l_upa$z|*rf#iOms
znbXxVs8P<6qo^weAaV<8`?_?udjAP@>~ZbCc#>QJOLMA*h!5$L(^5+NY;3>k@U-&&
z=P$3D)=}NQb$_Eqci}Wi?-ff7!Z68X|2Caell_}92H(Uk^i7i_GX|H^=?ypyy;=87
z&UnRKJyU{Z`VKxl?buEHVcba~P2wnqS$qfkAdD5TFJp;pyLz560QKy%J(SmF9+&-n
z84ufI|1@mt87p8!JS5s-GkyX900000000000095N9~1$%PRhz`Vut_#002ovPDHLk
FV1j&vzVrY9

diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png
index c8ba170d529a50a27847cd88d36ed9a69e0afbf0..f07b2ba3d1a5b9fcf5ea4ca9a9a594d947636da6 100644
GIT binary patch
delta 8928
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
F{|5#qTtxr?

delta 8715
zcmaiaS6EY9v~?&}no>lm7Mh5{0i;Peh#(;bj2fCIfKm)d6M_`U7F3W9i3aIP3DN>m
zB@luJMG55qLPWZN0V2IafPdqEAMV@TdC9lFz1LoubFDGQ7&D9Zm3E0|>{LRaSB!53
zrq2w{U~}}D5l(G&BrX!~4ekqJFQ32~<wu17fS)(KH@ROrT09Y6-1)&Cf(bc>dve|r
zme&6{cdty&{KM%(qnvL``cUBm5bwEN^dJQCI);Ea`Ut33D5H?iF&5>KJZ0>CVLjME
z_o__}M<x2#Min^H7bcJC(Twx+s_4_N4Y2LRqEO6IuYE)9!*15U^N~k*kw}AzRYfJn
zjd(A6yqxh7{kH}psiY)Ckf<p_bnxaageVrp2#a(&-s~&YymrfmIKg7&`(1!{(?@-f
z_bP$Ym~S;(>>8E$F*W|uLiWbzPZL2qE25tL(~mA33}4#dqz7l6g?H<+IR1K6N}huR
zuN`slj(H|4=bNM{0*TbN$<P0XpYD;CD<%(BciWYNI`4v0d!jm2k6B3w3vOA{Hkj=l
zI;+`Ay=*KKONV1orPf7h&Hi@8Z)aP8@;_vSU(G>gj@y})KW741e9MX5n%gHLOK&DZ
z@%Mpgf4!*}bH8<4)cEsw3@e(WhsQ?!Y-x%m>3+sXVg-}5(&8)^u3c*}PnP4SPn{r>
z*_D-325F=z3b=Y*)}82#T0ewnSIyz@lO2Ac2JvIvQ_FM1M!M-F%!OB4s0`qkq3@kx
znVq~fiz3$@srF*_&%3^9&8uZNq&?~eabh9xWvNwuw@)OQ-OFCdG6JlNdcXv&%?&p<
zM>c$Zq%Y%gV9>A1K8}39->U}L;cTq0+m=|%%F2S@Yc(JH?S`i1Rwg7Q0J}S(b-%8}
zNZ?GKp47>(49a8$;m*baq@qhQ3A;PnTi}$z)LAOR@}*SrOEtjvnjP`R7?>+g$kekt
zNG9_0FLXkh|E@sAAHPZH@eCm2;KESlLeu&?o5d#Y=hdDrvcSXO$~m>|r=x3yzXwb{
z6jC~)mX<aiPrczpabSem9O-_gXfwBFw_dF0`wzo8+%c8Hsern#RKn~Vx3m0o{f?qS
zFavbP4+rjtI#NHY4YE4y1CQ|9zcGUzk5I4rUR{DV3O=!AV}AtP0~0~BRu8WtG(+#>
zX62xG)<)B#jlyX&ldJh(oLl}pHr#S?zaQUF<9VBw4Q>a$49?O3jF^H&-By`hOVm{X
z<R;T&#sWVArZbq-hQ~*{ukASgH-~>Ww(zb3v3c7dI{V~7=P#Rq`tH5XcD<VLR8o1p
z(!p^0=t)0ldFzb}8dU9MQbGOc?rZ%s)`w-aOhSU7_$vrGp7-8!3mKM*(mSH2r-px>
zJlLg~(eU2K1lv4@2uO5Z7V@dG*JV}r&oq@AZeRH710Zp@Upl=@k8h)F#A00Zvm<-9
z<SUAYxU*^|b~mZZ9@aKmf{%2h1S9FA{d4iIHJQg|swb({h@URUS92@-^l<5kE`5`8
z2{4m<-5!AuXzEY;nXZEk%R{Pj`f~wwL;Y0?o9ACUfcd+7)Cx7VQ#APuJc!AptV$8R
zKkKnTLmpet&iX>l53>+?OzP}f$XU+V*cpBkyE~b3-|m;X`S(8Fsa)`?>7NO}qL^3|
zF)tu*Z7Z}}la8D4?7_UJVggy%HicR9X+!#w{-2$WQg-3p_b(!Oty4*QKYVvrILXQb
zO`%`FzzV&H9XcTz9Q|ABdoVTAPvGnKo?w7V{4@~|f)MSW(SqXXqw_Dgs+{kpl2FW<
zwGimFZ@v3yD_&pz#r{MZ=`XR>7c@3B^ySK&_dT_|_sXTVe+Ji~U4@az`1BeldV$|0
z?$s1uNJZbIToQ--NDg01j*?zhN7qCF+y0)Vu=B5DKOQG%YaI+9^io{WV;vJJh6w>Y
z0=L!Ov&93f_TnF+?`}TnMr{4Kn`vshI70TbRQ#&i*(ibjq4)OOJrjY9jr>la)mA3Q
zcj!jfMx=&26%CV{2qF^<TVyYsKOKD<g$yy_Hbcls4^hY=!%3sc)f-q8Qsvk}<MW&y
zi_W1?x@;?LVQofHU^4H*JtbNq(B_&$Ret33_V=V)*@K$?mEi4#g;6X1jg<1Q<z`ev
zFw~|00ty}l4hX#*<|RaXEqMIVr4urfRV4;83G|A8Xyl^k&+0PU7y+8QG0_Mm7U2{e
z1_-;7>0J&h!D}Uj%DZc{A^GnQy0Esar9J==khXq{X9j=|$S*g)I#f=!@bcLFwmw6c
z+kfgpwe7&%30c*p5OsD$LUKxNS7>F$G2Sq=sf6uLpG?=_EPrw7F6xirPpw_aP=H`~
z;Ml&sv#dd|I{*V}^T{4DpSO2nEmIA-g)Rdg?fDnK8fqBb94)l+_z-zZljan2>(Oo0
zriji`JH3@cK7Xtx2<@n=&es^4xp`G7;vU_tSFn-dw%a3RR6*X};)dXA#r0uIDM;c(
zcSJS>7s2FAxCJ$g|1DM*!}dY6PnJPm8#{8TJ#FMBTvNV(B9_)(o2`T%<cF*eIk4{F
z<x0KwLmnrbIz{++1WOo^k_Hyo+(m2(h3qhR7*exdcgq;w{nF*ELp~-LQ&X;zM)GZc
z4i>A08&w^*{#UJ<AOFcUfO+3|INY(K?<-TpsS;gUNA_!{%Be<YC#q`R<~m;fBT?;O
zxEyqxJ+`1jv9crLt=n}6!9=R?(XTfI;$|STm9|0vLl*=Nf2Ybb-8sg`Oc6(T`K%3Y
z9*<xxZEUP?+cx0|v%XRu{BiNM4H@I^sU)(;%<~n06wAAi9qhk(=WtR=xi{ZblDcBR
zhr$aGKE@KqLs#!V7(TaV%3lwY=h?rR_Op5>?nsW(^u=qe`f`;^8J4NBJBIWyG+qve
zvIopdgFO3J6$U@4=}QSxP3HT346{N!4KpmYv$P?8DpIyM<rOVdOL^2k_Cyy-TGquK
zpBs-7zZD=-?Q+79$ez5lFTQ`YdxVNRw~Gqxr>}7zw-1!=ZF)D~73f1nGsL0zTS%;7
z)<yBvt!<zCcA}<CEEMl-NBW2meNHAO0^jFDJcG9$f)GGlGeh|6WfT^6?SJV~JLnbZ
z-8Z*3OKZrKMK9_-xoTG(xiS&Q;Gkny>%&jZKWfl4D=M@=CuF~?$(NLTjLEATB(DV%
zU4moj)61{a__wv=1H`tq(mPn4%u-z>gj~U~c$C4vc<E{|P^OK{-TD)7X?F!siq2Mg
z*e;OYlcSVs>l>^uvwe1ca1Y-Uh}S0t+J=-=<L^l;3hv?gdd}CV=jD)N%ZZJ6gcB1R
zT;L!f<c=<8vU_&B-c1iamCW$&x|>D<Yc6=%mNK`tclx&;QJ#+HSlx?Hd(xN|__gAh
zglyOQu9a-#BX_2ydUybv9;KT$sV?wtQPcN>Uh=gH#IyI0!(01AY#Y;TACA7W=)OhD
z%Db00_A%=1%}iD@5pQ`V3fyE%8+VvkJ0ce4F<hb)O(Cle#_-dxFTTU1Iw`UX_d^0J
zLCifKfe`(6xV2nGu{Wm0Ym>ND)cZ}9bq68(kgpt*N@kn!00^EUG8@gKxp+`z1g<|l
z=AxPAf905I=X?uuFoKU8<QKtI85B~ja?p#(UIAH#(dH8Cr)u0`Y!;el`KJ89h#A)t
zo1j~cQ>J9-Kf!$-j!<uN8NaiP8w!J1Y)_4IS0M<<CElrKHi6Hb0t=E~k_sN+*IIlQ
z1NB?-{{wVn2>XXxezD7Lc|V&_y|XxlFM6vKO%g9Cs`gae??r)x7QC9JYfawvGDJZd
zRvN9OR@{osnx9fI>vuB!E-=aq3te&VO!k<k03Q@T{@Bo}Bi<Bo3)wSS@oZ-i0a0C3
z>{v>Etl6WKAx(43+{(PXEZ7J$+}__<895*?R^NAeZEW_ebJC?(5Sel2_R+(TfTINC
z(>4U3gW~Y9Igx1{nS}P*y={`ZK_s)|oA05R?X_zB1i6&mp*#!7e88gqZg8#&BR5+U
z?$$8julL;PhliU~^U^sgjThoQ`QGFc2?OqaB;knQ2>@q#2r~5DB*a$zFs%D~+pN=P
z-#_VKHQkBv?6*iLC@fTb2^ldkD2tT8X^u&?2yeYb%=5E6fIq#5CI0Lj7-T+E=Hk>4
zcF?uLw|yp{u1NiEO}{{X)*b`ZFX4sEO(DXn2E8);K#K75_2f$I%iN*#OQCDYd(%1t
z=C*q*GB(@XwRF~IZwEOYM_;7espbU(mDmVUegF1}paydciurAjI_R}lC=988I>7@Y
zk;_#iGt4Pr#Rzl!71uV08{AJGmH9aKV9!7On765(m6e4>HTypH17>!>N1~qdz$iA6
zbf=^)kZ0QwLGqt|5nKZ>5~>oEeEk?2OcAq6ze#c2W9o73Zf_FKqi*n+>CuSMDSwKm
z>8EXZNT4bo**`1gieEJTsLSyP&;Fs_*IVGv_agpr%ERbUTA+&6t_t>hTwygcvvco>
zs|h=m5v8T7DMk{8u-9@?&e6NSru^{{Z9$WB;Hr)<#-cjt5<Qx5glKzho2#E;*2HHr
z+gTvl&uf_=CYMQ6=6Z5om9JQhpRV>G^^2@x04m=>8?Ny<*{GooOlCDGnmErHXY0sy
z8pgA#Tu;PQcdo5%RYX*B<Ain&?)zI+-UtYb>#?G<1F;&Akq{um4~nm+oPf+5L_8ye
zDPKu?a}%KP5qq#GgeaX!SBuRCiR3=E{grM_7dt)HC$-qI^`5qrJQW5BlkVp$73riy
zNszHQ!VAUgSA{m3fO@DZv3p7rfskrOBF`h4rv)RQR-T9AZE9RD2)qH=Ek<_R><VJJ
zwVEqowf>Zo9kHlqI#A!R#0+B8iZ{6|76H5sK&SheA}0TJt?1KXb!moPp+a!gk-S8|
z_AFt1sdieNf2md)950u1(;nXKj}ng<_3>b07e6D@NR0FxvIlFRsXs4Z@Fy14t?5^o
z)>lTt<Tk=Ito^Quc6sdjbmx^c^6B3dJjYM(lwNk9YNJ(p_NPh4XMgp!MItFcfz9uY
z$GvdR{&v+RkB5RqU~V<*{Ut-{Fo!Uy)t-{3NwnR`^uhFqsf}g6*s&kL97nep4fK}6
zI?zXWMHE+Wm^Km&E|x7X#*f)LEUU(5sxbVu1?sw|#*;x781Yu4q80YHI?cuoFP82K
zs2JV3rE2Y})vDSjZrTY{g<aI!9GVHBRIFxR$oMgIibr+%d!xjR(iApR4vIvA#E53S
zqTEt`?a>nByYqsOvujE+H;fURJ?XE9L{88`H5WAxI=dOwb8y405mlb-$nT>*po~gA
zdDqf0N)v9C4`Ma0sGU{ur}#4oGcBHdX)T;T@NNG7UMAB9P%Tr~)CsO_IhS)rboW!Q
zI4fC~lHc&-(qW^05tr74b3Jdv4QAR~y<bO|AK}Ffp$f^(-i5;{n~QhN$1wi4-YEv?
z+~P$~x`fFy-wOIHi#K$^U=E!J|Eqo5dGNKv@5z4bwEOFWbf>92|1Am0qIU1s)o;bM
z9fl5ixjL?BO#nedd{=3!-gT%(4}<9oqe@iv_)gtI?zu508|&>>Yrsk;^xtl;)r8md
zm(;_^|JZfR>^#b7Lb?ckTjXO6_*g1K@!Pn$xtxeg9+UU;mLy5L(&qz~eZvv-8umH+
z=YAKU!W-TQQT63s5ys`9`d9h;iD)@`*?eghjMIn*E<CwINtP*2x%oRWqO(ao+{qDz
z9RqOmS-TcB+P}L^n_*(SVXqX4^DzC3WtARk_56$aH2*gCMFp!bVy35xqL<5Q-}zqO
z{5`4gEr*0L^X9}g49@A}JaBY{;P9FgW+hvyuUpEC*%UU#+e&3#xr48mLSCtrq6%j#
zb-f~>#e}%330`9V0N%f#9l|mR%{}h&4$Z#B;%{B!S_L-#Rz2d|=&oE)4eQDL`P^LP
zvU*>PTEp%(^(v11p&7UP+L?*nblCke&>Df+*xDYNtCLP>E}}f7Q<iDe#x4m)`AZQ=
z)6QQ!H%8Dxo0Sni#%#nR-U3-Wj5_akFak$xh<<UB3i!6n8~)^|uMq8y@J7;&y$y%z
z1<%26_Vv-eZ;xg4l~sFUTa`RR2J}>Vwk+c^ZAYpy*A~=gX_2ttxkVeo>J^0M0L_Lm
z|0&IZl*QN1h>^6WD1ydE-WKPnv_T52#9ublyY$Ow$^rE3i7>H<w;Vie`ODIVe){l?
zLE$1`6t`;8P;rg+bW9aaS+)Bl2MrcFWQNe(R2k(w4Q;A;mYjK8RAN{^{^{B>SVz}t
zPsqtS9^w5MUZMDis0*qLP{<mpDME!$IHI>O0>fI@6xzd2eposqlAAt7u`YTgHRn}x
z?~AneWC25>VdaJ0&?QFws^PsOyc)ym6;4oC2Em)LU=y8a9cVQtW*ZpQ(P70Z2^<*{
zTc|!*JZ!mp_j#gFWS~>XlS90{ROfdtYZ|&P#<bQtdFUs{BXfVK3WHpZ+<>_lVd1Q!
zd#wEKqTik@wVD%Ye$OcwS7cMjN{3l@Qb`@9gP=RI2ga=%_dwq&+2yR;MSi+Y{Fn|d
zP$aD86>Ece`8Vg)5=j1TVQmTuTXaFBfVtZQWio=kmOlvYC@eIq0DTG2u}SacCa4|P
z1<*rCUbN#!nO@%7adZ!LGdN9#nC_=5iA17)!XFwz@uLcHwNW)ZMm-t|g9&@Y0U-*H
zJ&{H#*xQ($B`D?;iOfzVVNzWwU1av})`E>o4$9r7p*y5g8C3kzNmTpWnSg#xxKy(q
zZrR07f%<(W;8F#8gcay7#C{AI!c199K_99>_&oVf{1|%J*y2U@{SQl{KF3Qsv$hX~
zkND`^nRb#Ej2uz}<#e^@c4%&w6L1xsHSD>3$@&I!(yJVk&C^p|@~7KFaemA|zf58O
zQ;>()K685QVn=k5(8LvKmgOo<z5U9hH-ZMt!!<bLrE>1gZa$Ta{Xq1X4x?NXUS&Wf
zwXkt7(k=5l4OEj}cJ4R-Az;<O%jVn-bC`G^hSiZW+q!u9R{_(n(>F0dwlbmjoSWuT
z&CH09)qvi+A=-m-heJYZob(0GJV>oHmQ;w;{W&H%)5f(PeBTi+v|o`TO!WxKPDfY5
zU!MKvJKu|H&&a4VNl5?+Gl!iLfhK-yT|>S<Eif<S<Zr7ePn)0Roo|=XnQ8!q@lQz<
z`=s{zRU6%}=5QOx3#I6Y3G>5~m1{LFtGvc<Oc<G?w<xUv-#&%U1V~1VPUfyFrR>Z}
zhgaTo{iQhFBW!rUb?62J7c0+n+5kD+a)xoOymqSiLnII)OK_1e;z}gsNmz27A}mY5
zft4A@>*mBbH2vYlq50V5rXIs$bA^OGug2%a*m{4ALtWg%W*^#chg1?Y#4I`X8;Tp)
zhdILA^@!c(xf1Vk_g?{yGh;|Ty+K2#-kLQmFNKoqtXt7Skead_UW|X5zwmZBjg%bK
zPJ_K0`vAN2_0;<CzC%r&)f?w`R~InA2+K~Vj2!GbUx>B!<7Tr{v9`k3s1tk=$Eeod
zM7MmTduwFV=RGUqX5Vx#QE@4_XFTU%3zyEHunitlsc-El_pqS|c}VT=%>ya7eDTk<
zq|TyV!&rnTOW@pKr1ZN?7)ouInEjZa7@tH}8~^6Uv4rjKZDQrULl3hG-R>TWyeP=S
zW`C-9mh&7W;Av+sNeSYw;2hybFrChjF0RGpAW78i-IW!rUPkcR>5wQPjux<}4@7pn
z!<+Iu9lwBO!3@8DY<rzTtg;b_F?X;u@_pGKzCJM|Uj`Yu%{h9Q@Lmc_xPJQR2@bYh
z%yePe71Fr2qsPL_1^p#k{D-&*qh|?##}y_Pi=t7)Ae%cEkk?VnJ!Tbt(!6`Qt5+%d
zm(Hx`dBzRyyZ-EFBur(O9CQ{#8-BfqJRnf)aaMIMl`|bnrSi9sc`kxA?)=Z4bOt1N
z!yXt&3ECio^)kleKtB6pmJ5EHR^ZuhjRdd$Y8aAt#6CvgP>vGNHIRf(u)1oy$DNq{
zxuq&SFv?Y;i_`HI@y%a2nnTH+ZA%-bkui<lHRDp&qNa<WJ-)-n$;El~)Od_jum5!b
z7;Ja0KoQt};%Y*$MlV&+#=A(?Hs`YzygR1;ka|&%W?M~N4>lB2LuPZPgOO|1Lj$)U
zHn-gYK{lIR<azsiFMv`k%jE%!DGeEd%<nF+vG;y<+!Rq-MFsg(*8S!GIANLQ_@=Cs
zuBcTxC}($d-8-fG7G&+VdRaq5LuK-Kegc{<p@c+!Bf(BQGR#tyf3W8QfU7w3VbF^u
zevWXno6FzRvF(BKldbdhf*v|?pi%|opp}x@s?%Q79)9+U{V-?~fOK!<$J|;DVY7Mc
zA9#27)Js;a*1fvH=?|q!hd1>2O`z9kZk2rx%o3EK`0lCPx^IA0J|Td=)KmFM|M`Bp
z1X*KprEr|B6CZMWn|!@AA;*8>*)eiYt+AVh23RnIOb<Mz8dRt-%CB|Mf%`L?L+E@A
z?k3lO_h{qhrYe2_Fws9Gm{Ehze7R%Oe1GR<Vu0JYSBBL+^Bwj9Ywr&Ij*z6cZ*$hT
zuA;<jm(mW8;9^SrZG5E|I`32%I`I<<Z_q!=k(r@~=-0ug!}m)oPTz-ZuxmMo3Pz>P
zLQRM9q=MpX_tf8eZYe<DlZzI3=eu4WKLz0Xd@2s?C(?#2#!Og+E#==6Da$(T213gM
z8kb4rUUpTkbGPRI=zoHou9V<fG51)X$;ct1Q1M>|wl(Zw%PMrn-e+Q6?A%Fr>_;+L
z8+k`IsyoyvUzGQ(02LvvUTjH{y{IXQDYCZ3(}1-ibez;UR87E|fHC-UiokbD?XbYP
z@7^BDPb3ZQ5=>9&10RM>xY>-l*bt##2aT>r_^z(dWUaeJOq0lA>j8OnSt_3Wme&+9
z8fH8Uha}ZX0gb(=By2Vzq$lGn-)(KDb{5E{NXs^8?`d!|w^UGuWZ5lhX6;)172}L+
z|6h#%`z>TU)c?kA1d01YTb6#u@aWBV3X}fp%B}sLlxmNU>aW`U;uJdDK6Agmw^8>j
zrf&6DR>f{xnEK$o)A>&#e<fUp5I!FC0@xvYhI8nQ0wiXu?tyRfSSRS5O_hIc=yk7(
z&VE-|SfoXbBD15jeY`pFjU*$Dz(n~F@B}{4O54U6`R!83X{6eKZUXcGNM6Bvg*Hg$
zO7(9&0M~g2^?|u9bH%;t=L0Pp&tSva?_)X*?jldFItsESv8V&aM?lShOoQlu`s8P8
zpkB;JpYI|?J&KzKyE@$4_NyE%b+E^!9bfHyc@K9Ih(;8!!oy546<7O@fkj2|#+wJz
z6w94Up`uGxF|&`STGy*OhBYlBI+6vuwHGvaKInJQjy*KY%J6eKjtdQ4aSbR}=^ix8
zf9Dbz1-HjZH9I%}4pd!x+G7Wz%Z`{Z@5fP}$r%DGD3t^ffb~`VjtsxLL9cd&pb0$s
z6zJz!{uPG;9d4qg^o+=>r?$4nZtB|V<{?B^0t`W)@47i26d8bQfhH6`6f&{W+1;h_
zpmrc<QhKb$NaIPMxuZN(nAbR!WJjEmA7{lk$bj;AM5r+9#K@_zi+}K6t!j5S4G6sQ
z*SV$%NO?E_+;;6~YHJ$}<w=?OIkyIey{2D{Ki`er;CUmHg+y)~Sb3Ipg2OL#sQ5Eu
z8ASo)77)a|S%uPK>!Oa1j+uavnS`ATu)A2*KNBpF`Qf=@$WYncfV+p-P1H{mazgW%
zYsChK!&zVdP&p4*;QH&b`Ls_tdZtQ!ZbbrB2|Fnt6BY<eC$QU63j<A#zc34Sz52Xr
zG=_&X;i9HF%&sPd_vlhKg_!bth%}XVXmPV?@r6g67U)Ic9zXs%JutSQbk-<|wo}Y$
zeO~Up_=X$zI!ns79dsj^)iWE9!O%U-n_1feSL{7(%LMy}$-Ob?pK`0fRwzO=Il>Zu
zGMVfa6#7x7S#7JOeBc2H)wvk3U^t(?Hrs(#zVhX1SAB}rMp@$F1V_~}=e&vel_;;v
z$0Hv4worFRn|kxQ%oLv}XhD~9MHDM`a^if&Nv>XKjk8mIX&hmCw45(^$eyjIze?XZ
z3NAxe`d{7XP6aOQ3P9Y}>yLV3WFB4Zdl71rn;L)Zcm#E7dP>=>4k408AroeAgXZDG
zt0b&hsdE%wGLw|4<hOq3z0_9OcJe3FF87-L&%X8jGvmG!A*rC5ZBrz6&urkA@wvf}
z@#aS#lpp$^?aqVSl+f{9mfm*sNx1*ixs~>(b!9L8gS#iWfufW;lzrqy`{brLKy-=e
z^lf34sCpkLV=AZIl_k@sOGYj5U`w>~Im)lssg0Aug+6BMu)F;)<NT^_S|umt+@MQY
z&bh&>Osj+o?e)`9Qt}=zbDx{+U_)js)|^oEMoMKDO1N3|3bVxwG0yx;N|r4i8AMXO
zx98Oq0c(m-LQ><W|IYD%b&q;Igcf;Kdt;&_i1?rCl~_ZVl1);U@s0J#yR%Vn3EQ0D
zpx~a0XLL$L*a~*k?o;RGV8$Ccrd$-qyJ;D84cRw-sx_Ae6MZU=aq~481!dAWXC|FD
zr~2XLqDuTG8)qHnyCpb6VLt6(pR_|a-{2@P+(hcX2H4XD$a?1&5dtxfFI&z@t+wt~
z?sxoj&j{^GirTs>lJ?sHGd%QYsq{27u`}(7NSasm`pj;TB_q7bO7UoxM1<+<df57P
zVQ5Z)=KDj9BK4+1?2;=8|EVcL6daP-Xe;E=hv0|YR#_?Yr${%>ITuIn8__-k_B;r3
z%HIEHv%?HzPUeL9v$Frkoo@vA0NWegnkXifBE|p}6eiWCCcKfG*sa;-US(fmZKP5G
z?x?ZgAlIX|jp}kGxr*iJQis8G`4Xnblx~B5#X%KEu2kzimvl)Vz{U_?vVx9B%+koc
zd>S#0+_OEfqQb)PlY!VAqA0I15;>P>$9v2tSvJf17hD~@!D|hGby?J#>`fmBcD|#M
z-HwIr8~7zodKKuoH`s&ow2u;Z1qbi2lJj2$BKHQx%+IahTThogIrnERq|0JO-Ger4
zL^0#$dvXGt{W)mR+Ds$}0OtX@<GjX1mjrTBBR6>@ffopJUFouDju0|+<YJzx7>Ma=
zISSY|3gCiVsmdi%;ER7VU3>YuTfld;;hbElT7L(}Y+QO7e+M&gP*<vny)HN3hv9^d
zVr}TTtBzbTlP<jpoHL@cJ(vkF9A{JQj8+n^*Xx7-6aXA-wdd*gUAN03v*ioH&Y<Vs
xv$nkq)u{tP1W{M>gN=lT$~TkVoEQJH%k#+YJn=*1<PZeBpr)2r$d?_%{~s;M;aUIy

diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
index cf1ce0a4397871e343259ef2c27d6d3b5ac21f0b..500d0b8f1c73c8212f68f3adafa1ac60fe9622ed 100644
GIT binary patch
delta 426
zcmV;b0agCB1H=Q6B!7!ZL_t(|obB0La>F1DKvB2Tov{BUv6p^i!Y~pDVFXDg_k1NT
z0xTYJ@pS<J00000000000Dvui)~m=l>x(I+#R`oY>K0Q<&GODlW}|MDwEZo{i%vv!
z%iwHcYaapy3_zimLUXE?ugx+#)|pCCUW`+(6{GXLsAkFAet!e&dJr8=PvWz<jdESr
z)1<TD*=?FlU!(1)jtXDmVJpCxaiWYT+)!3h&e^|N8?D=2t^XQ3_a9;gz|*rj#l5Y`
znbX-ZC{fOmy{H`n5V-}_eVw{nz5fKd_jB#PxJa&msX0|b#E0vd)0}ht+gN|q;n&Rb
zpTE3rT1Pee)_;uZ-G$R2y*ri|gl>|_{xOYIll{XOgI8h~dZj^<8H25KdIL^F4{JWj
z8IPE=XG*XPpTUQx9q%UoFm91ZlQ@cD7N1}rgxy#HEC0Lh_I4{^MQ@3ebCL618v2X@
zC}*Gbp}a1`1{KEGG-ls4OqDq=@|EOy^{m&gB*nW2)*}Z10000000000003X*AEt~(
U6uMo2KmY&$07*qoM6N<$f)e+~?f?J)

delta 411
zcmV;M0c8Hf1GNK?B!7HKL_t(|obB0Lj>8}fKv8DYov{BUv6uO%ijWP)Bu+{+_k6V}
z24WtGXi5M800000000000N@fo=c_2C=!-e$lNA~@v@PbGyXBpgtVSIuX?vZF7oCXe
zmciM?rF{q#FaVWa3f-w%zjn*$SZ69lc`;6-R*cS%qPisy`+p6r>rHete~8cGHtKa<
zPnXVuXSeA#oo3rn8x_99!&ZPX<3t%xxS_73Qi^}GHd?p4+Ws0l_upa$z|*rf#iOms
znbXxVs8P<6qo^weAaV<8`?_?udjAP@>~ZbCc#>QJOLMA*h!5$L(^5+NY;3>k@U-&&
z=P$3D)=}NQb$_Eqci}Wi?-ff7!Z68X|2Caell_}92H(Uk^i7i_GX|H^=?ypyy;=87
z&UnRKJyU{Z`VKxl?buEHVcba~P2wnqS$qfkAdD5TFJp;pyLz560QKy%J(SmF9+&-n
z84ufI|1@mt87p8!JS5s-GkyX900000000000095N9~1$%PRhz`Vut_#002ovPDHLk
FV1j&vzVrY9

diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png
index cf1ce0a4397871e343259ef2c27d6d3b5ac21f0b..500d0b8f1c73c8212f68f3adafa1ac60fe9622ed 100644
GIT binary patch
delta 426
zcmV;b0agCB1H=Q6B!7!ZL_t(|obB0La>F1DKvB2Tov{BUv6p^i!Y~pDVFXDg_k1NT
z0xTYJ@pS<J00000000000Dvui)~m=l>x(I+#R`oY>K0Q<&GODlW}|MDwEZo{i%vv!
z%iwHcYaapy3_zimLUXE?ugx+#)|pCCUW`+(6{GXLsAkFAet!e&dJr8=PvWz<jdESr
z)1<TD*=?FlU!(1)jtXDmVJpCxaiWYT+)!3h&e^|N8?D=2t^XQ3_a9;gz|*rj#l5Y`
znbX-ZC{fOmy{H`n5V-}_eVw{nz5fKd_jB#PxJa&msX0|b#E0vd)0}ht+gN|q;n&Rb
zpTE3rT1Pee)_;uZ-G$R2y*ri|gl>|_{xOYIll{XOgI8h~dZj^<8H25KdIL^F4{JWj
z8IPE=XG*XPpTUQx9q%UoFm91ZlQ@cD7N1}rgxy#HEC0Lh_I4{^MQ@3ebCL618v2X@
zC}*Gbp}a1`1{KEGG-ls4OqDq=@|EOy^{m&gB*nW2)*}Z10000000000003X*AEt~(
U6uMo2KmY&$07*qoM6N<$f)e+~?f?J)

delta 411
zcmV;M0c8Hf1GNK?B!7HKL_t(|obB0Lj>8}fKv8DYov{BUv6uO%ijWP)Bu+{+_k6V}
z24WtGXi5M800000000000N@fo=c_2C=!-e$lNA~@v@PbGyXBpgtVSIuX?vZF7oCXe
zmciM?rF{q#FaVWa3f-w%zjn*$SZ69lc`;6-R*cS%qPisy`+p6r>rHete~8cGHtKa<
zPnXVuXSeA#oo3rn8x_99!&ZPX<3t%xxS_73Qi^}GHd?p4+Ws0l_upa$z|*rf#iOms
znbXxVs8P<6qo^weAaV<8`?_?udjAP@>~ZbCc#>QJOLMA*h!5$L(^5+NY;3>k@U-&&
z=P$3D)=}NQb$_Eqci}Wi?-ff7!Z68X|2Caell_}92H(Uk^i7i_GX|H^=?ypyy;=87
z&UnRKJyU{Z`VKxl?buEHVcba~P2wnqS$qfkAdD5TFJp;pyLz560QKy%J(SmF9+&-n
z84ufI|1@mt87p8!JS5s-GkyX900000000000095N9~1$%PRhz`Vut_#002ovPDHLk
FV1j&vzVrY9


From bccf8d2af349e92271bb1b6135a377944883b809 Mon Sep 17 00:00:00 2001
From: emmanuelm41 <emmanuelm41@gmail.com>
Date: Thu, 21 Nov 2024 08:54:32 -0300
Subject: [PATCH 4/7] feat: update some snapshots

---
 tests_zemu/snapshots/s-mainmenu/00004.png | Bin 488 -> 488 bytes
 tests_zemu/snapshots/s-mainmenu/00010.png | Bin 488 -> 488 bytes
 2 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 99401b225434b060f2711907922d4d105168d096..a78e6827221d778de03512e89e1ec8c4ac1e2397 100644
GIT binary patch
delta 453
zcmV;$0XqKZ1Ly;gEq_6>!ypJiP3PzS2hJj0_=h2Y1i{)m;Y}A!qN1RHT1t{6N%B;-
z8A8rOlDtP7R9e6iw_Pr8Y^1kVCx4?F(!kvvJpcith>!Nc%oGCvd?|=i6&}ShyslA|
zq&%@xON!W4@ukb6FGrmyWX#+C|0Dm&fZ;uFM}+Ik;%!9H<$ul{wQ3odxB`?JN6J{L
zE5J%R4^w#%+LEq!)ung9W`JH9eAt#2u!>u*$*9v_8$c}wu~;(K1>wGS^_%;j7LNJo
z3)h2U_!Ji;uGXs4^SH!D{K%^po3b2%k@rL|V60`4Y$~NB^22ldhv8ZQ+>^ut(UXy4
zKx%U=s#9eKsDEjLZiDLhM1P%dh(520+0_8>?bZe*x&e6>?X(yffPB+!pzo&=PSqz%
zPh45h?ZofRf|OmZlH`TYVSa(YMhwnvf`d06KZs{L>$|~;8!>(ccgwQ#+Ky`l;QYsu
z3*kx1jS;+=nQ+1INdhitS{kaTczqZ2jr#xquZhx7;y$vPH8RTp;w2P`;n**Uc~|S}
v%GiSNw>&Ia9O8vkW!V^zBuSDaN%BnIZjtaJMqoD400000NkvXXu0mjf4|(5%

delta 453
zcmV;$0XqKZ1Ly;gEq}q1!ypKT&CcfiA2^5fkR65q;xDGQ+3-ydO`@V8h+0aLBuVmA
zmKj3!&62#1Ht4j#B`&L79&DtyRwut#HRQp&d-VVeKoM{41I!cy5ZV>YsY;J#8C@4t
zr6@1#RFh(M)qEMU=ue=|C}PaZ`u7w6#enI(ZpTFH3yC(S=zr1*N3~i26FtD0aiR=T
z-GMx5-=Oj&v?kr}YDn({W`JH9de}${T*bA}1nRWc22?A+*jh3-1o6Ih^;^fE8iDy3
zTdpr!!>5EG(_0Un?%Qc?<d3>~!ITwP7<Etl0$?pfGE~Y*<S)<hA4bRnbR-#Dh@OnK
z2BbEx#SN;;0Dni?;M?E`d}h2(G(w-}#O!PU`qs2T8Qp+9i+Wnj3?RPwHt_dTiRRF!
zN>4&rP;=t<W<ky_*H7}sQowIuU?WE7HiLr)k01Q=ncF(z#EqCfgKOfKx$Ugyggk)f
zKS(abC#g2ZztCft0S}nw^}feUxZ!yxpSTYoxKEUdMLwH5lAANj0Olo>Si^Z-GV?Cv
v>)pUY(5FTyoWs13s(nq8BuSDaNxqmDy*}_5;DC!`00000NkvXXu0mjfjW^%u

diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
index 99401b225434b060f2711907922d4d105168d096..a78e6827221d778de03512e89e1ec8c4ac1e2397 100644
GIT binary patch
delta 453
zcmV;$0XqKZ1Ly;gEq_6>!ypJiP3PzS2hJj0_=h2Y1i{)m;Y}A!qN1RHT1t{6N%B;-
z8A8rOlDtP7R9e6iw_Pr8Y^1kVCx4?F(!kvvJpcith>!Nc%oGCvd?|=i6&}ShyslA|
zq&%@xON!W4@ukb6FGrmyWX#+C|0Dm&fZ;uFM}+Ik;%!9H<$ul{wQ3odxB`?JN6J{L
zE5J%R4^w#%+LEq!)ung9W`JH9eAt#2u!>u*$*9v_8$c}wu~;(K1>wGS^_%;j7LNJo
z3)h2U_!Ji;uGXs4^SH!D{K%^po3b2%k@rL|V60`4Y$~NB^22ldhv8ZQ+>^ut(UXy4
zKx%U=s#9eKsDEjLZiDLhM1P%dh(520+0_8>?bZe*x&e6>?X(yffPB+!pzo&=PSqz%
zPh45h?ZofRf|OmZlH`TYVSa(YMhwnvf`d06KZs{L>$|~;8!>(ccgwQ#+Ky`l;QYsu
z3*kx1jS;+=nQ+1INdhitS{kaTczqZ2jr#xquZhx7;y$vPH8RTp;w2P`;n**Uc~|S}
v%GiSNw>&Ia9O8vkW!V^zBuSDaN%BnIZjtaJMqoD400000NkvXXu0mjf4|(5%

delta 453
zcmV;$0XqKZ1Ly;gEq}q1!ypKT&CcfiA2^5fkR65q;xDGQ+3-ydO`@V8h+0aLBuVmA
zmKj3!&62#1Ht4j#B`&L79&DtyRwut#HRQp&d-VVeKoM{41I!cy5ZV>YsY;J#8C@4t
zr6@1#RFh(M)qEMU=ue=|C}PaZ`u7w6#enI(ZpTFH3yC(S=zr1*N3~i26FtD0aiR=T
z-GMx5-=Oj&v?kr}YDn({W`JH9de}${T*bA}1nRWc22?A+*jh3-1o6Ih^;^fE8iDy3
zTdpr!!>5EG(_0Un?%Qc?<d3>~!ITwP7<Etl0$?pfGE~Y*<S)<hA4bRnbR-#Dh@OnK
z2BbEx#SN;;0Dni?;M?E`d}h2(G(w-}#O!PU`qs2T8Qp+9i+Wnj3?RPwHt_dTiRRF!
zN>4&rP;=t<W<ky_*H7}sQowIuU?WE7HiLr)k01Q=ncF(z#EqCfgKOfKx$Ugyggk)f
zKS(abC#g2ZztCft0S}nw^}feUxZ!yxpSTYoxKEUdMLwH5lAANj0Olo>Si^Z-GV?Cv
v>)pUY(5FTyoWs13s(nq8BuSDaNxqmDy*}_5;DC!`00000NkvXXu0mjfjW^%u


From e211829ed7de03e4cf07adabc2200771c176b92c Mon Sep 17 00:00:00 2001
From: emmanuelm41 <emmanuelm41@gmail.com>
Date: Thu, 21 Nov 2024 10:50:40 -0300
Subject: [PATCH 5/7] chore: update zcash rs dependency

---
 zcashtools/Cargo.lock | 177 +++++++++++++++++++++++++++++++++---------
 zcashtools/Cargo.toml |   4 +-
 2 files changed, 143 insertions(+), 38 deletions(-)

diff --git a/zcashtools/Cargo.lock b/zcashtools/Cargo.lock
index 09389f58..ee21a54a 100644
--- a/zcashtools/Cargo.lock
+++ b/zcashtools/Cargo.lock
@@ -448,6 +448,15 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "equihash"
+version = "0.1.0"
+source = "git+https://github.com/Zondax/librustzcash?rev=112eedd27b2e51b9e1b77603a776cd78e738c3ae#112eedd27b2e51b9e1b77603a776cd78e738c3ae"
+dependencies = [
+ "blake2b_simd",
+ "byteorder",
+]
+
 [[package]]
 name = "equihash"
 version = "0.2.0"
@@ -527,6 +536,24 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "halo2_gadgets"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13f3914f58cc4af5e4fe83d48b02d582be18976bc7e96c3151aa2bf1c98e9f60"
+dependencies = [
+ "arrayvec",
+ "bitvec",
+ "ff",
+ "group",
+ "halo2_proofs 0.1.0",
+ "lazy_static",
+ "pasta_curves",
+ "rand",
+ "subtle",
+ "uint",
+]
+
 [[package]]
 name = "halo2_gadgets"
 version = "0.2.0"
@@ -537,7 +564,7 @@ dependencies = [
  "bitvec",
  "ff",
  "group",
- "halo2_proofs",
+ "halo2_proofs 0.2.0",
  "lazy_static",
  "pasta_curves",
  "rand",
@@ -545,6 +572,20 @@ dependencies = [
  "uint",
 ]
 
+[[package]]
+name = "halo2_proofs"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e925780549adee8364c7f2b685c753f6f3df23bde520c67416e93bf615933760"
+dependencies = [
+ "blake2b_simd",
+ "ff",
+ "group",
+ "pasta_curves",
+ "rand_core",
+ "rayon",
+]
+
 [[package]]
 name = "halo2_proofs"
 version = "0.2.0"
@@ -668,7 +709,7 @@ dependencies = [
 [[package]]
 name = "ledger-zcash"
 version = "0.11.2"
-source = "git+https://github.com/Zondax/ledger-zcash-rs?rev=0dd05cee4427f2c7ff1bfc9fb11f62f878c0cfa8#0dd05cee4427f2c7ff1bfc9fb11f62f878c0cfa8"
+source = "git+https://github.com/Zondax/ledger-zcash-rs?rev=3bad2fa4a7870270627edc25ebdb5b4818fd1855#3bad2fa4a7870270627edc25ebdb5b4818fd1855"
 dependencies = [
  "arrayvec",
  "byteorder",
@@ -690,14 +731,14 @@ dependencies = [
  "sha2 0.10.8",
  "thiserror",
  "tokio",
- "zcash_primitives",
+ "zcash_primitives 0.6.0",
  "zx-bip44",
 ]
 
 [[package]]
 name = "ledger-zcash-builder"
 version = "0.11.2"
-source = "git+https://github.com/Zondax/ledger-zcash-rs?rev=0dd05cee4427f2c7ff1bfc9fb11f62f878c0cfa8#0dd05cee4427f2c7ff1bfc9fb11f62f878c0cfa8"
+source = "git+https://github.com/Zondax/ledger-zcash-rs?rev=3bad2fa4a7870270627edc25ebdb5b4818fd1855#3bad2fa4a7870270627edc25ebdb5b4818fd1855"
 dependencies = [
  "bellman",
  "blake2b_simd",
@@ -722,8 +763,8 @@ dependencies = [
  "sha2 0.10.8",
  "thiserror",
  "tokio",
- "zcash_note_encryption",
- "zcash_primitives",
+ "zcash_note_encryption 0.1.0 (git+https://github.com/Zondax/librustzcash?rev=112eedd27b2e51b9e1b77603a776cd78e738c3ae)",
+ "zcash_primitives 0.6.0",
  "zcash_proofs",
 ]
 
@@ -967,6 +1008,33 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
+[[package]]
+name = "orchard"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f918076e191a68d55c5517a16e075ecfe58fc63ed112408263f3d6194597bfcf"
+dependencies = [
+ "aes",
+ "bitvec",
+ "blake2b_simd",
+ "ff",
+ "fpe",
+ "group",
+ "halo2_gadgets 0.1.0",
+ "halo2_proofs 0.1.0",
+ "hex",
+ "incrementalmerkletree",
+ "lazy_static",
+ "memuse",
+ "nonempty",
+ "pasta_curves",
+ "rand",
+ "reddsa",
+ "serde",
+ "subtle",
+ "zcash_note_encryption 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "orchard"
 version = "0.2.0"
@@ -979,8 +1047,8 @@ dependencies = [
  "ff",
  "fpe",
  "group",
- "halo2_gadgets",
- "halo2_proofs",
+ "halo2_gadgets 0.2.0",
+ "halo2_proofs 0.2.0",
  "hex",
  "incrementalmerkletree",
  "lazy_static",
@@ -992,7 +1060,7 @@ dependencies = [
  "serde",
  "subtle",
  "tracing",
- "zcash_note_encryption",
+ "zcash_note_encryption 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1154,22 +1222,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "redjubjub"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6039ff156887caf92df308cbaccdc058c9d3155a913da046add6e48c4cdbd91d"
-dependencies = [
- "blake2b_simd",
- "byteorder",
- "digest 0.9.0",
- "jubjub",
- "rand_core",
- "serde",
- "thiserror",
- "zeroize",
-]
-
 [[package]]
 name = "redox_users"
 version = "0.4.5"
@@ -1649,6 +1701,15 @@ dependencies = [
  "nonempty",
 ]
 
+[[package]]
+name = "zcash_encoding"
+version = "0.1.0"
+source = "git+https://github.com/Zondax/librustzcash?rev=112eedd27b2e51b9e1b77603a776cd78e738c3ae#112eedd27b2e51b9e1b77603a776cd78e738c3ae"
+dependencies = [
+ "byteorder",
+ "nonempty",
+]
+
 [[package]]
 name = "zcash_note_encryption"
 version = "0.1.0"
@@ -1661,6 +1722,53 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "zcash_note_encryption"
+version = "0.1.0"
+source = "git+https://github.com/Zondax/librustzcash?rev=112eedd27b2e51b9e1b77603a776cd78e738c3ae#112eedd27b2e51b9e1b77603a776cd78e738c3ae"
+dependencies = [
+ "chacha20",
+ "chacha20poly1305",
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "zcash_primitives"
+version = "0.6.0"
+source = "git+https://github.com/Zondax/librustzcash?rev=112eedd27b2e51b9e1b77603a776cd78e738c3ae#112eedd27b2e51b9e1b77603a776cd78e738c3ae"
+dependencies = [
+ "aes",
+ "bip0039",
+ "bitvec",
+ "blake2b_simd",
+ "blake2s_simd",
+ "bls12_381",
+ "bs58",
+ "byteorder",
+ "chacha20poly1305",
+ "equihash 0.1.0",
+ "ff",
+ "fpe",
+ "group",
+ "hdwallet",
+ "hex",
+ "incrementalmerkletree",
+ "jubjub",
+ "lazy_static",
+ "memuse",
+ "nonempty",
+ "orchard 0.1.0",
+ "rand",
+ "rand_core",
+ "ripemd",
+ "secp256k1 0.21.3",
+ "sha2 0.9.9",
+ "subtle",
+ "zcash_encoding 0.1.0 (git+https://github.com/Zondax/librustzcash?rev=112eedd27b2e51b9e1b77603a776cd78e738c3ae)",
+ "zcash_note_encryption 0.1.0 (git+https://github.com/Zondax/librustzcash?rev=112eedd27b2e51b9e1b77603a776cd78e738c3ae)",
+]
+
 [[package]]
 name = "zcash_primitives"
 version = "0.7.0"
@@ -1676,7 +1784,7 @@ dependencies = [
  "bs58",
  "byteorder",
  "chacha20poly1305",
- "equihash",
+ "equihash 0.2.0",
  "ff",
  "fpe",
  "group",
@@ -1687,22 +1795,21 @@ dependencies = [
  "lazy_static",
  "memuse",
  "nonempty",
- "orchard",
+ "orchard 0.2.0",
  "rand",
  "rand_core",
  "ripemd",
  "secp256k1 0.21.3",
  "sha2 0.9.9",
  "subtle",
- "zcash_encoding",
- "zcash_note_encryption",
+ "zcash_encoding 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "zcash_note_encryption 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "zcash_proofs"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98bf5f6af051dd929263f279b21b9c04c1f30116c70f3c190de2566677f245ef"
+version = "0.6.0"
+source = "git+https://github.com/Zondax/librustzcash?rev=112eedd27b2e51b9e1b77603a776cd78e738c3ae#112eedd27b2e51b9e1b77603a776cd78e738c3ae"
 dependencies = [
  "bellman",
  "blake2b_simd",
@@ -1714,9 +1821,7 @@ dependencies = [
  "jubjub",
  "lazy_static",
  "rand_core",
- "redjubjub",
- "tracing",
- "zcash_primitives",
+ "zcash_primitives 0.6.0",
 ]
 
 [[package]]
@@ -1734,7 +1839,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "snafu",
- "zcash_primitives",
+ "zcash_primitives 0.7.0",
  "zcashtool",
 ]
 
diff --git a/zcashtools/Cargo.toml b/zcashtools/Cargo.toml
index 70f40548..28f590b4 100644
--- a/zcashtools/Cargo.toml
+++ b/zcashtools/Cargo.toml
@@ -8,8 +8,8 @@ opt-level = "s"
 overflow-checks = true
 
 [patch.crates-io]
-ledger-zcash-builder = { git = "https://github.com/Zondax/ledger-zcash-rs", rev = "0dd05cee4427f2c7ff1bfc9fb11f62f878c0cfa8" }
-ledger-zcash = { git = "https://github.com/Zondax/ledger-zcash-rs", rev = "0dd05cee4427f2c7ff1bfc9fb11f62f878c0cfa8" }
+ledger-zcash-builder = { git = "https://github.com/Zondax/ledger-zcash-rs", rev = "3bad2fa4a7870270627edc25ebdb5b4818fd1855" }
+ledger-zcash = { git = "https://github.com/Zondax/ledger-zcash-rs", rev = "3bad2fa4a7870270627edc25ebdb5b4818fd1855" }
 
 # ledger-zcash-builder = { path = "../../ledger-zcash-rs/ledger-zcash-builder" }
 # ledger-zcash = { path = "../../ledger-zcash-rs/ledger-zcash" }

From 0632dd3b4c549e192889f2c26de0e2973098bf79 Mon Sep 17 00:00:00 2001
From: emmanuelm41 <emmanuelm41@gmail.com>
Date: Thu, 21 Nov 2024 11:16:14 -0300
Subject: [PATCH 6/7] feat: update rdeps eferences

---
 zcashtools/Cargo.lock             | 173 +++---------------------------
 zcashtools/neon/native/Cargo.toml |   6 +-
 2 files changed, 15 insertions(+), 164 deletions(-)

diff --git a/zcashtools/Cargo.lock b/zcashtools/Cargo.lock
index ee21a54a..553a48a6 100644
--- a/zcashtools/Cargo.lock
+++ b/zcashtools/Cargo.lock
@@ -52,9 +52,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "async-trait"
-version = "0.1.80"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -457,16 +457,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "equihash"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab579d7cf78477773b03e80bc2f89702ef02d7112c711d54ca93dcdce68533d5"
-dependencies = [
- "blake2b_simd",
- "byteorder",
-]
-
 [[package]]
 name = "ff"
 version = "0.12.1"
@@ -546,25 +536,7 @@ dependencies = [
  "bitvec",
  "ff",
  "group",
- "halo2_proofs 0.1.0",
- "lazy_static",
- "pasta_curves",
- "rand",
- "subtle",
- "uint",
-]
-
-[[package]]
-name = "halo2_gadgets"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85e10bf9924da1754e443641c9e7f9f00483749f8fb837fde696ef6ed6e2f079"
-dependencies = [
- "arrayvec",
- "bitvec",
- "ff",
- "group",
- "halo2_proofs 0.2.0",
+ "halo2_proofs",
  "lazy_static",
  "pasta_curves",
  "rand",
@@ -586,21 +558,6 @@ dependencies = [
  "rayon",
 ]
 
-[[package]]
-name = "halo2_proofs"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff771b9a2445cd2545c9ef26d863c290fbb44ae440c825a20eb7156f67a949a"
-dependencies = [
- "blake2b_simd",
- "ff",
- "group",
- "pasta_curves",
- "rand_core",
- "rayon",
- "tracing",
-]
-
 [[package]]
 name = "hdwallet"
 version = "0.3.1"
@@ -731,7 +688,7 @@ dependencies = [
  "sha2 0.10.8",
  "thiserror",
  "tokio",
- "zcash_primitives 0.6.0",
+ "zcash_primitives",
  "zx-bip44",
 ]
 
@@ -764,7 +721,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "zcash_note_encryption 0.1.0 (git+https://github.com/Zondax/librustzcash?rev=112eedd27b2e51b9e1b77603a776cd78e738c3ae)",
- "zcash_primitives 0.6.0",
+ "zcash_primitives",
  "zcash_proofs",
 ]
 
@@ -1020,35 +977,8 @@ dependencies = [
  "ff",
  "fpe",
  "group",
- "halo2_gadgets 0.1.0",
- "halo2_proofs 0.1.0",
- "hex",
- "incrementalmerkletree",
- "lazy_static",
- "memuse",
- "nonempty",
- "pasta_curves",
- "rand",
- "reddsa",
- "serde",
- "subtle",
- "zcash_note_encryption 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "orchard"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7619db7f917afd9b1139044c595fab1b6166de2db62317794b5f5e34a2104ae1"
-dependencies = [
- "aes",
- "bitvec",
- "blake2b_simd",
- "ff",
- "fpe",
- "group",
- "halo2_gadgets 0.2.0",
- "halo2_proofs 0.2.0",
+ "halo2_gadgets",
+ "halo2_proofs",
  "hex",
  "incrementalmerkletree",
  "lazy_static",
@@ -1059,7 +989,6 @@ dependencies = [
  "reddsa",
  "serde",
  "subtle",
- "tracing",
  "zcash_note_encryption 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1504,37 +1433,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.61",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
-]
-
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -1691,16 +1589,6 @@ dependencies = [
  "tap",
 ]
 
-[[package]]
-name = "zcash_encoding"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb61ea88eb539bc0ac2068e5da99411dd4978595b3d7ff6a4b1562ddc8e8710"
-dependencies = [
- "byteorder",
- "nonempty",
-]
-
 [[package]]
 name = "zcash_encoding"
 version = "0.1.0"
@@ -1747,7 +1635,7 @@ dependencies = [
  "bs58",
  "byteorder",
  "chacha20poly1305",
- "equihash 0.1.0",
+ "equihash",
  "ff",
  "fpe",
  "group",
@@ -1758,54 +1646,17 @@ dependencies = [
  "lazy_static",
  "memuse",
  "nonempty",
- "orchard 0.1.0",
+ "orchard",
  "rand",
  "rand_core",
  "ripemd",
  "secp256k1 0.21.3",
  "sha2 0.9.9",
  "subtle",
- "zcash_encoding 0.1.0 (git+https://github.com/Zondax/librustzcash?rev=112eedd27b2e51b9e1b77603a776cd78e738c3ae)",
+ "zcash_encoding",
  "zcash_note_encryption 0.1.0 (git+https://github.com/Zondax/librustzcash?rev=112eedd27b2e51b9e1b77603a776cd78e738c3ae)",
 ]
 
-[[package]]
-name = "zcash_primitives"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fbb401f5dbc482b831954aaa7cba0a8fe148241db6d19fe7cebda78252ca680"
-dependencies = [
- "aes",
- "bip0039",
- "bitvec",
- "blake2b_simd",
- "blake2s_simd",
- "bls12_381",
- "bs58",
- "byteorder",
- "chacha20poly1305",
- "equihash 0.2.0",
- "ff",
- "fpe",
- "group",
- "hdwallet",
- "hex",
- "incrementalmerkletree",
- "jubjub",
- "lazy_static",
- "memuse",
- "nonempty",
- "orchard 0.2.0",
- "rand",
- "rand_core",
- "ripemd",
- "secp256k1 0.21.3",
- "sha2 0.9.9",
- "subtle",
- "zcash_encoding 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "zcash_note_encryption 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "zcash_proofs"
 version = "0.6.0"
@@ -1821,7 +1672,7 @@ dependencies = [
  "jubjub",
  "lazy_static",
  "rand_core",
- "zcash_primitives 0.6.0",
+ "zcash_primitives",
 ]
 
 [[package]]
@@ -1839,7 +1690,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "snafu",
- "zcash_primitives 0.7.0",
+ "zcash_primitives",
  "zcashtool",
 ]
 
diff --git a/zcashtools/neon/native/Cargo.toml b/zcashtools/neon/native/Cargo.toml
index 5986da2a..b3a526fc 100644
--- a/zcashtools/neon/native/Cargo.toml
+++ b/zcashtools/neon/native/Cargo.toml
@@ -19,14 +19,14 @@ serde_derive = "1"
 serde = "1"
 log = "0.4"
 snafu = { version = "0.8.2" }
-zcash_primitives = { version = "0.7", features = ["transparent-inputs"] }
+zcash_primitives = { git = "https://github.com/Zondax/librustzcash", rev = "112eedd27b2e51b9e1b77603a776cd78e738c3ae", features = ["transparent-inputs"], package = "zcash_primitives" }
 
 neon-serde = { git = "https://github.com/Zondax/neon-serde", branch = "master", default-features = false, features = [
     "napi-6",
 ] }
 
-ledger-zcash-builder = "=0.11.2"
-ledger-zcash = "0.11.2"
+ledger-zcash-builder = { git = "https://github.com/Zondax/ledger-zcash-rs", rev = "3bad2fa4a7870270627edc25ebdb5b4818fd1855", package = "ledger-zcash-builder"  }
+ledger-zcash =  { git = "https://github.com/Zondax/ledger-zcash-rs", rev = "3bad2fa4a7870270627edc25ebdb5b4818fd1855", package = "ledger-zcash"  }
 
 [dev-dependencies]
 serde = { version = "1", features = ["derive"] }

From 10122a542b7b9bf4a0a3a62605c81f3b47a7344a Mon Sep 17 00:00:00 2001
From: emmanuelm41 <emmanuelm41@gmail.com>
Date: Thu, 21 Nov 2024 15:26:25 -0300
Subject: [PATCH 7/7] fix: tests

---
 zcashtools/neon/native/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zcashtools/neon/native/src/lib.rs b/zcashtools/neon/native/src/lib.rs
index 52df2e2e..83ceaab8 100644
--- a/zcashtools/neon/native/src/lib.rs
+++ b/zcashtools/neon/native/src/lib.rs
@@ -218,7 +218,7 @@ impl ZcashBuilderBridge {
             AuthorisationStatus::Unauthorized(mut builder) => {
                 let mut prover =
                     txprover::LocalTxProver::new(Path::new(spendpath), Path::new(outputpath));
-                let res = builder.build(consensus::BranchId::Nu5, tx_ver, &mut prover);
+                let res = builder.build(consensus::BranchId::Nu6, tx_ver, &mut prover);
                 match res {
                     Ok(_) => self.zcashbuilder = AuthorisationStatus::Unauthorized(builder),
                     Err(ref e) => {