Merge pull request #1646 from o1-labs/dw/ledger-rm-ocaml

Remove OCaml related code from mina-tree

Author: dannywillems

CHANGELOG.md

@@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **Dependency**: use tag instead of references of o1-labs/proof-systems, fix
   [[#1674](https://github.com/o1-labs/mina-rust/issues/1674)]
   ([#1673](https://github.com/o1-labs/mina-rust/pull/1673))
+- Remove ocaml-interop dependency, fix
+  [#1235](https://github.com/o1-labs/mina-rust/issues/1235)
+  ([#1646](https://github.com/o1-labs/mina-rust/pull/1646))
 
 ### Removed
 

Cargo.lock

@@ -160,7 +160,6 @@ num_cpus = "1.0"
 num_enum = "0.5.7"
 o1-utils = { git = "https://github.com/o1-labs/proof-systems", tag = "0.2.0" }
 object = "0.37.1"
-ocaml-interop = { git = "https://github.com/sebastiencs/ocaml-interop.git", branch = "closure-values" }
 once_cell = "1"
 p256 = { version = "0.13", features = ["default", "ecdh", "ecdsa"] }
 p384 = "0.13"

Cargo.toml

@@ -1,10 +1,9 @@
+use crate::constants::{constraint_constants, slots_per_window};
 use mina_p2p_messages::{
     bigint::InvalidBigInt,
     v2::{self, StateHash},
 };
 
-use crate::constants::{constraint_constants, slots_per_window};
-
 #[allow(clippy::too_many_arguments)]
 pub fn genesis_and_negative_one_protocol_states(
     constants: v2::MinaBaseProtocolConstantsCheckedValueStableV1,

core/src/block/genesis.rs

@@ -1,18 +1,14 @@
-mod block_with_hash;
-pub use block_with_hash::{BlockHeaderWithHash, BlockWithHash};
-
 mod applied_block;
-pub use applied_block::AppliedBlock;
-
-pub mod prevalidate;
-
+mod block_with_hash;
 pub mod genesis;
+pub mod prevalidate;
 
-use std::sync::Arc;
-
+pub use applied_block::AppliedBlock;
+pub use block_with_hash::{BlockHeaderWithHash, BlockWithHash};
 pub use mina_p2p_messages::v2::{
     MinaBlockBlockStableV2 as Block, MinaBlockHeaderStableV2 as BlockHeader, StateHash as BlockHash,
 };
 
+use std::sync::Arc;
 pub type ArcBlock = Arc<Block>;
 pub type ArcBlockWithHash = BlockWithHash<Arc<Block>>;

core/src/block/mod.rs

@@ -1,7 +1,6 @@
-use serde::{Deserialize, Serialize};
-
 use super::ArcBlockWithHash;
 use crate::constants::PROTOCOL_VERSION;
+use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub enum BlockPrevalidationError {

core/src/block/prevalidate.rs

@@ -68,7 +68,6 @@ wasm-bindgen-futures = { workspace = true }
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
 zstd = { workspace = true, optional = true }
-ocaml-interop = { workspace = true, optional = true }
 reqwest = { workspace = true, features = ["blocking"] }
 
 [dev-dependencies]

ledger/Cargo.toml

@@ -1,17 +1,3 @@
-use std::{io::Cursor, str::FromStr, sync::Arc};
-
-use ark_ff::{BigInteger256, One, UniformRand, Zero};
-use mina_core::constants::PROTOCOL_VERSION;
-use mina_curves::pasta::Fp;
-use mina_p2p_messages::{
-    binprot::{BinProtRead, BinProtWrite},
-    v2,
-};
-use mina_signer::CompressedPubKey;
-use once_cell::sync::{Lazy, OnceCell};
-use rand::{prelude::ThreadRng, seq::SliceRandom, Rng};
-use serde::{Deserialize, Serialize};
-
 use crate::{
     gen_compressed,
     proofs::{
@@ -31,6 +17,15 @@ use crate::{
     zkapps::snark::FlaggedOption,
     AppendToInputs as _, MerklePath, MyCow, ToInputs,
 };
+use ark_ff::{BigInteger256, One, UniformRand, Zero};
+use mina_core::constants::PROTOCOL_VERSION;
+use mina_curves::pasta::Fp;
+use mina_p2p_messages::{
+    binprot::{BinProtRead, BinProtWrite},
+    v2,
+};
+use mina_signer::CompressedPubKey;
+use once_cell::sync::{Lazy, OnceCell};
 use poseidon::hash::{
     hash_noinputs, hash_with_kimchi,
     params::{
@@ -39,6 +34,9 @@ use poseidon::hash::{
     },
     Inputs,
 };
+use rand::{prelude::ThreadRng, seq::SliceRandom, Rng};
+use serde::{Deserialize, Serialize};
+use std::{io::Cursor, str::FromStr, sync::Arc};
 
 use super::common::*;
 
@@ -424,12 +422,6 @@ pub struct VerificationKey {
     pub wrap_vk: Option<()>,
 }
 
-// impl From<VerificationKey> for MinaBaseVerificationKeyWireStableV1Base64 {
-//     fn from(value: VerificationKey) -> Self {
-//         MinaBaseVerificationKeyWireStableV1Base64((&value).into())
-//     }
-// }
-
 impl Check<Fp> for VerificationKey {
     fn check(&self, w: &mut Witness<Fp>) {
         let Self {