From d6af7f4de7e648c8564ed981be2ac7f0e03b0adf Mon Sep 17 00:00:00 2001 From: Henry de Valence Date: Thu, 1 Feb 2024 18:02:55 -0800 Subject: [PATCH] avoid conflicting field numbers --- .../src/gen/proto_descriptor.bin.no_lfs | Bin 98731 -> 81667 bytes .../proto/src/gen/penumbra.view.v1alpha1.rs | 24 +- .../src/gen/penumbra.view.v1alpha1.serde.rs | 47 +- .../proto/src/gen/proto_descriptor.bin.no_lfs | Bin 364743 -> 347591 bytes .../go/gen/penumbra/view/v1alpha1/view.pb.go | 1659 +++++++++-------- .../penumbra/view/v1alpha1/view.proto | 19 +- 6 files changed, 878 insertions(+), 871 deletions(-) diff --git a/crates/cnidarium/src/gen/proto_descriptor.bin.no_lfs b/crates/cnidarium/src/gen/proto_descriptor.bin.no_lfs index 75fa7cbc0028917609475d5cde1553d9b863058e..ad8745ec01f5af5a5d47cdbc6c4512e6b2345e35 100644 GIT binary patch delta 14089 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 K^+c3aKK?&GYlF7{ delta 31020 zcmd^|d7M?nvH0gK_ndprEX>?tbAWIelubaz4crohQBh>bfLn||yv$r+;xI#I5%Fho z#5^}5CVEg5%~PKy{G!n$PBdzMDn`+`d`w(kj4=q&CsEwRV2nQV`&M_KbMBz#CHeQ~ zC(&Eg-PP6A)z#J2)n~r-iF?bpyiD-dOWh#)=%F!}jVroWWrF&s_`~{WlQ-n2{fF2G z&mh!6kgM;jnQn9zMyVNs$ z8huwz8}X^WkJ1$ulzLl|%K2qM)tRO4_9gADx=%+jK3)0@r=D0=vY@xvTRJ2-Vcv;N zEpv{V(=@wfK*NT0R!~{SV}5Ahb@nY^Tud1<&!Q4VfE z%mdEn1Gjh8iqdf5A{VwOAm0#V8CI$L%u?I%3yCuuL;UVR%=blWncCCZ}6r%Bj-2GT-Y?b)`7R0xigP! zn!Bi_>B}d~X#r>Vzn;sw)?@weSHIyL{4Y*HG}AjZnvtJpzwbmB=l>X<7>sKxt>`W> zAEmZM9i^qk)>VtX*3;FwXi0miqis=ZSLc$B_SW8>;gvGpBkkc0)I=QC+kPsw+8)h*MG@6VnR^WR$AP*bWwMyt=QT-yjIva zB(tR0(Nhwoq^L!e(61@#MOwjABGaM8k3<~IrH(9niRdC5_8<_hW2!H9Bf)5$QkK$vQoIqztC*`46= zO$!#xq`(ng%Ufbl=FYBlcSkqR3!9pcs?Eq4%BwfcJK^|RkJUePckCjh(sD|zzkAOM znp#er!@#o`rhIv$%L2rii#*4GGqqmhYCAe?*ddF{&6$|#e{hsN z`Q7bQ8^bQOuXdtyhTlBE7LWZWNMMWm z!#zH-!jE%7knWfHZ^NZFzgXs;QfF&P?P@jCCjOmWcB-<#^G$;zXIx}iS6S{=mh~T2 zbw1m4^8C4TX3beRe7mpUIma9LPr&<@S9sNLsaBoGr1DFGT#3zfk=iR|a%!TYS0APf zPi>-DtmKhnRj;1vwKDI`n%lgfX}0P!mv@`zH_aRVC%+{t)TDa;aw{0tUD6w<*>D(b zS6h4MQne}9Oxy2sM;w-Vr?!~3YUoX-<&on*HT0SDW*atOYW~bw#{t2}kht#w?ek{^ zgZg@xOkaeFY;V(kiYud@HmRJMP0MM2nRLN zQQC;EYnPXLdWuU+ixNSI6H+s6@AAH->u_pW-^c4li3kd1A{d+>G`DHq(F>1RG{2?k zs5vJqNwf?y{lrc3=LD5{-|y;PUhGxwP0h4%yZ4%Q8um_A`@X7vEd=PFCj{jhv~ zZqv~-XPvU>$fgAg7d0JqRC9~gy&#{NId^XJNizCCIy_1dX#8qWJwSoQ+A1?GTrX&v zH%sjgW_zd#vQ44UX!ZrbSfAMh>I25B`c7OYrxE)SE2&t0vFORBV~A!0rJ>LZ0;9QX zTqg!YK2yu`;n-kwOOy837HLl5vU&ELc}JIRl91B+rrBf}DqV!|te|F~#^9?CJ7M8b z(-)mMbMBnk%2g~Q1b3oBnmbXT@TgOuvLG0=+uY|z2E)z9$L{nghLm&$XagjxgWT+< zxpR)6Bfh8IcuWwaQ!88Bu?yH_nZn~|E=*VoEAqKO&m|Pt<~}{)we}6U+5KZkK9j??5l9 zB_Wre84Oz9-r2q!gJwLl;d*s{zTZ@18W@_2L@_*T01drL{~nE^YG7zITxbQu(}54< z_8;=;j@j*OH^8s_XSUG(RU`Jc?BCeY4@S1yuUkiUDDeG}> z4RU@<^TOt7wcC9bbb<^OcK_Nx`T4q_Dy}+h-)Z}!OrohVYQIGb#qc!Gn|lf@lod=X zE3osUf?;us8T@l_S>gBAdb<}-Uo<(T`tP4EpHbHQy0u=ka@6V}m;cNO{Cs9y#REAj zxOq@uRpp&={ncN%#SbS`3=gt_mCZYoDrN_{z|L0cpBlM$#bkxF@{at}$jKG^DI|^L zr$$bxI9MU~$~*E?Bd1o3QOG^>j{MZfeJVyPp{LYa=vq=ZqqA#eXQ8AOx@T&@KTf8?%7@NjnX2HBz|ANI zjvOw3WIGOS-xX#m+)s=KvZ7b-IBN{7PGRI>JU_G-Lw}9uk~q zE5ek`wud#mZx!@mw$QVxv$uFwp|R8!s_05j@EbnVwR_JIyqZAa{+IxE2J6n5`iV2Cm%EYT5_0+ta2CP&&H`t0c~^z^M*(XmQ3>6*5WivH{`wbbEM zL=+Sj7hBI*S?q4>DYSMiUx8DzxV@vjcU2-HONpV@h{!@jv+IY3GWp04sL38?%4}*j z*>O!(RzEcOv88G<-N!OZH&_L;%zGGDvA3Y)v$$01EOeJTN=1gQ1!6|u-l}J;r%>!J z@&Co`z1_v`RUuQ`78H7xb@g?$6*{|=+z39DI@^$4SEm*Wf?HKs*^W9DJ60A~^@wnL z+n1N7bakU4R1_Vd&sBjQdv`ltM>24S;T&t%n87&=_1L;0!8g=sLiBu|-O#Y2FuzRY zVm(!KdrLCWOAGPb;C^>?^vT>LGd_U*K+iiIA&6CK6osz7-k$chlFYi0lLeqPHFRNa zo;}2XF3imvu2v+IlF2*Gc7rL(P_a3wn4w~GQjz63-)=M&Ju1$(_lO}X&L26(OtYVN zzMNF_so3=8q^3{JFDEszJ}pVjEHzt_idibQP;sBYhI{wKinF3i#_v;eVs=C@1509w zB{?a2bo`;yPcjw+6k|E5Qms#^0KJoND8$wPp;9O9(GW~hjVU@gI&8w^=_eopc=#3snPWl4w`;y(paQ;YSLI#`&9fV-Lp;OQ%4tqFRR7? zr$sdr7fe4bY3$JWv`V!S=t~sov^phcfu#Ok2(FuvrFUC$Lf+ zPccOve6%G*JSj7Fn~D%=8?7xo5JcMco@|Jq7$tjZXsGy5DJ4{VsFW(l#AQ$^HBO8n zsFWs8F;q~RCH7QPl!eHWgh&=5ODadlWe{0Xh>2t&vP6h9D`~JtEwlCZV%a&UEK8{5 zpt7toR-7DEmJQR}5;dW+Y)oVDK6VO`1$n14dV23&M|38w16p@h#+nn*y0c-D;V7VW z=ai|z_jPNw>0bK_4ePDQoia0=TxirLw{f!AE7>^WeIp18bCwiNH;B^ zj9mm$`;<1~SgipqwGvh`!rp|(N_3$&QP)a%?9GS64U?5H**jtsd##KRH)Ew;Xiz&> z`Mx6CjAB>qEZWpab^2ME^izc_R#xT>;VSxBSs!a#72T{HH9DBU0=M&-|Ls&fn3WZ+3T)8L+OxuY7Z3UfMJ zJNkOs&nz+Dg92Zd(l^CbDIz0?>U@fT;Q3bl@Du?D=UXF2COuH$0?Qpi4^3x`?mkHcksyeaCesL_x-m?vK=dMO?4%R{ z(TgnBubu;#SYx3STC5oe0>*QIX$8a%m{Mr1u^J}EAe7cviDFRq63gC46^6EreHAz+ zg@FY`!!#)@EMQ?$3_|LXlqo;&UTWE~)?i}=j45Gc0TZU!n*kff7)m~rF17M|?iCO` z7S*uwUS!!#XT-@JQ;<%U{2c2^FH>4NgK3sH_M%DWJruSk_cZRa3R4n2?Ayu04ACmSiSqX-y_ zj4cJQa(KLI@lt^I7$4V$+w~UPkn{@AkfDRs6={f--Pi=ED7+l^qqx?&XNoud|~2uR1p5H(gv8cL4~) z*Tst;kcQV;qxV-`0Mf;E)22eV>(Q?1gaHu+L zmCoW`tOuvGpf5=aZK1l~#s6H{&PLR!PajFG?qcWC*j6ZNunIXnR|kZ?y2e&NduTVWZ_XHhfKS6w3K;)s(OI5ilj%jCaq4tnz^67?dzVQ3po_ zPG6i0)LDmZvRL2?xs$bLe3aF;YO5=-qQhuqHP zLsdmFICxZwU<4bj!k7TTYN29_e#Dw-_^zeKu=@}sKK}Q|aYCm)9v)u`dy5<-i&Le| z}Uii-=PY@o6*e-v7SwOyB? zv)fSxyZ&T6QV>72+|dp9TH?U;cK5+#duN+m+n3CdPDE|A2}ee}8o4r;*^rWS3Y9KR z*31?=SDBJflu^yD(m>V5P*X>_CB^m*IUUPsl@svP0++l0G1Z!fkK;#Y)%h`Wd zDk(#;#;OxLtQJL3>bfI@xk59N>R#DSU}2!hKBHNey237YlnqIo2e?UwWOJkdQ8pqu zfZb6(B8(FVMzm*$E5p=d_I_@;gBpjx*YYkke?8o^>l>LsZNgFuYw~lex+a!PPRz|f z1WQ99ek$hF5f!`FvX5%`536vLoW5Dm-JQh_IsA6_98#FwykB8n^TNUj3!0`DPLdOU zDOMbO(^f7s#1wRK&@c3K^>w$(T8~ElWO#^sT{^4O$^n}*cYCLy+KN5s>{}rxe-;R& zdJBYEfXrz-?!H6f9b&R!5aGdL0%CmcwKzMNQpNwU#u!9w_gZ_63)E&xV|JcDy&vc+j#Rv7Cl|m5nOTwkh;TQq8B0Y;5h-*j<_1 z2Q7biFiWhS3jMj8Eq8Fk{)L$yK^9asDlV)KRjb4%$Ez{cPiY4s8V=H0BM1bu*^+Rs zp-hE`E!UV}D#(Tp!swYGXz{RBmk%z{YQoEcJKVe{^a5mGxWkuQ<2n6Efy^js{%vuR5?u5 z6ISI&qc&ntp0Gw~-;v6SdwfT&V-8C6gf(?`4B`MjVa=Eod_}wlR`Rc{=%?47cmRP= z`CUC+*ORcQfZ7wG5DER-8ZtcCAJ@apd(T)Ezp$fC2kf`+Ggfw_@)ii+=DlYv`+egr z07K(h%dZR;FcCVs>pmBaIq-yq&&Bhlu+V-ko-aYr?04~eDOe-)d?^Giekb#_(hvrI zA$shL>&){vfQxgc1B!2+xVO9kg$_ zwVXJIQg>@Pab&s8a)%_u36}_>Hbu~4n^iwJVTWn_V|fel+(D!*JX-uQX%R94X743z zN)*yY-n zxA&H!n&~r!6qjHO3%ex%M)Rkyt|@T*OTw{}qwh{1N=#MT$3m&IxVQuTKC`{37Rc$w zxkzrGPmk@FS=cfeL{@~4blP)p`kGZ&Pv}9Ny^ zyKhDjUwKs)YtQ}Q(_pS2jARZxzR8m#6cuO*m;uh6;_w8~;t)>NtbT+DK z@wQcKH1G@tRg-t$vD{(FeAUndgmw>P)HO7D#~M5|>10seeYd>DAXP|gS)(zXcx686WN!GR4 z&s~;ZMX*%nfiqd&{Yy0T(8=LnQr!d#mA_a+;*qG6+K1^#fT05-)@Bg2_)uCrA)b&> z2JzoCY50Y9g}X~%?`s!ltfRQN)FE-Mu1;RY=&Z$wbWp zw(s#hZ1XF~J8bXO_ZrK%uMmfBpe}2bRbJmB9an2DB?_D9I6g5%mZ8M2%;U6JIuHZd)+-9VThKyCK{F)`=b=5z=Mt#fU{TBfp-4}s0G z)s>!B+qT{$fFK1Jlagb}YMZ#QZYwjf+O8WGgBZ%yc7uf0gefNByp$;wTS_U3-*BFx zG+ru0>O8wH=1OetdBW7Svb7R4Anw8y@L}IO;)0ZhY-ktQm4i(8vY}mI*A9+B)n?f6 z;OE?=L4uL2wfk2eKHWNeZAwGD(zU5@#3x;Alk1=dC?4rr`wOFkZz>Yhz08hw9T6UJ zSxOM%Kmsu?hmgB%o#z5c>DW!v%!?{qed0g#P{UvdD;fZiR<+G|0U@O7UJ|LWKjyVN{ z{N|WbK*(>7IrW6oM{E;61cDM^Oi4I>#I78xrY)pc)!tJ(fq;;D#5Ms$Pgd}wHrE-V z%0Q3;j7iA~e$+OH5=x=;sLhRrsSKq@ZLTzaEPC%rNa!ise%5vx{@pILNC2nM6^)y_ zXLR(j{~bPM2P0JIk9s1Br|r*-3#(F?pjaO(6$05jZJVI2Lcqw=wuuWX1gt!5o4Bwb zsPK%f;=(%e96fkkeioRNsMxt@%881cp0Q0NSkZv!Ga~exWkGpjpq`J0&;8M1&!-X+ z`}DkR9B!&W<9U0O4*3B}6MO1DL5Cv1xVBt=eCOd?()MDTwxrW8wrNXj6+8*$0isp= zp;dm~`=ed4J-X%ieZxQ6S-nVok>yLVRsqompq@ZL$iEbm2Za1fu~q>>{-s!}e39A9 z@wNa2CBT@Hi0kFp_JkCx+Gbw>gw)INzTk^iy<(HCA&LS7DZrSNXw@rrr8dBnLg^KI zq*g&dD7|8nv9Tv(&gQ+>?25N+t6?Z1s-D*F_QgbhiqZ4)>ciLUtlX`+ZdPQlBbEUW z-2v+E0O5Q`ECWEg+Y!qEknVQGGRO)quiGY~3j`&=n3All*X_!JURe~Y+GBJ?7Z6gf z+eCCVQ^?>=+r-neN(O*2DUrdOwuz@x3Z*w~6Hf<((wjEn^nH;*F7Lf-SNshbG!Br# zj^@!{dDkYeE8XQp2Jgi(0D^Ns-5nq@crTU#Al-V+(D7e&trGrOYJ`B#U# zQVKHvyHW}=^j$VL)iT4hfWj`>do(W${R5lpd0i;e4;b?z;lK}4O48d0k_TlfL+JyX zm?xCJ3}wI%ZF?_MD#u;Gn3Sx(5A8~QGNmr0KD77H^8={bj@>h8Qlp~j$I%mCKKd&k zrvzmAeH`yUIh8N)v0WPzkmdKW4FSy>+6cJUK{3c4{jt68frdPkK8cpM9DUj+DS7c5 zK1s=o-|$IFUi^knQt}zdf0B~VK>iaU|Kl2zAjo?+I2Bj9{dEhb_;oip*?N7E9LT(H zbfV_3{P~EDju8w7RDmM(fl&QyMbYcRI#>3zVAQ>D20_4hW4q zopIVs03v`por#Ai`2r$#R zP;45z*>Q8~2&m9Vb+c1d9UN`y(fK1zG<)$eV;^zMVN&YJ>F5!MqkUWt_*YK! zzj92}KKdTmk2+Iq|}4i6w*KjsYAYXOjPKjw^& zr%rVDv2^N0cOR3fdnwSOh1OI3=eD+4hd-6}ARh5kse*||{FGx%N}xRAr<~Daf@hHs z%tCTY|CrK=cDN-aAs+FTbaKQa-jeE z<*J7MTQU!G6ahjv??#!9;|_l}B~Sx_cT)lq&3V_!>pd~BYasBhLwc4vGX^%HoDcff zcGO#keUOqE1c?t)5)$6|AhqIyAn}1i++7Z?flX-Vqv#LI&pqO!lmHLO+>cTMPc@A!L{fY;} zH7SXDNUTXo)I(y8o9t`#kXYj)5xE5k?7UrM&>aFpZK*Q&) zuG!@QX?3extKDKi#&oNTTP*Vo$XdMBHCrSgYw=c>E%J4l_Dbnla@_qdf+ zx~39*3WhnEG6l;HR4KOp9=Aq^x`1{ARb5JTT?KJ}p*T_=`#o+7#--PLN~Xx?DVKD? z%RIUBY~uE_i(KZY>74KOKe*~lyGajAd~2%d)mo`;r=LniBCgd_ZmrHrqEyi&xnfVW zO$Pl;)bNdQlb=ZkD-Fs)cv9eK)8N^t;~QhbXVV7aS(Sq{P~aAEFe~K{vCXyTH$3SS zn$(?vioNRh;$(MswspvjESI+ORLETHtCWu90lCVDCip55;qF#az15GdQfC zuHLi>CuCoCa_?7cZSCqKSwuq4VUfJ~c1dXH($uDLLr;Q1sYCABAql%Cds~IG8S_z=_pr{&Dp_SHy!93e0`bO#)AsvS}HE5Z~on*Gw_!c z351gxFV&Z~FXaxmSF&WZ21-5wbDV%I%5A9zihgW!YxO3MKA?fy+!@*@0c25ba}R4) z&b@%D`0#mZFQ}CD{qkq*1th)yBUj?IhcyVqtci2{a=aH%3TrRNdjTMQzbt!!q+C_X zQGdHDDOX4G8#>!lI+CEbJ>Cr{h0gYPHvojrcG(T&Mppc(*Ic=gU05kMvaiKE0T9gq z^-ciD%6Uz80x{@SdG8Ik;#;0J=;9{5;bsR1m&>B6l5@vS*{{FlMDKp{)==qK`|=eX zrR8J@vkaIedD_v{-7AR`tgfJNYO7=n9X_kMW%g-GhYe!E!WJGLo>rJ3YG$svC!z~j zn$9V4LWf?L+|58pB`Y;9UPV4nqbOwWvgqewb+kDgUmX;>pwg|X^h9rmV?wypvWI76 zw$n8i6o3qAr)zE%0Fl{Fmsp0V6d-D`(;cBtgn-!Uo$ffD!CEB;viDtkb;i-P)wT5d zF4tG1Id4%c^4aCOgBqgmoI5Jym(FrhB?x(!OGe6-j;RYDpSW&y!}*Rf1v+15ptzP7 zSFvykdeJNC7C%EgDn9}l2L&UYsf9TtnUQ)@p8bTxX6?PVWN{;I61ieK0sWp{Wy7dZ zEX?8!3Kv?eMKaceG8Hj*olCKXk{CkO}D?+_j>Lf=(>Z=M}-R(=;CC7)i$xBM{-I`36 z?4`_2RvoMrg4z2-wjQ~!6$J3P8FNLiU|N9C7w!sS4;Kt)=V$cNp~A%(dql%SPXEEH zkF`R{bH_ZIY3CQagSj+B{6TWNm^>LOoF1==-5#DN7l`p4dHhg|ovgRJtAnM3ILfXN zMb&3lsc0oE#p^_zri(MiE2C5~T&r*209hv&XILj2#I>su0bH5sfBd{_?C{EzhS;tv zGsgR;5;U&N|~00NzvX`5PK#oi7ih*32QBi<&+sCyRBPteB#A` zag`)Pv;9@6Tpsv{=TBl=o6`9ce`-_4TzyhmG0oK{vLDaK|))b(;j4l-JCJEZ#1EY%^A*idUj=l-JCJePfF=vbB6Hb ztGWY7J)Viq|ITZtKAv_U@z2N84rH5rJY(GIDz!~Mo-uAUARRoOF>W;=9Xy`Ft^T4K z0E+lzCVKR{Ukaa0=}QFZ$&|iqpHHSDlI`=!%rNb;R@ol(pUgDqa|j^xpUmtvNe8{F zL|dQE*atLRM8c`Dw9FbW2W9GXUZ;916UK(tyarr>F_o>7H+0&X@yr2Br@jk>#Z=!G zz^0a_VsVwVOX-OkiNnS#RC1$xc^y$`#pI${?by^rFC-No){I_+wgkPNPDd?4uctG$ z@hX&{*V7r|W_sEr==F4_Q6G*Nr5fgxX~AYSZKNuB&t>cvGET$KRHCiChea=U|9+0% zW|VCUJGEZ3&vcRdBSTM|<;9raZt;cZb@A;iG2G&hlNl*as=Se&oVXJR2FYS3<$ubR zUP=ZpZY^GMTNmq0#Jj508)&}~2eX7x=RIpUVevlG4m#k#8T%hFea6ICNGhq}xs0z< zN~%aUz?}Rpm1tTU9Itxo7umZo!@JLbb0m`^NU*1A26o|Bi*q7(S@+KgDpK*20 zxzH2?2}0+QDTJ!QGL>Unl~~9v8Qv7>xsf0vV7%bv!N8UbkLpY*w6fKm>gUPH36bez3PxLP@UD@t={c2<4QGUqhUvt zSuh(JoBR^VW@VQ8I#G_vg%JJK8PC|crdb|q9fsFD9P?R^4TgP7WCzeKg>)xPa5*>e`VZ}#w*Y-9zf_6ECg(e zC;eX;vR$-_kawGR!&lM?2LT2|JmDZ{@=AsYkDCB*&$xRgod^vOqf>;c!6k3pf{Ff9 zIa|Uv2*Z|S;POZqOc`G&(yOWJI_e?|M69|XXz^;QxsDu&UMp`Qwi!g)f+xHnlI7uu zE3kv1>sL-99Wl3H(y>cY;*RpMV{Be8AF7xt5b>gPY##N3U<-)H&H{O(eC!fv2a!%m zHl)cL1K$)^N3TKZzmu_bXuC=ta0(c&LCI=)Cu8oW zDTUTM8FM!c$kc@IWQhAJpGGns-pkm3j(r+O&LZz+cmSt{qZ1u=X52BFH-YI5gw8^! z5(NG2%v2j03IY;4GeeA03W7d&X1H2y6z9jO2t|S3&$wS`%oi4tSFVB($>#>-<$%zY zn`#ie#Sh)P&E{p!Nzt;6FPc7Lr6!9iQ9u+8CwUrs<1c;L`;&m4-DVCGUomo z5MsMByjInwORf)gWv1+-4&POBJ@8@XUk$|4oW5yqrf8a7N#7r4OdytG`u;Fu0?Qa>5-Xl4&SD|UEz38mVM}@0B69lYMLBMj577CnUTAb(E zHN4|B&shi}$+rR7f7O2%buH#~KQBubwRJ6Ghg^ik4)lbHs-EYWAa9ilA0}W3Og{>i zpg?urJKw9g)C2|OZsUB9pn!zUtHml_=-FfcwZ{WAN6NI`2l~jvruklou`MlDiu|enO}u+7xBx zto6)vRjcU&)YAosP}X`TQc{!mzUx)oW`rX5HQ)8PW)#|(!Kv-Jmky!YOxLP$bwhdl%>$>e<*^rWuWw{|GA*0&h84sBzkl5fE z4;c{axWO|XG9c!4gNKJKA=Mg`?OHE-^NK=vZLDlHO4-Um#;d?zi3?F9=b)QBySd?R z`~R1is*Yv0sHaBS|J*&Esh(n_(aW;nrMRL4qL*dCOJs?UXuJ)Kte}ei{BhCNlKw}vuBnhAarhym!#Z=-l~>lbB&nL zTjMneL^D9WCIL~(TjMo3DDVBmt9Zz)Nx1<1iI*K7d>|`okSxkOyr^USU&1@$!GWZw zJ7T#5(&mnMMFGOp9r20+MDBOQD+-Vmb%(4dv4n$U%I^Ay#2&WF2Zaj*-%-&XaX~4Ke_92?QDb_&h(Z{A(0|8Y#vnj}B z`h!XX!$G2f55^h@L^D9Gfq;nq!B_)p^WMW=#S2CQj|)*zkXli|N4so6$FsZ9*x%}AftKI!?Af@0+6*L&u6{fzm=ia ziQHfH`cM4cbJn6)V}`)e%d7FQ0crGVyz&8I=+$`GfDHT9c-Vjp`&AkCJF@!f8I0&FEqKU}gn`)*(P< zTR@}=5R*) zm^0CrU9omk3TL}w?FNLiU83FSU6#H9Kh%oHZwP&u5>i>8vEoq*p$}ul15_=|qL=KI zkJX|-uuc~J$FcSS(F{;)A0UJMShVlk4i0i22idQ<+V9`?9~WDL&-cmUe_ULqyd3$y z?c107{olB0jun2}5A+Kz3Pdw5@!dvs*i$fUgV1L%g@Bt&d~*g<2za=}H!uDb0_HFA z$$pgsq#&rU)_2DyG-b9y7@DEffaqGEamdk6HBoIyib)UtV=10G}iff9TB54l-Bv=AVP@`r3rY2 zZ<5Y|7#LtoN}}mk_~zD-Qb=9l*XevNK-HF{bIlY@uk`J>P`n<%n36=zuS}T|ujfiX zG)YK#<@Q{eN}I~-eOsq}Auvb*#-t=ZzCLA2VleCdx_D~j8hO1agJz1Exym>BZ@iB@}*D%9X@suJZFb3QTQCUFDNd{(@+CecrptulUHf8a^U&D3|;4Wm*-7+`sq=~?^0Fk!PHOg9`c|Y`B{izS3AS(}qesix7(EOo4 zG?ch317#fEExvub?<%7M%$fnAH64(3aEotp{sAF(i*LTF14wtb_#~SR!e9aNfaDf` z^6f}XEUF;La{Q5RLUIDvBez?Tn~rNL3?y&!U2Q-GF_Dp@cb#{nQv=MWMqMyE{8}%!p-{ZTH{n-7K;ll{T#71K zBlMlNLeSz)-`r^n0{G{?d8DjhT7b|w3<{xYki#H?59{f|yW6+#Pb4p!4TxCs;#%At z?+w(3+}*Ny$=(2nw?H7`MFB$9P>Vt|9IhYs?I#jBi=*@~ zZ>nNJi>LIkZ{8VE9R?ou$4obZmVNGF|IovXpgB1~?eHfOLEEC@kEDXOm7sr>m*_;PbY$wRs5vy4>5vPcPYR2-GULczDoh2!}9g! zF6Gxg;V>;{b(iv+RH6ASo(LLDtkL=|Nw#^@*Z{h)w^EN-^nWPr9y!zYb@B2z3 zXjcUN$7IkX_lcliN(Bu9k}s!%CdG{!|K+=L8Ip*V*TaAE?bj2rimUY}->)+x<}Gl@ z0WcM#ek%+@pX(r?Eb^y>J1fA#H##-S>QF8K_U z`4)4`A5H%1SL^(fdZjObF}tD+fAxp#5&X!;B_Es*z17)@C~Gx*&&CrqUma^pK2NPu z?iBOlM4S9db-hnQA4wZ{*YS6rw9m}N5H7g-OCH?kq;`7}$McGgpptN=q@E~b+2OD}|#6xP1G@~XQQe@${V7MBYXpk8)ydcZPve>5( zST>gnv&K1AF!lz7_GARgyL+m9fqa8cG3E9A>Osel!T zl&1KV7iGh0ZE95&)n>T%CKLjq7iD>gD@WnM!seQ+y`Nh6KrjiYjUpiA)@0514*;RH zCcCHpNGBka)@1kDH#koMeS?L&OSAU)hTc$R?V7){5vM6Jv+=Y{;A{H&6SfoMJT9ca zl3W+G0Gao-vb0EjioYTg&zxEh>WhMs(WJhpm?&1vvN+lyY$Py4xRk%eUX(9>1k`$o!syjuP{d?;<3D#Q0PN*uv1~s)7D+K%1)~xwR zg+f4lYqnl%wL-wm)+`Q$tOSK1{JJ$ea_^uv$QlH5xivd#Qt-5VaZBnzWVt{9 zJF#IMA99u`4vOD@-CebwVnSw}(v%5_+O5x-FsF<`2C+UjSm!_~1Wc^Y5xEn?BM9KD za_*!=GUBL%NNGy=?y7Q{;;Ua3<_2rKqG%{0e0Mu03XQ9C?zDucIHe#`q7uowx}2yu zrdQ_%i^s2LNL6xXx_U%Cx1qzVXLJ+#Sq@&#zf*D+x;j)e z=*C=h{idE0zv=PDoLLZn=<1C*3x>I~GC%mYz1|qO%^jC{z%AZHz~!5R7hP&M2fpKw)FfD5OHrc~9&XN& z{U+bl69gUJmWwhEu9&AFDBf01QIzYp@==L$-Ig=of>BMNcw3Gj^$W3}K=kLL2On&8 z#Vv^@J+xd&Oq8s@oVF-ge>rVYvi_X;B#h9OBVm6I_xx*`TZzj3Jm=n*%QT!^Xpui- zDxcPus3%)-Y(GeQRPK;`Q%vWuc9BFYRrpA(Jg1OdTfq1MLr~CvK$pFp56|k;ExoId z-_LWoy5K16g+ho9+@13VH5?$eA19BM+1ZtJBPq7@qC2IC6iodQl~4>gl%+RNS58Fnw6k9hH8O^J*Fy61)5ftjZ5_D-W=~H#VW`Y yGU@l{jxrG-g;1C>rIpj_{kdu#i&Hfqdw-6bdNB(Mfg0SO8`IeT+lQu{{r>=3e+YO0 diff --git a/crates/proto/src/gen/penumbra.view.v1alpha1.rs b/crates/proto/src/gen/penumbra.view.v1alpha1.rs index a96f562e2e..1fc31de905 100644 --- a/crates/proto/src/gen/penumbra.view.v1alpha1.rs +++ b/crates/proto/src/gen/penumbra.view.v1alpha1.rs @@ -168,12 +168,12 @@ pub struct TransactionPlannerRequest { pub expiry_height: u64, /// The memo for the requested TransactionPlan. /// The memo must be unspecified unless `outputs` is nonempty. - #[prost(message, optional, tag = "4")] + #[prost(message, optional, tag = "3")] pub memo: ::core::option::Option< super::super::core::transaction::v1alpha1::MemoPlaintext, >, /// If present, only spends funds from the given account. - #[prost(message, optional, tag = "5")] + #[prost(message, optional, tag = "4")] pub source: ::core::option::Option, /// Request contents #[prost(message, repeated, tag = "20")] @@ -206,8 +206,9 @@ pub struct TransactionPlannerRequest { pub position_withdraws: ::prost::alloc::vec::Vec< transaction_planner_request::PositionWithdraw, >, - #[prost(oneof = "transaction_planner_request::FeeOption", tags = "2, 3")] - pub fee_option: ::core::option::Option, + /// Specifies either that the planner should compute fees automatically or that it should use a fixed fee amount. + #[prost(oneof = "transaction_planner_request::FeeMode", tags = "100, 101")] + pub fee_mode: ::core::option::Option, } /// Nested message and enum types in `TransactionPlannerRequest`. pub mod transaction_planner_request { @@ -397,15 +398,16 @@ pub mod transaction_planner_request { ) } } + /// Specifies either that the planner should compute fees automatically or that it should use a fixed fee amount. #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] - pub enum FeeOption { - /// The fee for the requested TransactionPlan, if any. - #[prost(message, tag = "2")] - Fee(super::super::super::core::component::fee::v1alpha1::Fee), - /// The fee tier for the requested TransactionPlan, if any. - #[prost(message, tag = "3")] - FeeTier(super::super::super::core::component::fee::v1alpha1::FeeTier), + pub enum FeeMode { + /// Automatically compute a fee based on gas use. + #[prost(message, tag = "100")] + AutoFee(super::super::super::core::component::fee::v1alpha1::FeeTier), + /// A manually set fee, rather than automatically computing a fee based on gas use. + #[prost(message, tag = "101")] + ManualFee(super::super::super::core::component::fee::v1alpha1::Fee), } } impl ::prost::Name for TransactionPlannerRequest { diff --git a/crates/proto/src/gen/penumbra.view.v1alpha1.serde.rs b/crates/proto/src/gen/penumbra.view.v1alpha1.serde.rs index 94dc4d22a9..8fafb9ac92 100644 --- a/crates/proto/src/gen/penumbra.view.v1alpha1.serde.rs +++ b/crates/proto/src/gen/penumbra.view.v1alpha1.serde.rs @@ -5438,7 +5438,7 @@ impl serde::Serialize for TransactionPlannerRequest { if !self.position_withdraws.is_empty() { len += 1; } - if self.fee_option.is_some() { + if self.fee_mode.is_some() { len += 1; } let mut struct_ser = serializer.serialize_struct("penumbra.view.v1alpha1.TransactionPlannerRequest", len)?; @@ -5482,13 +5482,13 @@ impl serde::Serialize for TransactionPlannerRequest { if !self.position_withdraws.is_empty() { struct_ser.serialize_field("positionWithdraws", &self.position_withdraws)?; } - if let Some(v) = self.fee_option.as_ref() { + if let Some(v) = self.fee_mode.as_ref() { match v { - transaction_planner_request::FeeOption::Fee(v) => { - struct_ser.serialize_field("fee", v)?; + transaction_planner_request::FeeMode::AutoFee(v) => { + struct_ser.serialize_field("autoFee", v)?; } - transaction_planner_request::FeeOption::FeeTier(v) => { - struct_ser.serialize_field("feeTier", v)?; + transaction_planner_request::FeeMode::ManualFee(v) => { + struct_ser.serialize_field("manualFee", v)?; } } } @@ -5522,9 +5522,10 @@ impl<'de> serde::Deserialize<'de> for TransactionPlannerRequest { "positionCloses", "position_withdraws", "positionWithdraws", - "fee", - "fee_tier", - "feeTier", + "auto_fee", + "autoFee", + "manual_fee", + "manualFee", ]; #[allow(clippy::enum_variant_names)] @@ -5542,8 +5543,8 @@ impl<'de> serde::Deserialize<'de> for TransactionPlannerRequest { PositionOpens, PositionCloses, PositionWithdraws, - Fee, - FeeTier, + AutoFee, + ManualFee, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -5579,8 +5580,8 @@ impl<'de> serde::Deserialize<'de> for TransactionPlannerRequest { "positionOpens" | "position_opens" => Ok(GeneratedField::PositionOpens), "positionCloses" | "position_closes" => Ok(GeneratedField::PositionCloses), "positionWithdraws" | "position_withdraws" => Ok(GeneratedField::PositionWithdraws), - "fee" => Ok(GeneratedField::Fee), - "feeTier" | "fee_tier" => Ok(GeneratedField::FeeTier), + "autoFee" | "auto_fee" => Ok(GeneratedField::AutoFee), + "manualFee" | "manual_fee" => Ok(GeneratedField::ManualFee), _ => Ok(GeneratedField::__SkipField__), } } @@ -5613,7 +5614,7 @@ impl<'de> serde::Deserialize<'de> for TransactionPlannerRequest { let mut position_opens__ = None; let mut position_closes__ = None; let mut position_withdraws__ = None; - let mut fee_option__ = None; + let mut fee_mode__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::ExpiryHeight => { @@ -5696,18 +5697,18 @@ impl<'de> serde::Deserialize<'de> for TransactionPlannerRequest { } position_withdraws__ = Some(map_.next_value()?); } - GeneratedField::Fee => { - if fee_option__.is_some() { - return Err(serde::de::Error::duplicate_field("fee")); + GeneratedField::AutoFee => { + if fee_mode__.is_some() { + return Err(serde::de::Error::duplicate_field("autoFee")); } - fee_option__ = map_.next_value::<::std::option::Option<_>>()?.map(transaction_planner_request::FeeOption::Fee) + fee_mode__ = map_.next_value::<::std::option::Option<_>>()?.map(transaction_planner_request::FeeMode::AutoFee) ; } - GeneratedField::FeeTier => { - if fee_option__.is_some() { - return Err(serde::de::Error::duplicate_field("feeTier")); + GeneratedField::ManualFee => { + if fee_mode__.is_some() { + return Err(serde::de::Error::duplicate_field("manualFee")); } - fee_option__ = map_.next_value::<::std::option::Option<_>>()?.map(transaction_planner_request::FeeOption::FeeTier) + fee_mode__ = map_.next_value::<::std::option::Option<_>>()?.map(transaction_planner_request::FeeMode::ManualFee) ; } GeneratedField::__SkipField__ => { @@ -5729,7 +5730,7 @@ impl<'de> serde::Deserialize<'de> for TransactionPlannerRequest { position_opens: position_opens__.unwrap_or_default(), position_closes: position_closes__.unwrap_or_default(), position_withdraws: position_withdraws__.unwrap_or_default(), - fee_option: fee_option__, + fee_mode: fee_mode__, }) } } diff --git a/crates/proto/src/gen/proto_descriptor.bin.no_lfs b/crates/proto/src/gen/proto_descriptor.bin.no_lfs index 07afe1b534cbf2e9e83bc16f30ddaab30fcc2e87..4f9a2795b81d5e6b52c58fb014577c29edc2d783 100644 GIT binary patch delta 23893 zcmaKU33yf2)%M-PIX5{8Avp=tWymFjIUytrf(i(t0x~$ZkJ=&;f?y#~1}QD=Rb&uQ z5Dst<87!bOd>9Id+oK? z-h1sS`~Tc{|3i&-Os)`zOT4h~9+n91uXr)@OeZhyJFQ}CYx|_+829Q+yiAX0wDm<% z>=G}-V;R0^6T4g`X6c_gu{c(u5}7aPr%r4e>!=bTgrDITb7kk;Z*n~@W4<#hwwAHP z@!XmL7f<5M3%d2Gt@*r9BOdpXL#`h&+^fmDtcz$gDC8#5$ZTC?@0FGRpc z-xPEhIh-Hm!S6qbz;|8p-L?DMb}37ty892z-70#ukCEZ?lBgNeSaqzhKzhl3xAN z!VJRw(!y|6(a&#Ygc*eUwP@*eSHj#E1A?7%d-fWT7UmEhkQU|;9^khy!W_Z_3X|To zN*G{ZP&n`UUIWv@0>T5ca!qyt;emNY7E%7T?Y-YCVOZ~~VC%eDy{<|NO9)?;7KW+B zRe4DxEFpYVo3>t0C5((if|2ukrG})19W=m@tc1z#KzK;=_7*{SNT<%K6&Xjyt9hyU zAi26ww>J<-uI^l7NaDU2%DbctOB^gi(=2hY49#k7zky|FQAdlw zGPI=BuwZN(#=DqL86X*!CdmNFu&hG+4J5;omLvlt!-!;rvIabM1lP{ScqUjzq**e- zG9t@5P9|7JG|^6qoM0Kzy2$&QDHhKcHwH)V{pQje)6yQKZ_Kiu<3akyL?@$>2k9G2 zyLi7=!WhnP;;jJtkSC2g0H*x`!~H1;uVkQ)i(GZ%TVv7N~FXn;PmY zP~X(NrPm()h5Pc?u|EbkEoz_obw(3qHctIzByX;A1Aup=;ROQkNW%*R-jSx?0D*TT z`VDnvPL4f_>)HT-WK^1jq28m6?eUFrCfn+^1_aBf4jl~(I#8u)LC!f?D$^|FXq9Oe zDzDPCAaa7F(zt;Fqj_gj9|4llX%YdF(aNn;4wR-IHM)5_n-wghJ9aXvKyHljYiOd7 zwmlG7#u&c_0?8QT*FYc{)42qcu!_J$IhOxM=mG@UZ>-nUYwo!+g^y(U+hxn5?Bw9; z(G#Xm9e-yP+Be6GlcZ{i+huly(H6Hiz-(r}gYEYGrV&QTw>NL0*hwCr$I0d(zv6fQ zo1CRkqjB}vX^iLBy7T|h^!SKk?@U`$PhWSY8%IxIccz;j7=_=N zZhA&dKf^YC>VG&EzJh&5J$7pP8THsn)fwrgM}Dx+NOyD$vNJjPH+3KyWM`)BLxb$h zEIsbv8)#-WYp>@JK(NfjtT9^|h+~wU6}_9AC~2x~%?H*<9A3sm|e0Tnnh(P+_Nzwa*#6vgUa6gj`y@u%ADiz%K zGd~|JIvd0mGnt>xfJUN(oG1Yji&>uU%`g(cOM?g23=Xo_biH9|{jBJ`aw%oCF zCJWMBB|)$pP5=wpP1&C74?Z>#g$ApN)w~|QbKN&0Ev|>zaXs& znkcL?S41)olHqGM7*gD3$atFW9%7n0#)K~k^2a8*i(>YD+H z2dTcFFk{V3U#^2l;t)&TPrkw;hoO&!{G8~XCm`VtKxfrLn+AtW9piS|Y!*O!k4dmips^jLlEv6hpMk@hxQ zo-a2eTiYRdVBB0kYaX(0))l2r$b5Gj<2%xwkUGyc7SBe^Pby*n_2uJGF_8!gA8MAe zEvN=s`e1zv2_Sx)HL{hXp;kT-RSsAuL=p@VPt=zH-dv{UpQKt(ow#hVd5WBg!ObnJ^6iV!@Eo zvQ(2Ame<7Q22~A9P@G6gLB(B>Qkeb;S}M%`fS}S$RKr~?&nksz4G>CUB}`O+&oJIB zaX(8A9-EvtGkAUDvc5>MYzW$rA*-QbqrvGJmRn$<5^vJftL2Ifn(SpYYd7^`efCBi zSPUUKZ6;bc?q$BUDJBxYR)yZ56b16`V}bu@s_(vt!BMGc1{%rsF`oh=Y86BxfGt~j zOSKkI`2eeV^HHDmJrHrY;5ZOzL1WtihM7%sAPxa6YU9n(cEPyzItvOn&+YqqL=gwY z>yc?`tb3j1*(OC40*EE$c};6z@b@(BSt@WDCsGfURhyNR5MW z?>)wgjf$A23EGyydI&Jfx(JPT@3E$~K3EX}qCPd5UM6v2wEKe9RBhcQ`+gCTcu?ny zsClt20?f4}SQr6fzAwTg>-g?hEOwR!zucZoeMOTjDd|uTsk6=q1SJ8rl7Qf^v(*Iz zf1T|ifZ(sQJ;WhTJ!7j21SUYsgoO;Cscu_*R=G`m0YPPssv*LS~Ru?K?YJKCkb zVc44>O^?)p#Rot>XN44GsMi~J3wFpv`nPw_bjW8 z`kKOLmAkm3%?+yW83Jdm6#DW7h9$42qP`4hsi-esU|95;uVA{su7z`L9bC@w8cJP+G*ZbjL#$Xt9X5>}<>;NQ8GO^CqZPhYm}E z7Q3qZEQttcL|Velc;c$9tR>ux1%Mz}!r@Eh@TIu#20XSZ*uSf5D&QHqYsSff%ek2s zfKUjaZZ<&BFSqo7&~G_6^8z5~ms1VN0pjFKE4Y~#fWQQ3naE%(xEah-_^fi9c>xeq zE4Y~#;xsRW9J_kt9zdW1v{d9vALH#%yDm~@kPX&Y8vvm=KwTUlG+$$F0Ept&SQ`MMxHZ-W z8Klcvj)e^=4g@AZ%S8QYEze4-uPJ<1xm&llxk0s-V{xOEf(_PltRXcO*#OW|kqy>! ztRl@K@`3c^&hoJ}4j$py=t48gJ=qXy*5z$k$up^?UXkkZ0?|^!@_^tt$=m7S0uY8c$va-G>`D$s7g z_niO4gEg-V@xSNsd~YD8L!?t9p69`LuUygQJUYIbic~VJdY)%D@UAlXQ1}l#770-PNPU`I+-ejI!8xBdGfr zKBABP%uTohh@yYyO?96DM7@9J?QPSM5C0rB9r^Ij)O4SC+O*)BSF`5TF|5x#kuHJa z;d#Og2p*jf0Ggo%5GBkLg{{4JVIe3B$`v(z4*r6tRzwsO53dlWA0rPaR*1BJQ9Qgt zr2Q)nC0B^Ff5nMWKuK*3d|WBGZ8>ah5wymjpn0V!Ck16FYF;UF_3#9Uf>w$Sos1pMbAr2L5QhCk+wR;)PS}i?0o^ID?~AM7*&X3>M#}6C=&&RQH?TDP#Dz+ z0rx7wtri{%0<;BD+`TF)h~n;5BG)!A#oen!dmS;N4N=Z2(MfwsV_+1tO7ytcJ4+LX z$FW1PE@=1GxtrHT1>jIZu8Ru5sRUrIUNJ!e1*{V-b({}~0@jISxv^Ll_}7WfU2%p; z^w`0=Rp1MoifzL zqhzb__1x(391v_3IKWdYMvr5cWJk@Gck99we0UIj21#g?!9z6ekGWg)VhXw#z zf5`*Y?ud%^Ty_f+uzEZXRJ#S%X|HN3-&#LuRN%{31iv^@ z9saff>k&*od|CejbO@wbjS4VEy&}x^u*VBP_lhvv!+@ZBMPPe)KEwVnb)JJFs5^Xb z>Yy+i#Gcw92GpA|fEa8K3TzN(kpz1E8-nNPF(4D;{Tm`nUwH5`X?m^?A*f(BCX_7S zJtSg*WQvA*(IJu1*!zcrYGtW#@0h6h;e*5cSI2B!kPQ8f+0Fq7sbeBn$E$#-%Q1m? zl{yC?I>#|#<}5&Tj$;CI*5_pVED8=zh@kvmU;OGsQ~<>WC!zua91@>EX z4JdHTq^R<_Qm3?IQ%CN-JDG$mxw;9Dnh^v)B| z|9~nlzUsURVN+dcq(bRB5kdR)VOQA{_PJN$hdFYxcTEX zSLkX{(2H!^L9;l;I`>L5H2^}Ldu6U(NdPKN+(jscw`HNy3xl1<+LbPp>B^EoeF&Wt zEHna(WcZWEng@lSI$ah;VifSyhY(Yc4qCD(#9tzV9ZQD{z;6Z8`eG9V-%N+XSMV&6 zrb7Wj-zCzVx6oX%Oa^7Ee{n;WgC<%gO{W5a7@+P{fGB>MM5m&@k?p%HWbA_J8#D#1 zkQoKuMv6JIDW+O2F$OK?LEjUPx38WwEjhDlT5|lv$rGw3R#i`{8k5AaUdza#RRQ2~cCbG?AdfIw3=akSYNZ>!~$qKb{hR|18a+jKYvWf<9tV2`UGI#1E7m zv#E^Dk~dGh#%pGs8p4KHlh7&|AJPzwxY_zAq?A~$-Z=t(PYZiR@ z5Klc7anSPkDQQANWCF)i5_cK2S!uoSl*Hzbfw1yZvZW61kr`HgN_HqWR>rRX(~|E^ zTbcBETE-iw^Mh=?>;DW~HW6$*)3yzM>0=M|1NsqIj32A6gv=NRpRKHh3*T8eVf>in zZ8N7;C8tiCQdK!IIew~_96P?ca>9g}$;p*droz*wPo9MAqeoXwor+5a$s0xt9MR#n zvWoKZ-d%f^mv`%UaWZ*Db>(dns*;MXGDR2KlK6K*r2|Ystg1=6-?W7L3v&qlT=`k0-VX$*iDY&BmXvSQ8MJea( zmcLPS9tq8s?`k1}?Tqr(@9qJN|znkJ71G|v63D}vvs$j`PSfT+mNwjzKK{Ml9n z5Ec2^R)iw;*$zz}!yC}#G21bd2N1*nb!7md*=)y59yz`{*NLq%no)Q@*TJsJC}@^L znk{g`!c11#cY$M^5UD6>fn#Q1K*%g`a`k>DAe36*;27ysaTYrQoWAk4L%%tdu?NEOyF>3`-Z3#+Th(_>yED~tEoF6O4(rR zPHVD9RNY53ByW4f)*T39fV%F0sQV+f?zz6Z*@-=C>P`!>%?`r&!?bypOLebtYTM+q zzq4DZBh*;c@CoJBSOWk;vc?(!5USNUW*H3#1JpQX84U;n)Hqm1lL2zc08eWJ;5SNn zIx2+>@U%4mzN)Oo0DvgvX=?ylQ|{IV$Rz{pwgv!#7@#%)APlhE8X(VipL1e|jR9!+ z_?(l`$oo4PAdd{N->F^Dn7z+#-EY-GGRoR-D-Q^%{kHOeP;0-fJRmB+-&P(FmETX5 z|BC!8kD{)F4u8uD_cmpx2Of0dO;kvP4^;Z=j%=Y~CWTQB67($xm4KSO?%?&YX-WPHPE+{C-cWCVWG34144uhg54xeG!WsVBbas7p9he*`Os z9R9YWw-tfWJV?;9A0V3NkYi3x08#uQr-cqL0bz$jj@jk}gdN^?T)p=J2s^y(0ctM* zM1lVxFIXfnANaoei4*(Asa@QHEno$oI5-=9jp9t74iAqz{Bx(ab1OEOrH(tEzITEz z)Iuj5S)^J>VJMCSeXgexpw9`XfxaQ75}?Hir=Vpd0`*TgIAEYam~tS)Nk_IxXCRv+ z!EmN12S`s+P3UM)i6|NDz@!sEdeXs8IxPZyQu7Ok>mv;y5CZB(1cY_JaI*4MkOBy< zFPs7$7XgCl3kR{Sx)$N9{noFXa7L1?O??%SkV;=UCP4O;Cw%3YT_r$}eC4#I`-`Lw zEMMnvy@>||bpWk8w8E~7n8+M;j;})~WCl~6gZ*7F;j$>fGmbgf0|FJGrJ|MT8ON-R z@D)^NoIJf(2B>6lu&0%R=vl`cH~VVM2xyro%sU$?MPc4qCuO$0kQ-EIBXcA3*ACZP zYOolX0WB2;bYDkGQ9$>#lV{t8_OHJtZ_rAiY0f$3%+BZV4}zAdJH>A2BCRNPJLmZN z&Cy0HT;JE{@u04Utd1Wvk17boC+<7`eB)=rRl9@NZx$>qWP= zPaig0q!dPJFJcX-oL42FS}(fhv|S~D<3%@Lk9#TsWxnWQ+#`Qi2^d>mbX#=xa=i?b z04ICVZQ03to11b$a=?`(i5GaX|AZNpGp8oU)%NYr`Y@#h^)h^pv>=Z@P+tog-44{( zg1q`beJyB&J5XN>MmP2jkQR?*8!eD<-jy8_%W=IL*NSL0ReOE_%XO6&)EDqM(t>)! zdDn~|R8#5?=iP$hbk(T~oOjV9X#AiYz!zNEDV>2j1rj1o>J}I3b5h5+ka7#!Mly;7 z7vL=^IDT+tMLGkzF(pK#)I)x#PfC5{2e+U!5&`EAZr5_!U*odCckhYQgQ3I`mZYQf zFk=WiQb60A_r&oS=Xda?0`ir4@$kYBHZ=u+GUvsOTLQu@=f$%csc{PslJnw?^;sz( zN}CtQSt+??0lDS;I1l66ErF4He%veYme5s7U@B^19PW`y4jzMDnDJO!PF1@wRcc!% zJasjzPN|Gg137ioRRXHMFmC)+C4hWk-1w_XfHDi?#$QzeJY`|r_^VEUV=RorQ$`ql zz;S>4Wtak>1U^Sfkh|U=H;$rmD1w4QWq*|bCGL;o@&?_Or393? zG#-u`#wHI}5R^;nQqUuxa%mis!-v+2NLU#UTMcKU<=C-PtHQa% z*~EU7mAr6eeRlG~mG#-l3s=U?g%>5F$eJbQcfXe5KaT%IZTD-XTPpUKd*Sm(WitHr zpXB?Qe=E~Z5|`;GiK+kVlf?9Mur}$}V8yY)>Wvs4w$M-gM67M}7>$1F#CEYVl@r&@ z>8DO?A1hLccvM3_bz+BD>lP}t*cbTi{i`LMoxG35mf<<$o3)qDlXu3$o%hR=wW}A) zSDnT)X3Xev$D}cpT_#Pry^Ma8P8&b5D*WSe*~e{LF%bWT&n=h3=zW?{dvfzxMxM8p zqDSSmi^A3`2O--XKOE*l`hE8&(TI6<{n4Pp^>wE?gSP(CD`GKi@ho zt^InXyfWYUb0ItaaBaV>@_bIiPySUHA24Ck=-&(;_{zTuW3_{J%ct1?O3nU@tYsOS zH??B-Zfq3`Uwclz9ii4w$X>Po{Ht7i6+a%KO@40$gw5bdaHFLVw)--Tl7X|(hFQan$v`M#) zt*UA|CdoQvRg{K@{>D2N-Y~vu%AnYFar$~?RTVON6DzByS58n_tHKvXiLwUBkf~FV zrS`5o=SP|4c^M$Pb>gHkRkaHnJ01y6>PQ0+OfN;3A!%rTiRJ2%7hl2j5^I{E$5T{&bnL$|6SM$<3eZx~ z@%`Uemc1uS;m_Y#BRy*C3#)%)I3Lwa$on!gmu;j9e*i5LUeDmG2}|&mr3hod)Agh9 z=ViL0si|ny6*UBHPXSsg+Me3a%v2&dZBOlIjdh?12&VlEhpL(hL-#9;Ut@})19?DV z!s9K;@!AA9tC#%@s#jR=Ar^w_6*g>yp~6-P?&1E@e551yde?I48Y`~l_OoBXbbwuU zt%YDZz;5`3VZxdEt0`tKiebA7RIf($!y7-q^o>|LRDYE<)r&f02Gy$!cSUslaA^LT zy}~K!MIS+HsVp$P#>@>TdW1aOCPDuyk2N~~fRL%w!pry(N)j?(! zkH`zEgRF(^8+1~Bkd=2+N9{5LBj}rqzsp2oQu6xARipLvTs7XDQB_XERGq3yPM%O% zU5!(#spBS1pD-pldeX$n)3N`IE{t1x==&2Zr;Q)2_Ma!w(H6wUPqUe)PpwK;VoUjV z*p`MsvU1|2>DANB<}x&Zes8jjT(6IEa-7W{V)CLyS+c+7O(|kqCa6GiTP5vsW54?L z%Be||VCi@R)E)%->{D{ufjq=I=%YeF)cz3b*3-LH6^3*CcbM#vxHj1zd+#)EVF!IG z4vkPmNpec1wnAzg_TB%pmRgzd)wfg4{(tJ^KphleU7ofb-(khJG3ZvnJFL9BdW|e8 zn0lY_kI)#2SH|-mOlb>po;suWKnE4WJ*g!geaCQ3(+Ikm0%)g?aSY z%KazfpV=oB^uA606EEAnVTxBhsW=ig8s&`Wb|g|rzo7(ozy9EPKu zq1`@aQU_HiPAT*;OO_agkO0AtSy@+O0!C5R(XeqPOmLL!ODh%GzeUMBq=uu+kZH{il%$m|Det$_k?rX(0cUO4KIczWZ;+zet;a3i>zm^1WRYqv5?7 zHOl8<#cj^hsn5v)wMOb4t^AyIxF|{h@#pN~OAN8_-BXNzl_sWm?G!VcAyTNvZKs*+ zVC40~HYDi%E0qBfr&&vD1d&o^K22t(bp~ZYjxU+)o#vnk6bX7YqcW%*ox4XlpyikB zqFzQzym-Sc`>)el(p*)?5a{a?)Vq~4M#~h6L;{LHiuFz;K;%s13`jr`XCf`t1b;Tt z5*QRnuv+Sg{wzytsi*q0k(PKea1M9dFQnC^dGH+b8ha;oE8z(MmUT?_4Dah8{y9>& z5fV`lQmu{kyMgnpW4SShemQWSb?;%!feZgXF#dD89NHuJf#Jnx2W4>F-}mKD;l3)T z({(>Z70|c*e`1|`8eVFM6f|Yt#l3{rS@Gg7H;y#Ieq)`| zZnJsXF#5*#Y@X)TcfMzH@OCwVAes}dAL~@~n#0o-)%UyS@N`A>4evP|742pO(b48{ z*(cE^y!scSSy*(t(TZr#C}QZFtR^VkE1mdwA{-jP@;n*f*X_2m`a082P7uaL4Z|1ut1Zdl3q%k1rQW%_`tm=h5RAZUU0evNK{ zfVb2eYTEt*U6}Mhi_m5zkJ00KA=Onvj_3GP9`1av;<44HJi36gisOic0tQ^y#;Zho zM;!>o0jdqH6n#bJ2YD+!(doP059&+l>K5@D9$RN3$gS9mv z=r&ke<2J`5JocDTlERcncm}=uHJ3RawJnGX6;KjTw;&+$K5AJ3!TP9WZQ!TeEj+f( z(9-#h$Sx7xbn^zd;Wd(yDdH2yfX;W#LZlR!M+ zgBK@mrmd&R;l?|hQKd-G>gsdD?Yv0)u|7B4PJVp75(d@Iu(W^wrSevK z#~%Tl+P>by3+`5w0RW8}^^z^v->jrfx=jh2RVHMq#KD#PGE*Y+LON@4Sz5*OWzc z`*5&sAw>3ZJi#0d)p3_`f4HvNsmk5Yaaz#@N!a9lmB$W+`IDT|hOctGL@Nb1_Gl4H zha)CAWu*tLI(i@XAkWm>)OsKHAjcj(86ckueuE4!w)Bliglh1Htvd2Roi}XN^C{AK zi>iKG*;|na5xr$AjXV%}iz>atYy!T|W1og^PIk68e4pb0ejp0R<{gEN_y5+pvh=XE zh2G#h%;S3Hs5kfybKKv!Qi-6Lk5*1`29zK=4?YG1Xbto*($8x0aoF${jsV?P+$rpWreoynRK?Rn1i;u#3EfSLyodC&76`uZjy zXwUOOgVn&?l&p1u^WjP(Acz9$i`IbZ>qUd#0D;*8 zQ8R^fDgkBB7U5_1NCnIf|1`rXP0bf(LtZ6= zcfRP>*YN5U%zV**fC|`}(E@sb;P(j~umL0g0+FFF{x&1lg+l7HSs<7TP#={7BJV=s z>rEO!XuMFg8Kk#Xnvtm&38}pn2(p0sDl4G++Cc9W0YY|>Xxhx{i^fm*?gJwBaM*8_ z)4L#nj1LG5%h-{ZGC>*z;ojdlOG^V`#zQ0`Qy}7cXA=-?fxylty{Jl%A}hi_&UCK2 zH2o9g6F?75GNSQ?2%avmQf?=)v%=-#a&yJ{XD6i146@>#eAS8WA28*m>LgyPTjB5sXAdt~bc!X|2s=Dxd8#2%s6=rd>|UFN0`r#UsmCc!UK1_J^wpx!6| z1mPx8tnWGkf^d`Q(bF3Q!WOtp5+?rSG!Ku=a>_<;7V2d*mo0HbC}RI*I#^3EY!&9& zU`r}(o8aZDG$51)s7E_M4np0+h=?Yqy2 z*t4df))0Qi)~GcVg!c-1m;ypUfO;tbh`hT+&&yPO0a4Iyarr`DJRabqyp^ zs&zm>i0mZ?q*1z!@4hHvFBwhRAm@w1Jos%xn&9<=4%UF62%zrofXKT~G}aCW2-bb% zaKu{d-|W6DVy_z7Vq|^UR1x zymzQPvS$b1{kw=AHmn_xGxc{%+kt4`7iIM;PN?X1PI!XL__+cgV;{+-6JCQiDB)8oJT}Pu~z|QI}z*0f|n$UlQ)bDzxi3@ zgga(Ct%e~@J0WsF;A47UMAU$w{+OPf5OrtYJtkr&40UJZJVqwG3e=s6`ZK{3iQeJT zdz^M*|9hNPrAW{V1AIpA&qStneL(PjMpNA&C5(^9!~5=Wh739$iIDM*i%fm@rn55M zae-@Eq)LhJelB9)7*$G;^K*fv+%T|}kSeFbR&$&YrKc<#5|QVW$kekVAQU)7vtx-8 z!N)Jd)pMLKrFhSxZBe3H?@Mb7K#1UpN@pX2>98(5MMmym*W)J=QTAC1PRQbbl!-!OwPMs5GR|ScX zIVa4n3Ls?83AL-jWvTCeCt~M~X-bjvJL^`ZWSZ{<*Kcru;OKzb%K(x0dtna20Kxjb zz~YSz-UYGf404^9^lR?vrMQ0tC^05;GM2z0-2i zVR7gza7s!SOLM4&L`s#VdXNHy$YO~>ivBufIfZTygd-O?x0XI2xwaS*A@YDUduV_V zc|c-0*H(!DEelUBaN3tHlg7Qvm9H+N=NjazfRu?!p}*o95gvtQwnHvy!AGYld2-b&55$X;VJcX}+mL@u?P|gRaH(CMJS2H94 zLiW#64GAO*2iPFZJPic11L`IMgy;rqJV1zUAmiy`fi_B-8&hcW3Qh;-z8qx=Ze-)f!&!?F z89y#fK!`+2m7Vm`8xSIoOYHZP8+G^H9WwT$(WN_b?vN&~>`rd9Q<^;mAk+}BgR(Oq z^6r!!^2&P(zO(N2-r|&*1V|$H$J(2TSnbF#tOVd_QqT3TTe!!XEX^%7uA|xWy9%&Xt PfS}tWd-Sw_GyJ~+MWV!Y delta 40731 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 penumbra.core.transaction.v1alpha1.Transaction 57, // 4: penumbra.view.v1alpha1.BroadcastTransactionResponse.broadcast_success:type_name -> penumbra.view.v1alpha1.BroadcastTransactionResponse.BroadcastSuccess 58, // 5: penumbra.view.v1alpha1.BroadcastTransactionResponse.confirmed:type_name -> penumbra.view.v1alpha1.BroadcastTransactionResponse.Confirmed - 71, // 6: penumbra.view.v1alpha1.TransactionPlannerRequest.fee:type_name -> penumbra.core.component.fee.v1alpha1.Fee - 72, // 7: penumbra.view.v1alpha1.TransactionPlannerRequest.fee_tier:type_name -> penumbra.core.component.fee.v1alpha1.FeeTier - 73, // 8: penumbra.view.v1alpha1.TransactionPlannerRequest.memo:type_name -> penumbra.core.transaction.v1alpha1.MemoPlaintext - 74, // 9: penumbra.view.v1alpha1.TransactionPlannerRequest.source:type_name -> penumbra.core.keys.v1alpha1.AddressIndex - 59, // 10: penumbra.view.v1alpha1.TransactionPlannerRequest.outputs:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.Output - 60, // 11: penumbra.view.v1alpha1.TransactionPlannerRequest.swaps:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.Swap - 61, // 12: penumbra.view.v1alpha1.TransactionPlannerRequest.swap_claims:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.SwapClaim - 62, // 13: penumbra.view.v1alpha1.TransactionPlannerRequest.delegations:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.Delegate - 63, // 14: penumbra.view.v1alpha1.TransactionPlannerRequest.undelegations:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.Undelegate - 75, // 15: penumbra.view.v1alpha1.TransactionPlannerRequest.ibc_relay_actions:type_name -> penumbra.core.component.ibc.v1alpha1.IbcRelay - 76, // 16: penumbra.view.v1alpha1.TransactionPlannerRequest.ics20_withdrawals:type_name -> penumbra.core.component.ibc.v1alpha1.Ics20Withdrawal - 64, // 17: penumbra.view.v1alpha1.TransactionPlannerRequest.position_opens:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.PositionOpen - 65, // 18: penumbra.view.v1alpha1.TransactionPlannerRequest.position_closes:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.PositionClose - 66, // 19: penumbra.view.v1alpha1.TransactionPlannerRequest.position_withdraws:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.PositionWithdraw + 71, // 6: penumbra.view.v1alpha1.TransactionPlannerRequest.memo:type_name -> penumbra.core.transaction.v1alpha1.MemoPlaintext + 72, // 7: penumbra.view.v1alpha1.TransactionPlannerRequest.source:type_name -> penumbra.core.keys.v1alpha1.AddressIndex + 59, // 8: penumbra.view.v1alpha1.TransactionPlannerRequest.outputs:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.Output + 60, // 9: penumbra.view.v1alpha1.TransactionPlannerRequest.swaps:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.Swap + 61, // 10: penumbra.view.v1alpha1.TransactionPlannerRequest.swap_claims:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.SwapClaim + 62, // 11: penumbra.view.v1alpha1.TransactionPlannerRequest.delegations:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.Delegate + 63, // 12: penumbra.view.v1alpha1.TransactionPlannerRequest.undelegations:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.Undelegate + 73, // 13: penumbra.view.v1alpha1.TransactionPlannerRequest.ibc_relay_actions:type_name -> penumbra.core.component.ibc.v1alpha1.IbcRelay + 74, // 14: penumbra.view.v1alpha1.TransactionPlannerRequest.ics20_withdrawals:type_name -> penumbra.core.component.ibc.v1alpha1.Ics20Withdrawal + 64, // 15: penumbra.view.v1alpha1.TransactionPlannerRequest.position_opens:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.PositionOpen + 65, // 16: penumbra.view.v1alpha1.TransactionPlannerRequest.position_closes:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.PositionClose + 66, // 17: penumbra.view.v1alpha1.TransactionPlannerRequest.position_withdraws:type_name -> penumbra.view.v1alpha1.TransactionPlannerRequest.PositionWithdraw + 75, // 18: penumbra.view.v1alpha1.TransactionPlannerRequest.auto_fee:type_name -> penumbra.core.component.fee.v1alpha1.FeeTier + 76, // 19: penumbra.view.v1alpha1.TransactionPlannerRequest.manual_fee:type_name -> penumbra.core.component.fee.v1alpha1.Fee 69, // 20: penumbra.view.v1alpha1.TransactionPlannerResponse.plan:type_name -> penumbra.core.transaction.v1alpha1.TransactionPlan - 74, // 21: penumbra.view.v1alpha1.AddressByIndexRequest.address_index:type_name -> penumbra.core.keys.v1alpha1.AddressIndex + 72, // 21: penumbra.view.v1alpha1.AddressByIndexRequest.address_index:type_name -> penumbra.core.keys.v1alpha1.AddressIndex 77, // 22: penumbra.view.v1alpha1.AddressByIndexResponse.address:type_name -> penumbra.core.keys.v1alpha1.Address 78, // 23: penumbra.view.v1alpha1.WalletIdResponse.wallet_id:type_name -> penumbra.core.keys.v1alpha1.WalletId 77, // 24: penumbra.view.v1alpha1.IndexByAddressRequest.address:type_name -> penumbra.core.keys.v1alpha1.Address - 74, // 25: penumbra.view.v1alpha1.IndexByAddressResponse.address_index:type_name -> penumbra.core.keys.v1alpha1.AddressIndex - 74, // 26: penumbra.view.v1alpha1.EphemeralAddressRequest.address_index:type_name -> penumbra.core.keys.v1alpha1.AddressIndex + 72, // 25: penumbra.view.v1alpha1.IndexByAddressResponse.address_index:type_name -> penumbra.core.keys.v1alpha1.AddressIndex + 72, // 26: penumbra.view.v1alpha1.EphemeralAddressRequest.address_index:type_name -> penumbra.core.keys.v1alpha1.AddressIndex 77, // 27: penumbra.view.v1alpha1.EphemeralAddressResponse.address:type_name -> penumbra.core.keys.v1alpha1.Address - 74, // 28: penumbra.view.v1alpha1.BalancesRequest.account_filter:type_name -> penumbra.core.keys.v1alpha1.AddressIndex + 72, // 28: penumbra.view.v1alpha1.BalancesRequest.account_filter:type_name -> penumbra.core.keys.v1alpha1.AddressIndex 79, // 29: penumbra.view.v1alpha1.BalancesRequest.asset_id_filter:type_name -> penumbra.core.asset.v1alpha1.AssetId - 74, // 30: penumbra.view.v1alpha1.BalancesResponse.account:type_name -> penumbra.core.keys.v1alpha1.AddressIndex + 72, // 30: penumbra.view.v1alpha1.BalancesResponse.account:type_name -> penumbra.core.keys.v1alpha1.AddressIndex 80, // 31: penumbra.view.v1alpha1.BalancesResponse.balance:type_name -> penumbra.core.asset.v1alpha1.Value 79, // 32: penumbra.view.v1alpha1.NotesRequest.asset_id:type_name -> penumbra.core.asset.v1alpha1.AssetId - 74, // 33: penumbra.view.v1alpha1.NotesRequest.address_index:type_name -> penumbra.core.keys.v1alpha1.AddressIndex + 72, // 33: penumbra.view.v1alpha1.NotesRequest.address_index:type_name -> penumbra.core.keys.v1alpha1.AddressIndex 81, // 34: penumbra.view.v1alpha1.NotesRequest.amount_to_spend:type_name -> penumbra.core.num.v1alpha1.Amount - 74, // 35: penumbra.view.v1alpha1.NotesForVotingRequest.address_index:type_name -> penumbra.core.keys.v1alpha1.AddressIndex + 72, // 35: penumbra.view.v1alpha1.NotesForVotingRequest.address_index:type_name -> penumbra.core.keys.v1alpha1.AddressIndex 69, // 36: penumbra.view.v1alpha1.WitnessRequest.transaction_plan:type_name -> penumbra.core.transaction.v1alpha1.TransactionPlan 82, // 37: penumbra.view.v1alpha1.WitnessResponse.witness_data:type_name -> penumbra.core.transaction.v1alpha1.WitnessData 69, // 38: penumbra.view.v1alpha1.WitnessAndBuildRequest.transaction_plan:type_name -> penumbra.core.transaction.v1alpha1.TransactionPlan @@ -5080,7 +5083,7 @@ var file_penumbra_view_v1alpha1_view_proto_depIdxs = []int32{ 94, // 62: penumbra.view.v1alpha1.NotesForVotingResponse.identity_key:type_name -> penumbra.core.keys.v1alpha1.IdentityKey 89, // 63: penumbra.view.v1alpha1.SpendableNoteRecord.note_commitment:type_name -> penumbra.crypto.tct.v1alpha1.StateCommitment 95, // 64: penumbra.view.v1alpha1.SpendableNoteRecord.note:type_name -> penumbra.core.component.shielded_pool.v1alpha1.Note - 74, // 65: penumbra.view.v1alpha1.SpendableNoteRecord.address_index:type_name -> penumbra.core.keys.v1alpha1.AddressIndex + 72, // 65: penumbra.view.v1alpha1.SpendableNoteRecord.address_index:type_name -> penumbra.core.keys.v1alpha1.AddressIndex 90, // 66: penumbra.view.v1alpha1.SpendableNoteRecord.nullifier:type_name -> penumbra.core.component.sct.v1alpha1.Nullifier 96, // 67: penumbra.view.v1alpha1.SpendableNoteRecord.source:type_name -> penumbra.core.component.sct.v1alpha1.CommitmentSource 97, // 68: penumbra.view.v1alpha1.SpendableNoteRecord.return_address:type_name -> penumbra.core.keys.v1alpha1.AddressView @@ -5101,7 +5104,7 @@ var file_penumbra_view_v1alpha1_view_proto_depIdxs = []int32{ 77, // 83: penumbra.view.v1alpha1.TransactionPlannerRequest.Output.address:type_name -> penumbra.core.keys.v1alpha1.Address 80, // 84: penumbra.view.v1alpha1.TransactionPlannerRequest.Swap.value:type_name -> penumbra.core.asset.v1alpha1.Value 79, // 85: penumbra.view.v1alpha1.TransactionPlannerRequest.Swap.target_asset:type_name -> penumbra.core.asset.v1alpha1.AssetId - 71, // 86: penumbra.view.v1alpha1.TransactionPlannerRequest.Swap.fee:type_name -> penumbra.core.component.fee.v1alpha1.Fee + 76, // 86: penumbra.view.v1alpha1.TransactionPlannerRequest.Swap.fee:type_name -> penumbra.core.component.fee.v1alpha1.Fee 77, // 87: penumbra.view.v1alpha1.TransactionPlannerRequest.Swap.claim_address:type_name -> penumbra.core.keys.v1alpha1.Address 89, // 88: penumbra.view.v1alpha1.TransactionPlannerRequest.SwapClaim.swap_commitment:type_name -> penumbra.crypto.tct.v1alpha1.StateCommitment 81, // 89: penumbra.view.v1alpha1.TransactionPlannerRequest.Delegate.amount:type_name -> penumbra.core.num.v1alpha1.Amount @@ -6017,8 +6020,8 @@ func file_penumbra_view_v1alpha1_view_proto_init() { (*BroadcastTransactionResponse_Confirmed_)(nil), } file_penumbra_view_v1alpha1_view_proto_msgTypes[4].OneofWrappers = []interface{}{ - (*TransactionPlannerRequest_Fee)(nil), - (*TransactionPlannerRequest_FeeTier)(nil), + (*TransactionPlannerRequest_AutoFee)(nil), + (*TransactionPlannerRequest_ManualFee)(nil), } file_penumbra_view_v1alpha1_view_proto_msgTypes[25].OneofWrappers = []interface{}{ (*WitnessAndBuildResponse_BuildProgress_)(nil), diff --git a/proto/penumbra/penumbra/view/v1alpha1/view.proto b/proto/penumbra/penumbra/view/v1alpha1/view.proto index f97d8aae2a..b708480cc4 100644 --- a/proto/penumbra/penumbra/view/v1alpha1/view.proto +++ b/proto/penumbra/penumbra/view/v1alpha1/view.proto @@ -186,18 +186,11 @@ message TransactionPlannerRequest { // The expiry height for the requested TransactionPlan uint64 expiry_height = 1; - oneof fee_option { - // The fee for the requested TransactionPlan, if any. - core.component.fee.v1alpha1.Fee fee = 2; - // The fee tier for the requested TransactionPlan, if any. - core.component.fee.v1alpha1.FeeTier fee_tier = 3; - }; - // The memo for the requested TransactionPlan. // The memo must be unspecified unless `outputs` is nonempty. - core.transaction.v1alpha1.MemoPlaintext memo = 4; + core.transaction.v1alpha1.MemoPlaintext memo = 3; // If present, only spends funds from the given account. - core.keys.v1alpha1.AddressIndex source = 5; + core.keys.v1alpha1.AddressIndex source = 4; // Request contents repeated Output outputs = 20; @@ -211,6 +204,14 @@ message TransactionPlannerRequest { repeated PositionClose position_closes = 71; repeated PositionWithdraw position_withdraws = 72; + // Specifies either that the planner should compute fees automatically or that it should use a fixed fee amount. + oneof fee_mode { + // Automatically compute a fee based on gas use. + core.component.fee.v1alpha1.FeeTier auto_fee = 100; + // A manually set fee, rather than automatically computing a fee based on gas use. + core.component.fee.v1alpha1.Fee manual_fee = 101; + }; + // Request message subtypes message Output { // The amount and denomination in which the Output is issued.