From 0d61ac4f0fe15bddd3e54dbfad25c9074bb702e0 Mon Sep 17 00:00:00 2001 From: tdejoigny-ledger Date: Wed, 23 Oct 2024 23:14:56 +0200 Subject: [PATCH] allow "transfer_keep_alive" method for swap --- app/Makefile.version | 2 +- app/src/swap/handle_sign_transaction.c | 6 ++++-- tests_zemu/snapshots/fl-mainmenu/00004.png | Bin 9276 -> 9049 bytes tests_zemu/snapshots/s-mainmenu/00004.png | Bin 423 -> 421 bytes tests_zemu/snapshots/s-mainmenu/00010.png | Bin 423 -> 421 bytes tests_zemu/snapshots/sp-mainmenu/00004.png | Bin 368 -> 364 bytes tests_zemu/snapshots/sp-mainmenu/00010.png | Bin 368 -> 364 bytes tests_zemu/snapshots/st-mainmenu/00004.png | Bin 11102 -> 10940 bytes tests_zemu/snapshots/x-mainmenu/00004.png | Bin 368 -> 364 bytes tests_zemu/snapshots/x-mainmenu/00010.png | Bin 368 -> 364 bytes 10 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Makefile.version b/app/Makefile.version index 54f75c25..a8386bce 100644 --- a/app/Makefile.version +++ b/app/Makefile.version @@ -3,4 +3,4 @@ APPVERSION_M=100 # This is the `spec_version` field of `Runtime` APPVERSION_N=0 # This is the patch version of this release -APPVERSION_P=9 +APPVERSION_P=10 diff --git a/app/src/swap/handle_sign_transaction.c b/app/src/swap/handle_sign_transaction.c index 9f373a65..6093da61 100644 --- a/app/src/swap/handle_sign_transaction.c +++ b/app/src/swap/handle_sign_transaction.c @@ -121,11 +121,13 @@ parser_error_t check_swap_conditions(parser_tx_t *txObj) { MEMZERO(tmpKey, sizeof(tmpKey)); MEMZERO(tmpValue, sizeof(tmpValue)); const char *valid_tx_pallet = "Balances"; - const char *valid_tx_call = "transfer_allow_death"; + const char *valid_tx_call_1 = "transfer_allow_death"; + const char *valid_tx_call_2 = "transfer_keep_alive"; CHECK_ERROR(parser_getItem(txObj, &uiFields)); if (strncmp(valid_tx_pallet, tmpKey, strlen(valid_tx_pallet) + 1) != 0 || - strncmp(valid_tx_call, tmpValue, strlen(valid_tx_call) + 1) != 0) { + (strncmp(valid_tx_call_1, tmpValue, strlen(valid_tx_call_1) + 1) != 0 && + strncmp(valid_tx_call_2, tmpValue, strlen(valid_tx_call_2) + 1) != 0)) { ZEMU_LOGF(200, "Wrong swap tx method (%s %s, should be : %s %s).\n", tmpKey, tmpValue, valid_tx_pallet, valid_tx_call); return parser_swap_tx_wrong_method; diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png index e6e91b8aeaa61a1d685edf176953781ad8537138..73305f73e5b503cc900f0ea0de9c4f3f2edbaa0f 100644 GIT binary patch literal 9049 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 X!>czX_4L4NEr5lY)$cXuZ{Pb5w31UI literal 9276 zcmeHtYdn-|+xKM?D!Wi*zgh~JNQCUIqD2i!l0C`Z*p(R!CWKg_r6eYsSW#058JjVN zlvyBy}$eUJ-_$Ez3wmXe4Fz;&g(ii*LnPp|Nl5LFWH|L z+b6#d001%D-_KnJ0KO>z;J+rq54M~pmY)XzH38dmR##%5EYX%?FdrvxPk(5D3p|lJ zcGPF@HGWOL3msCg1tENPx266P)U>i&**v*x7Rp{ZA}?SulbC3vb^d@&!_5mesw&ow z@1kA-z}xM~F#!M&{k0!Zl}Q!?o{H!LBGzSmmKywGz;6eF0Ld&%f!mh^<$*g#{>>(K zSIg+FUPuu@HLc8Y8ID_mBaIY?l|_KNsz>{AG-j;n@n>vq;-G%0gfK9yexx7UXZHd^ zdVA6XVG5{rmNp7cQO-aIV~7GSu8&fiLaQ5xtt3rD&$1^iWvt!k=q8G}vq>pNFfL$3_pxFs7~bC4fejLI;|$-nIF?LCLeCHj@j@4O$w zHWH!coC*U@WKSn2y|splb+!wx?mGE|_j?1qwK8}NE0&^~RlZq@nn+0Tq%^`pZLSL+ zvi|e%h_pq}d!08c8FvznZ@4iGwX({QvKm?Clf5TJxw~JLH}3Z*>aCb};ykqHdb^~p z2R0Lw6Ata*1shuGpyTU;4poCA4k{M>kFh~N<{W3#KS+>!7W_>+A)<_CjHH^ClBKzS zSxK%bm|>l~Wzu$9RTefK?px0IlJ*oC6UytvfhEPT%XLT>v4Cqju-ctCH#m7uWtq z?1}JuYUwmDds=A$LJ}fWW1XxdJ+x(!+}Y@;<@zSF#2c4D#B4wu&V&KYZ0>C|8DJ{h zL*kkilggG8Qzoz*2RbfZNcepr>3C35Qqq>uCG*(rU{8utE^#L*BBE}&)8BP$=EHYW z1mbwA>ffyKgqo2UPw>-u@ZJwRgHqd&>X(@B0eWwSkG=Aw#37E_UMFXTQHQrpZq=4N zo^LUsJZnpF}hk+ zMS3vfzmmi233px)GJ2spVdA~a*6=TDk_cdDASZh_qeQj8>0DU@q=B$Mv>NYlVWm7p z_3n(3tyFD3*3R$z`Jn3Fv~Qf>yt;bpl=C9m4(d#fA>C(@7j2( zE)sjF=u4ymjCY~Jo7Ahf3UNQGho3V0SbVd&$$Or)8EaZ3h?Wq=H;|X~f0q=j8eE*) zqU~X*XE09;=EiSH3!0KVd$plX$ScE1g!vRNLOyc*w_O}#BARkQeD3Q*HCqNTF~$=o zJ^1m=CJwc_&}lI^lN7yB9kTL>_qudLFqvBeqL2MjSAh?Aq2Jj#-_w29O_5{X*_pADt1@_%`@lti>*&bxfB+%Clsw=0hucMu z%Y7ye@mmgFEhpgWmTlQZH^pg(g>?EU^hT8YQ`dkaKPRy6CX55sw^5A7X- z{gFgTiCrY%AqI=0Ubmc;r|r8{fp_Y zL1H|cU^uo0&{kk!flscX7gg5nDp(J^dkdqEiHCp)W?|BN7({?DgMcf}&d^*Hpk#q4 zpd{D{$2IOE@m}hOCYInap6J?_m^{ga%3ubvdo@d=OI2iR|Kt1-|6@WC1$9l26}nEoG34*qm9dW6i39OAT-P>_ z$8YU8vZo%R;89lk`lKibMejfm#b7@2B8n>Ebr_5gdO>@p`UII(Sn-X3VaD564Q?i| zm5nw$fVPG-{zSYNZRaBo&#a+?%}nUvt&JsX%^_s&YM!y2H)p3zN3^T1u~%j2)&fy^ z2*m^@hNF}F>U#p7V~(Q~QPz%MX|vr|LW})f9c5e}wY*2*<|_L=VKUa(*YL_CA}J7( zeU+25Gt;Au_J_*;HzpWWkx%+3vW`HV5aRC=Vcd#+T_?d+B&|t%-vo4EEtU>F(HF@P zBa)mM|K+Ti*vPY(CUx+{Xtol|)o=BUMfh=V>nw4Z1P^UCn>71n;WKp@{J%ICm#$rA~T$mMg5;+9X=jvMY)B z-IGE)Ee8;WLXxq8ubQiB*2sc&=N+10+yU0+=BW3l)3NW+!(+$l>8)MUuSdho&CLza zy*<~cFfrwr`3Z9)46mYlSYWF7gnSUk(hqs<&CYLPOKyFH^l?vDOy zBTer*Fcp5G7ux?!W z78MJI>kJbI?)EmL)n4sT1f*nY(JM_BU*G0t6+E~x|92k|YkZ7b>V&cF*Rq&_W!lat56l?Ev5@C0H z+f+F>##1GiNG6kal4={3x!aO}no#`pc*^+cW(n>{MTtqem9^vJedwE-P1L3ECOwz0 zuZbQGJSt$cDOV|}EAI%=EV z4l%k%em@P>gG;7;C`2y%{aDuA-SVK7-y9e>RHd`x$k0eY9mC42Su-85Am+Hn~Z zSkXSzuDllW-A$1~kga{(eB^RbB{}|zql|-M*VI^80=M8*L&5q=O|&qO-fT$?dmj}> z%Aap3RBDeCtJut~Ut|#Y9XzPB(Yj5@g83$jhY~JF3b?y}Z78!?T_h!QzwRVggB$0Q zr)JS=fc(&EuC2e%C*_@`cQMVm$=|SwpBevf6k2kZCryF3c(h4helwiAvkn24XSzyk zez`=6nbUZK%Lzs@97(TwmCyDjlYww4r63?SuwJ}D0J!!~hyed0O8UPAiEp`=!OycX zgAZ5%W4!lKZ9if>bMPqs1DeJEJl*FOq%hDaby8DRMY>Lkr1+<=o+Hi-Bpk5*b2y&X znc(e7@uX-z18?W%Eymj)PO3moWu+vmyqVXws2fz>0CD$`BS)K;E={pay^%%^KBe}G zM3$_5-i_oszK9E8d`HD{cX%vTLk+!=$PZk8B^k6784*E+<7he1bTCqPHSTwmDOLh0 z0tTaz#o!0ADB;}MauqeIVcR!!UHYf)FrsJqp0@y4`&IwHwRf^i@uPe?u4g} z%G(=J@yTbhICH7Wm$h&u+Ak9XvGEZcc?>iMZ(lS7Gq&iG05q2hp&DCz9_)ZD1OXg;y3%x)r^P7~JD&D*A z4UWRd#*`i`XnIZkgLgHI_hwik;<|DF;7hx~Ti2caxP%>>$@h#WX%^R_ye5zXg2HJ341o@?f$>IckA{-%#_byzz zR}E@X2D*n9GK)ENNSd=4FJ+RzN#?^DvgdDnH*MlfC@dshrr~2b?7E1LBRB|fKpk^2 zGPilb;c2VNpQA_fFT*YR%yQl;;-^lmtQ@O6|MH>y6SK!&LsJPgv`mAH5L1JxO#vKf z%1YJGVKDIs`>_~jBReC5Z~JOJKMZwsDHo4_2BYSdfIge&H$))58P)S<_$GXtJYjX_^ONC#lA%Db$OJ(@C z?1(3G#S_=1$0L$uQ!)$(=9PO)ns4J1c{W^ujlSCv;tcIne?-KZkdJp9Hz1f`5~X-^ zLvPA;_uN5}*$1kSTPO?#RW?DsN8UX^T%C@*ghD+XcB5M2O4||xr4!-KeqwmnmEdE( zlZRJ&lWG1dN+kS1Xn3C5v0iqMykWnDD6m2MOR$yR3Q9%o;7HFC9Fb96QhF~WW6|FA zQMe?2-Lx&!9EYi)U%Wkz?9HCYtLe-P<|L9#zkxfC){Agq;&X>wcTB8wV=FlOnkOH& z*3gi9_50PYXH~$cy#ao^6k1oKMH7>lc$E?Zx`vWKMjc&~1V)KVCTKbL{L3F11l+j0 z5E7(Y_{2|G7;JgGLW!yL+T`U--}_wJslh2g2qj%FM9`c7nHw)~vx~vV&jZ!9thX1O zca2OD83QJmu&wPkyfdobCL7e1C+^?^mLHx$)b`Vc7jM-!IVcJ%S^sGkxfI>fjB901 zM@h6DV_xkR7rVky378k_NK}_=b6eYv*asYtWgt*vT;fn`uoKE5`NH7m>;e~C5;ax9 zzCkDvQN2oc8kV zDsF7{s-0)WMb_giZu4w2y}swE9adlq)Mg^gjv-&PWe6lL;a#j9_09aFD297t166ih zeWn?EV=NHUQ|jSwl^qP=9-dSz`*WTt8CHz0ER6kZC>$nnD(=hvAoCMXHVtoBfINA< zLOAdlpT?Pt(Oyom)`AWpGs7i@;!SEtXpx}}x~L8|`G7{wBybGxRkm8*bNDQiZy7|6 z2O|21>L-`+1d%8HhpP|*(&wH$PeDu#je5+WsyhLlWV40*Lc(}RyO&RV;t5X*C_tKj z5KRFc5boG$GG{IRd=$`u_5ow?f2%eRZi#{?Whllh@Pn#IxyIJwY7gZHZE_2BtT^?t z{>o2nx{Z?zqhet%8x15VZo55ld|G+WQU#v6z! zPPDD1(0k4=!ErOIBLuUoa#QjLebrv6Wbu@#ISCXM8}MOIH*0@$@d?tYoSDU0Di$PN zbJid=NesM++dMH1BA-SUn$Gw7dAUYSsGeuPTdkR-cgein3ssR}<-6qKVUe!L_-WGY z^+{DwvjgGh?S#AYP_EeF4%+bU{nwBSdc`3jchN?+y04MJ;ZOQdN(`KjT7O1m zZ72rzn*qzIvxXj~NK^*zEG5S7MQ85!o{?^*(oG}9p0i(!#JgSx7u7?!vyJGJrTqb} z2JFAy49AtA&)n~tK8ZaJTyRHZ`SpFZadzHGdLNb0;<2?KZPsZ@CeJr;G^*D}YFFY) zknbhBRuar}p-~>%1)Ymy`cQ7FA!6My(YUzBGp=MZwvgwq?0-zF9^&+%LD4pEJRwbt z^~u`t7R3kHesWp>mULF-o(rl_RfJ()fuBtye$Q5dIkgD=OA8t_a3|Qt5x&E<{>E4EubjOqvi9UdHvRW| z9;xevkE54%+anNRL<3(tWA*+5(lgBQ25-|1_7wBGMVpI>0a_Q1OUx9qxTIwAd}hLt zZ{rs&MPZmY_H+gu3JDPRMjP>Z`T{Ph>@oHI0vP#y>FLJ8a)~n(3MHUnb7Ny;nXrqc zR=ZA*1VM{9T>RzZ&_Sd_wSlnw@n>7Y_a7VP)kE-nBdZqMQhe72J|!o83D%sn&`Bt- zl12wn;SHk+Nl8pNt{wu_?>(S8n4yP0Q^=#}6;hy@>)>xy2k9xkd|3f*nwrc$24~bl zfIHXp`&kYb3R|!dHPZoKgbnLP!!AA?)UU>T?70GFTR2Y^t(bA~0Tx@@2K|T=e(C!2 zAt~&8Xr!>vR0c$Tq40r1x@MXgrG`AQ9_hpwO*b_3Rmwf@v;=b8zFu_8dTR~TtoPh` z*GGCfogwG13q9~34ZiCN+kF$!@G?BZtdo%_9b|d`y}8wz zVlbE1{)~g4-C+qW-6IUQYV0$KNHQ)S&(%63A}{HmX-R!f`#hQ2AT0ZmP%sl&n>t|8 z#+d*Gf7r{>J4=iyUOlqTkn<^iu2pfzGPn4Z5j;Dm{R~Tii4{WhROKoRxH$z{$}c7x zNN{qt#Zr721v|q0iAt?LCBfq(cWidQAp$m&%GB*I)Xf|=WxXbhJYl_6x97Hd)m9C@ zK&{+6W67N>;)5*Dr1ARyp{Rr@*h`n{&l8#tK#8tQuLB903@IuUXD_%H4_DH=W2@ogURUsnb`gFiShqGm;cww zgy&$!rylY%KE{o-Z$GLWqEAB`*phQc`a2>Tz$r}1vQSb!EgY1o^Dl!eKMj7cz>%_^L~yYK1?PeweXv`?J@DC; zNB+KYH73fzJEC>d*zWVNOOCy7L2#%7A~t_BBGrtvjKQtbb#Bx$<` zA@#^gC2@JxZE=6a2%iPV{#mJ+&2#(|unE4{E@+MX=hZ-Ku=#8SDy73%i(jnmi2RPn zDf%lB{gv{dwT8RZ4d7nU%LgXaTl&DQ)XBC%Wvu)(G?w3y+l;v?D8I2MXbtaG{-c{9 zkX^Fu{O!l+(Ef!pUeA9vW>UZ$*|1WsevBvKQt?4>6Ax3t+5)hI1Zh-%&hdt~BKRB+ z3HgouqROXzeqIajeZfCzUPmoo#y*wJ_@^pi{+A2CV_`MaHMW~O>pjy&s|h%~ zLUEb^007*T*+|c}?$s`xm1#lweMr&J7FQmo+9KFxTWK`7@^sdpZ6W)nPK$aMYgQsZ z{|u8Twi!TZnU!6ZnV0ux>KRn1W?6zawhkywSzBDL4B1|(hJVPS4#;;xSAs?#y%k*N zgHD+=*TJs@)y|OJCYYPusF&}G>lrZGYi{dj3)|NU7t89;N^nB=KY)E!AuvP6T1;Fs z0Pqgzb|WNaFv1dNX(#_q{@*ep&0ywFWY+5r2(RIGb&)Q4cF$^8iX+hIn^DB+1CBUXOZOy>EAcUY9N7)6jap*nM<1 z?u<)Z)N*Q)0cD7l&amuXqxQ-t-UmdDscYeV2HYMi2ONIKE7LuJ!VKM7=t_`fr7lfY pjxgEl-Hiuy0RR910D#}~0_5w<@o6+?zW@LL07*qoL*87|;Oc^r< zj93T&0091#WzszRcAR#tNJfGDx@)4YA*MX0&gQ```$oONl&A6h$rk$B@UY;cM6(k8 z>8qPSnHvFwl37Ku#In9Wp=MAenLuqo z?{tkpb06$d5MK;^*%Wh&1KahRV!8+P)|&hF86wuT%FR6ciyDk*`yU{_tKyh0ea$DP z5dh=`s8%B+irtiSPEqSIwg55D`pAzz0$>PIM7N}=LL-D?}qaJV)e&}K8_R@ zLYNc*xzpu~f%^5-dBDB=HwK))ceXx|naOZfeI>It;o&o0ovKrF0XJu1k+uk!_PQid rpjy&s|h%~ zLUEb^007*T*+|c}?$s`xm1#lweMr&J7FQmo+9KFxTWK`7@^sdpZ6W)nPK$aMYgQsZ z{|u8Twi!TZnU!6ZnV0ux>KRn1W?6zawhkywSzBDL4B1|(hJVPS4#;;xSAs?#y%k*N zgHD+=*TJs@)y|OJCYYPusF&}G>lrZGYi{dj3)|NU7t89;N^nB=KY)E!AuvP6T1;Fs z0Pqgzb|WNaFv1dNX(#_q{@*ep&0ywFWY+5r2(RIGb&)Q4cF$^8iX+hIn^DB+1CBUXOZOy>EAcUY9N7)6jap*nM<1 z?u<)Z)N*Q)0cD7l&amuXqxQ-t-UmdDscYeV2HYMi2ONIKE7LuJ!VKM7=t_`fr7lfY pjxgEl-Hiuy0RR910D#}~0_5w<@o6+?zW@LL07*qoL*87|;Oc^r< zj93T&0091#WzszRcAR#tNJfGDx@)4YA*MX0&gQ```$oONl&A6h$rk$B@UY;cM6(k8 z>8qPSnHvFwl37Ku#In9Wp=MAenLuqo z?{tkpb06$d5MK;^*%Wh&1KahRV!8+P)|&hF86wuT%FR6ciyDk*`yU{_tKyh0ea$DP z5dh=`s8%B+irtiSPEqSIwg55D`pAzz0$>PIM7N}=LL-D?}qaJV)e&}K8_R@ zLYNc*xzpu~f%^5-dBDB=HwK))ceXx|naOZfeI>It;o&o0ovKrF0XJu1k+uk!_PQid rcsWAEuY3C_l-)b1LI`_HErGkJ2$ zZc1fjK!E8LE7{C8e@gb!tShQru;-oBiq$7Q^51?iK63QTs+$Iv+)Y2slj*iFf4eCo zdS~L=U+3jRxn1`#X;mkd%AdZJX33QiaJGoQxwBq4plwrcMT}(8o*ZHGH*f2C3ORq( zUz!_Za(UJYmaQjmc%M()akuUHZ~2ve4P`=K-7v+0oGy+?v{E!XXatTVe9dBJ!hgW=P{l66k~YwfGvxos$yj*4afe`W(O dE5h#&Ece~t$zvWS-o^wH^mO%eS?83{1OVZDmOKCe delta 341 zcmaFE^nq!DO1-(Ki(^Q|oVPb~`I;4Y8WOj^QM>csWAEuY1I~wwoz6t@y#IW9<$+61 z?e8oY5a2-ko;_@06aOT0IPN#TH$mQ?*W~JvOSj8^h(1zMI-0ZL%SWjl>PMZ<`|j0w z6?S%m*x%*-aok5MSw*T6bMH-Sxm+k3uyoc^xgN`Ubp`%Z*}}a>ODax!=3Cs}&-+}c zr2Z1G-mFyJkfv8DUoI6(zDqm&@t^Kg&JS~4Hdp%!diu`#9rZLN?(b~dKZlPB_{SXT zzszfN(fl%p=|yulKAXT+n~&CSUV1)U`@K~;JumK%KTp8tw@pP0?${KaZ2dpEz;Ab+)ALcsWAEuY3C_l-)b1LI`_HErGkJ2$ zZc1fjK!E8LE7{C8e@gb!tShQru;-oBiq$7Q^51?iK63QTs+$Iv+)Y2slj*iFf4eCo zdS~L=U+3jRxn1`#X;mkd%AdZJX33QiaJGoQxwBq4plwrcMT}(8o*ZHGH*f2C3ORq( zUz!_Za(UJYmaQjmc%M()akuUHZ~2ve4P`=K-7v+0oGy+?v{E!XXatTVe9dBJ!hgW=P{l66k~YwfGvxos$yj*4afe`W(O dE5h#&Ece~t$zvWS-o^wH^mO%eS?83{1OVZDmOKCe delta 341 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 diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png index c5e660456e1f162472abd74ec9217a79e8fd17df..d9a9369ba49b351659754229c38a896e1028973b 100644 GIT binary patch delta 337 zcmeys^oD7IO1-hCi(^Q|oVPa<`I;4Y+7h?FQM>csWAEuY3C_l-)b1LI`_HErGkJ2$ zZc1fjK!E8LE7{C8e@gb!tShQru;-oBiq$7Q^51?iK63QTs+$Iv+)Y2slj*iFf4eCo zdS~L=U+3jRxn1`#X;mkd%AdZJX33QiaJGoQxwBq4plwrcMT}(8o*ZHGH*f2C3ORq( zUz!_Za(UJYmaQjmc%M()akuUHZ~2ve4P`=K-7v+0oGy+?v{E!XXatTVe9dBJ!hgW=P{l66k~YwfGvxos$yj*4afe`W(O dE5h#&Ece~t$zvWS-o^wH^mO%eS?83{1OVZDmOKCe delta 341 zcmaFE^nq!DO1-(Ki(^Q|oVPb~`I;4Y8WOj^QM>csWAEuY1I~wwoz6t@y#IW9<$+61 z?e8oY5a2-ko;_@06aOT0IPN#TH$mQ?*W~JvOSj8^h(1zMI-0ZL%SWjl>PMZ<`|j0w z6?S%m*x%*-aok5MSw*T6bMH-Sxm+k3uyoc^xgN`Ubp`%Z*}}a>ODax!=3Cs}&-+}c zr2Z1G-mFyJkfv8DUoI6(zDqm&@t^Kg&JS~4Hdp%!diu`#9rZLN?(b~dKZlPB_{SXT zzszfN(fl%p=|yulKAXT+n~&CSUV1)U`@K~;JumK%KTp8tw@pP0?${KaZ2dpEz;Ab+)ALcsWAEuY3C_l-)b1LI`_HErGkJ2$ zZc1fjK!E8LE7{C8e@gb!tShQru;-oBiq$7Q^51?iK63QTs+$Iv+)Y2slj*iFf4eCo zdS~L=U+3jRxn1`#X;mkd%AdZJX33QiaJGoQxwBq4plwrcMT}(8o*ZHGH*f2C3ORq( zUz!_Za(UJYmaQjmc%M()akuUHZ~2ve4P`=K-7v+0oGy+?v{E!XXatTVe9dBJ!hgW=P{l66k~YwfGvxos$yj*4afe`W(O dE5h#&Ece~t$zvWS-o^wH^mO%eS?83{1OVZDmOKCe delta 341 zcmaFE^nq!DO1-(Ki(^Q|oVPb~`I;4Y8WOj^QM>csWAEuY1I~wwoz6t@y#IW9<$+61 z?e8oY5a2-ko;_@06aOT0IPN#TH$mQ?*W~JvOSj8^h(1zMI-0ZL%SWjl>PMZ<`|j0w z6?S%m*x%*-aok5MSw*T6bMH-Sxm+k3uyoc^xgN`Ubp`%Z*}}a>ODax!=3Cs}&-+}c zr2Z1G-mFyJkfv8DUoI6(zDqm&@t^Kg&JS~4Hdp%!diu`#9rZLN?(b~dKZlPB_{SXT zzszfN(fl%p=|yulKAXT+n~&CSUV1)U`@K~;JumK%KTp8tw@pP0?${KaZ2dpEz;Ab+)AL