fix(proto): align crypto.Proof serialization with go tendermint

eigerco · Aug 30, 2024 · 76608a3 · 76608a3
1 parent 5d5e424
commit 76608a3
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 14 deletions.
diff --git a/proto/src/prost/v0_34/tendermint.crypto.rs b/proto/src/prost/v0_34/tendermint.crypto.rs
@@ -3,10 +3,8 @@
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Proof {
     #[prost(int64, tag = "1")]
-    #[serde(with = "crate::serializers::from_str")]
     pub total: i64,
     #[prost(int64, tag = "2")]
-    #[serde(with = "crate::serializers::from_str")]
     pub index: i64,
     #[prost(bytes = "vec", tag = "3")]
     #[serde(with = "crate::serializers::bytes::base64string")]

diff --git a/proto/src/prost/v0_37/tendermint.crypto.rs b/proto/src/prost/v0_37/tendermint.crypto.rs
@@ -3,10 +3,8 @@
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Proof {
     #[prost(int64, tag = "1")]
-    #[serde(with = "crate::serializers::from_str")]
     pub total: i64,
     #[prost(int64, tag = "2")]
-    #[serde(with = "crate::serializers::from_str")]
     pub index: i64,
     #[prost(bytes = "vec", tag = "3")]
     #[serde(with = "crate::serializers::bytes::base64string")]

diff --git a/proto/src/tendermint/v0_34.rs b/proto/src/tendermint/v0_34.rs
@@ -62,5 +62,5 @@ pub mod version {
 
 pub mod meta {
     pub const REPOSITORY: &str = "https://github.com/celestiaorg/celestia-core";
-    pub const COMMITISH: &str = "v0.34.x-celestia";
+    pub const COMMITISH: &str = "a1b07a1e6c77595466da9c61b37c83b4769b47e7";
 }
diff --git a/tendermint/src/lib.rs b/tendermint/src/lib.rs
@@ -6,13 +6,7 @@
 
 #![no_std]
 #![cfg_attr(docsrs, feature(doc_cfg))]
-#![deny(
-    warnings,
-    trivial_casts,
-    trivial_numeric_casts,
-    unused_import_braces,
-    unused_qualifications
-)]
+#![deny(warnings, trivial_casts, trivial_numeric_casts, unused_import_braces)]
 #![forbid(unsafe_code)]
 #![doc(
     html_logo_url = "https://raw.githubusercontent.com/informalsystems/tendermint-rs/master/img/logo-tendermint-rs_3961x4001.png"

diff --git a/tools/proto-compiler/src/constants.rs b/tools/proto-compiler/src/constants.rs
@@ -219,8 +219,6 @@ pub static CUSTOM_FIELD_ATTRIBUTES: &[(&str, &str)] = &[
     ),
     (".tendermint.types.TxProof.data", BASE64STRING),
     (".tendermint.types.TxProof.root_hash", HEXSTRING),
-    (".tendermint.crypto.Proof.index", QUOTED),
-    (".tendermint.crypto.Proof.total", QUOTED),
     (".tendermint.crypto.Proof.aunts", VEC_BASE64STRING),
     (".tendermint.crypto.Proof.leaf_hash", BASE64STRING),
 ];