Use u32/u64 as underlying type for unsigneds

Author: akoptelov

mina-p2p-messages/Cargo.toml

@@ -9,8 +9,8 @@ edition = "2021"
 serde = { version = "1.0.142", features = ["derive"] }
 serde_json = { version = "1.0.83" }
 hex = "0.4.3"
-binprot = { git = "https://github.com/openmina/binprot-rs", rev = "dfbd3bbda8b2681d86ac73065523c658ee31d45d" }
-binprot_derive = { git = "https://github.com/openmina/binprot-rs", rev = "dfbd3bbda8b2681d86ac73065523c658ee31d45d" }
+binprot = { git = "https://github.com/openmina/binprot-rs", rev = "3f29b25" }
+binprot_derive = { git = "https://github.com/openmina/binprot-rs", rev = "3f29b25" }
 thiserror = "1.0.32"
 derive_more = "0.99.17"
 bs58 = { version = "0.4", features = ["check"] }

mina-p2p-messages/src/hash_input.rs

@@ -9,7 +9,7 @@ use o1_utils::FieldHelpers;
 use crate::{
     b58::Base58CheckOfBinProt,
     bigint::BigInt,
-    number::{Int32, Int64},
+    number::{Int32, Int64, UInt32, UInt64},
     pseq::PaddedSeq,
 };
 
@@ -41,6 +41,18 @@ impl ToInput for Int64 {
     }
 }
 
+impl ToInput for UInt32 {
+    fn to_input(&self, inputs: &mut Inputs) {
+        inputs.append_u32(self.as_u32())
+    }
+}
+
+impl ToInput for UInt64 {
+    fn to_input(&self, inputs: &mut Inputs) {
+        inputs.append_u64(self.as_u64())
+    }
+}
+
 impl<T, D> ToInput for Vec<D>
 where
     D: Deref<Target = T>,

mina-p2p-messages/src/number.rs

@@ -16,7 +16,9 @@ impl<T: std::fmt::Debug> std::fmt::Debug for Number<T> {
 }
 
 pub type Int32 = Number<i32>;
+pub type UInt32 = Number<u32>;
 pub type Int64 = Number<i64>;
+pub type UInt64 = Number<u64>;
 pub type Float64 = Number<f64>;
 
 impl Int32 {
@@ -31,6 +33,18 @@ impl Int64 {
     }
 }
 
+impl UInt32 {
+    pub fn as_u32(&self) -> u32 {
+        self.0
+    }
+}
+
+impl UInt64 {
+    pub fn as_u64(&self) -> u64 {
+        self.0
+    }
+}
+
 impl From<u32> for Number<i32> {
     fn from(value: u32) -> Self {
         Self(value as i32)

mina-p2p-messages/src/v2/generated.rs

@@ -792,7 +792,7 @@ pub struct NonZeroCurvePointUncompressedStableV1 {
 /// Gid: `125`
 /// Location: [src/int64.ml:6:6](https://github.com/MinaProtocol/mina/blob/14047c5551/src/int64.ml#L6)
 #[derive(Clone, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite, Deref)]
-pub struct UnsignedExtendedUInt64Int64ForVersionTagsStableV1(pub crate::number::Int64);
+pub struct UnsignedExtendedUInt64Int64ForVersionTagsStableV1(pub crate::number::UInt64);
 
 /// **OCaml name**: `Unsigned_extended.UInt32.Stable.V1`
 ///
@@ -803,7 +803,7 @@ pub struct UnsignedExtendedUInt64Int64ForVersionTagsStableV1(pub crate::number::
 /// Gid: `119`
 /// Location: [src/int32.ml:6:6](https://github.com/MinaProtocol/mina/blob/14047c5551/src/int32.ml#L6)
 #[derive(Clone, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite, Deref, Default)]
-pub struct UnsignedExtendedUInt32StableV1(pub crate::number::Int32);
+pub struct UnsignedExtendedUInt32StableV1(pub crate::number::UInt32);
 
 /// **OCaml name**: `Mina_numbers__Nat.Make32.Stable.V1`
 ///

mina-p2p-messages/src/v2/hashing.rs

@@ -204,19 +204,19 @@ mod tests {
         amount: u64,
         fee: u64,
         nonce: u32,
-        valid_until: i32,
+        valid_until: u32,
     ) -> String {
         use crate::number::Number;
         use crate::string::CharString;
 
         let from = pub_key(from);
         let to = pub_key(to);
 
-        let v = Number(fee as i64);
+        let v = Number(fee);
         let v = generated::UnsignedExtendedUInt64Int64ForVersionTagsStableV1(v);
         let fee = generated::CurrencyFeeStableV1(v);
 
-        let nonce = generated::UnsignedExtendedUInt32StableV1(Number(nonce as i32));
+        let nonce = generated::UnsignedExtendedUInt32StableV1(Number(nonce));
 
         let valid_until = generated::UnsignedExtendedUInt32StableV1(Number(valid_until));
 
@@ -236,7 +236,7 @@ mod tests {
             memo,
         };
 
-        let v = Number(amount as i64);
+        let v = Number(amount);
         let v = generated::UnsignedExtendedUInt64Int64ForVersionTagsStableV1(v);
         let amount = generated::CurrencyAmountStableV1(v);
 
@@ -287,7 +287,7 @@ mod tests {
                 1089541195,
                 89541195,
                 26100,
-                -1
+                u32::MAX,
             ),
             expected_hash
         )