feat: changes required for openmina

Author: binier

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

@@ -676,7 +676,7 @@ pub struct PicklesProofProofsVerifiedMaxStableV2 {
 /// Gid: `544`
 /// Location: [src/lib/non_zero_curve_point/compressed_poly.ml:13:6](https://github.com/MinaProtocol/mina/blob/bfd1009/src/lib/non_zero_curve_point/compressed_poly.ml#L13)
 /// Args: crate :: bigint :: BigInt , bool
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, BinProtRead, BinProtWrite)]
 pub struct NonZeroCurvePointUncompressedStableV1 {
     pub x: crate::bigint::BigInt,
     pub is_odd: bool,
@@ -788,7 +788,7 @@ pub struct CurrencyBalanceStableV1(pub CurrencyAmountStableV1);
 ///
 /// Gid: `637`
 /// Location: [src/lib/data_hash_lib/state_hash.ml:44:4](https://github.com/MinaProtocol/mina/blob/bfd1009/src/lib/data_hash_lib/state_hash.ml#L44)
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite, Deref)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, BinProtRead, BinProtWrite, Deref)]
 pub struct DataHashLibStateHashStableV1(pub crate::bigint::BigInt);
 
 /// Derived name: `Mina_base__Sparse_ledger_base.Stable.V2.tree`
@@ -914,7 +914,7 @@ pub struct MinaBasePaymentPayloadStableV2 {
 ///
 /// Gid: `689`
 /// Location: [src/lib/mina_base/ledger_hash0.ml:17:4](https://github.com/MinaProtocol/mina/blob/bfd1009/src/lib/mina_base/ledger_hash0.ml#L17)
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize, BinProtRead, BinProtWrite, Deref)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, BinProtRead, BinProtWrite, Deref)]
 pub struct MinaBaseLedgerHash0StableV1(pub crate::bigint::BigInt);
 
 /// **OCaml name**: `Mina_base__Permissions.Auth_required.Stable.V2`

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

@@ -27,18 +27,19 @@ use super::{
     ConsensusProofOfStakeDataConsensusStateValueStableV2,
     ConsensusProofOfStakeDataEpochDataNextValueVersionedValueStableV1,
     ConsensusProofOfStakeDataEpochDataStakingValueVersionedValueStableV1,
-    ConsensusVrfOutputTruncatedStableV1, MinaBaseAccountBinableArgStableV2,
-    MinaBaseEpochLedgerValueStableV1, MinaBaseFeeExcessStableV1,
+    ConsensusVrfOutputTruncatedStableV1, DataHashLibStateHashStableV1,
+    MinaBaseAccountBinableArgStableV2, MinaBaseEpochLedgerValueStableV1, MinaBaseFeeExcessStableV1,
     MinaBasePendingCoinbaseStackVersionedStableV1, MinaBasePendingCoinbaseStateStackStableV1,
     MinaBaseProtocolConstantsCheckedValueStableV1, MinaBaseStagedLedgerHashNonSnarkStableV1,
-    MinaBaseStagedLedgerHashStableV1, MinaBaseVerificationKeyWireStableV1,
-    MinaNumbersGlobalSlotSinceGenesisMStableV1, MinaNumbersGlobalSlotSinceHardForkMStableV1,
-    MinaNumbersGlobalSlotSpanStableV1, MinaStateBlockchainStateValueStableV2LedgerProofStatement,
+    MinaBaseStagedLedgerHashStableV1, MinaBaseStateBodyHashStableV1,
+    MinaBaseVerificationKeyWireStableV1, MinaNumbersGlobalSlotSinceGenesisMStableV1,
+    MinaNumbersGlobalSlotSinceHardForkMStableV1, MinaNumbersGlobalSlotSpanStableV1,
+    MinaStateBlockchainStateValueStableV2LedgerProofStatement,
     MinaStateBlockchainStateValueStableV2LedgerProofStatementSource,
     MinaStateBlockchainStateValueStableV2SignedAmount, MinaStateProtocolStateBodyValueStableV2,
     MinaStateProtocolStateValueStableV2,
     MinaTransactionLogicZkappCommandLogicLocalStateValueStableV1,
-    NonZeroCurvePointUncompressedStableV1, SgnStableV1, SignedAmount, TokenFeeExcess,
+    NonZeroCurvePointUncompressedStableV1, SgnStableV1, SignedAmount, StateHash, TokenFeeExcess,
 };
 
 impl generated::MinaBaseStagedLedgerHashNonSnarkStableV1 {
@@ -277,6 +278,54 @@ mod tests {
     }
 }
 
+fn fp_state_hash_from_fp_hashes(previous_state_hash: Fp, body_hash: Fp) -> Fp {
+    let mut inputs = Inputs::new();
+    inputs.append_field(previous_state_hash);
+    inputs.append_field(body_hash);
+    hash_with_kimchi("MinaProtoState", &inputs.to_fields())
+}
+
+impl StateHash {
+    fn from_fp(fp: Fp) -> Self {
+        DataHashLibStateHashStableV1(fp.into()).into()
+    }
+
+    pub fn from_hashes(
+        pred_state_hash: &StateHash,
+        body_hash: &MinaBaseStateBodyHashStableV1,
+    ) -> Self {
+        Self::from_fp(fp_state_hash_from_fp_hashes(
+            pred_state_hash.to_field(),
+            body_hash.to_field(),
+        ))
+    }
+}
+
+impl generated::MinaStateProtocolStateBodyValueStableV2 {
+    pub fn hash(&self) -> MinaBaseStateBodyHashStableV1 {
+        let fp = MinaHash::hash(self);
+        MinaBaseStateBodyHashStableV1(fp.into())
+    }
+}
+
+impl generated::MinaStateProtocolStateValueStableV2 {
+    pub fn hash(&self) -> StateHash {
+        StateHash::from_fp(MinaHash::hash(self))
+    }
+}
+
+impl generated::MinaBlockHeaderStableV2 {
+    pub fn hash(&self) -> StateHash {
+        self.protocol_state.hash()
+    }
+}
+
+impl generated::MinaBlockBlockStableV2 {
+    pub fn hash(&self) -> StateHash {
+        self.header.protocol_state.hash()
+    }
+}
+
 impl MinaHash for MinaStateProtocolStateBodyValueStableV2 {
     fn hash(&self) -> mina_hasher::Fp {
         let mut inputs = Inputs::new();
@@ -287,10 +336,7 @@ impl MinaHash for MinaStateProtocolStateBodyValueStableV2 {
 
 impl MinaHash for MinaStateProtocolStateValueStableV2 {
     fn hash(&self) -> mina_hasher::Fp {
-        let mut inputs = Inputs::new();
-        inputs.append_field(self.previous_state_hash.to_field());
-        inputs.append_field(self.body.hash());
-        hash_with_kimchi("MinaProtoState", &inputs.to_fields())
+        fp_state_hash_from_fp_hashes(self.previous_state_hash.to_field(), MinaHash::hash(&self.body))
     }
 }