feat: update pczt

Author: soralit

rust/pczt/build.rs

@@ -1,4 +1,4 @@
 fn main() -> Result<(), std::io::Error> {
-    prost_build::Config::new().out_dir("src/pb").compile_protos(&["src/protos/pczt.proto"], &["src/"])?;
+    prost_build::Config::new().out_dir("src/protos").compile_protos(&["src/protos/pczt.proto"], &["src/"])?;
     Ok(())
 }

rust/pczt/src/lib.rs

@@ -1,5 +1,3 @@
 #![no_std]
 
-pub mod protos {
-    include!("pb/pczt.rs");
-}
+pub mod protos;

rust/pczt/src/protos/mod.rs

@@ -0,0 +1,2 @@
+pub mod pczt;
+pub use pczt::*;

rust/pczt/src/protos/pczt.proto

@@ -80,16 +80,17 @@ message PcztOrchardAction {
     bytes nf = 1;
     bytes rk = 2;
     bytes cmx = 3;
-    //(epk, enc_ciphertext, out_ciphertext)
-    bytes encryptedNote = 4;
-    bytes cv_net = 5;
+    bytes epk = 4;
+    bytes encCipherText = 5;
+    bytes outCipherText = 6;
+    bytes cv_net = 7;
 
-    bytes alpha = 6;
+    bytes alpha = 8;
 
     //the serilized spend note(rho, rseed, value, receipent) of this action, to verify the nf and cmx in this action.
-    bytes spend_note = 7;
-    PcztDerivationPath path = 8;
-    repeated bytes signatures = 9;
+    bytes spend_note = 9;
+    PcztDerivationPath path = 10;
+    repeated bytes signatures = 11;
 }
 
 message PcztSapling {
@@ -115,9 +116,10 @@ message PcztSaplingSpend {
 message PcztSaplingOutput {
     bytes cv = 1;
     bytes cmu = 2;
-    //(epk, enc_ciphertext, out_ciphertext)
-    bytes encryptedNote = 3;
+    bytes epk = 3;
+    bytes encCipherText = 4;
+    bytes outCipherText = 5;
 
     // if an output has path, it is a change output
-    optional PcztDerivationPath path = 4;
+    optional PcztDerivationPath path = 6;
 }

rust/pczt/src/pb/pczt.rs rust/pczt/src/protos/pczt.rs

@@ -109,19 +109,22 @@ pub struct PcztOrchardAction {
     pub rk: ::prost::alloc::vec::Vec<u8>,
     #[prost(bytes = "vec", tag = "3")]
     pub cmx: ::prost::alloc::vec::Vec<u8>,
-    /// (epk, enc_ciphertext, out_ciphertext)
     #[prost(bytes = "vec", tag = "4")]
-    pub encrypted_note: ::prost::alloc::vec::Vec<u8>,
+    pub epk: ::prost::alloc::vec::Vec<u8>,
     #[prost(bytes = "vec", tag = "5")]
-    pub cv_net: ::prost::alloc::vec::Vec<u8>,
+    pub enc_cipher_text: ::prost::alloc::vec::Vec<u8>,
     #[prost(bytes = "vec", tag = "6")]
+    pub out_cipher_text: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes = "vec", tag = "7")]
+    pub cv_net: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes = "vec", tag = "8")]
     pub alpha: ::prost::alloc::vec::Vec<u8>,
     /// the serilized spend note(rho, rseed, value, receipent) of this action, to verify the nf and cmx in this action.
-    #[prost(bytes = "vec", tag = "7")]
+    #[prost(bytes = "vec", tag = "9")]
     pub spend_note: ::prost::alloc::vec::Vec<u8>,
-    #[prost(message, optional, tag = "8")]
+    #[prost(message, optional, tag = "10")]
     pub path: ::core::option::Option<PcztDerivationPath>,
-    #[prost(bytes = "vec", repeated, tag = "9")]
+    #[prost(bytes = "vec", repeated, tag = "11")]
     pub signatures: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
@@ -158,10 +161,13 @@ pub struct PcztSaplingOutput {
     pub cv: ::prost::alloc::vec::Vec<u8>,
     #[prost(bytes = "vec", tag = "2")]
     pub cmu: ::prost::alloc::vec::Vec<u8>,
-    /// (epk, enc_ciphertext, out_ciphertext)
     #[prost(bytes = "vec", tag = "3")]
-    pub encrypted_note: ::prost::alloc::vec::Vec<u8>,
+    pub epk: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes = "vec", tag = "4")]
+    pub enc_cipher_text: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes = "vec", tag = "5")]
+    pub out_cipher_text: ::prost::alloc::vec::Vec<u8>,
     /// if an output has path, it is a change output
-    #[prost(message, optional, tag = "4")]
+    #[prost(message, optional, tag = "6")]
     pub path: ::core::option::Option<PcztDerivationPath>,
 }