Merge pull request #1236 from o1-labs/dw/update-ocaml-node

OCaml node dep: update to the latest release

Author: dannywillems

.github/workflows/ci.yaml

@@ -251,7 +251,7 @@ jobs:
     needs: [ build-tests, build-tests-webrtc ]
     runs-on: ubuntu-22.04
     container:
-      image: gcr.io/o1labs-192920/mina-daemon:3.0.4-alpha1-889607b-bullseye-devnet
+      image: gcr.io/o1labs-192920/mina-daemon:3.2.0-alpha1-7f94ae0-bullseye-devnet
       options: --volume debugger_data:/tmp/db
     env:
       BPF_ALIAS: /coda/0.0.1/29936104443aaf264a7f0192ac64b1c7173198c1ed404c1bcff5e562e05eb7f6-0.0.0.0
@@ -314,7 +314,7 @@ jobs:
       - build-tests-webrtc
     runs-on: ubuntu-22.04
     container:
-      image: gcr.io/o1labs-192920/mina-daemon:3.0.4-alpha1-889607b-bullseye-devnet
+      image: gcr.io/o1labs-192920/mina-daemon:3.2.0-alpha1-7f94ae0-bullseye-devnet
       options: --volume debugger_data:/tmp/db
     env:
       # to allow local addrs discovery
@@ -400,7 +400,7 @@ jobs:
       - build-tests-webrtc
     runs-on: ubuntu-22.04
     container:
-      image: gcr.io/o1labs-192920/mina-daemon:3.0.4-alpha1-889607b-bullseye-devnet
+      image: gcr.io/o1labs-192920/mina-daemon:3.2.0-alpha1-7f94ae0-bullseye-devnet
     env:
       # to allow local addrs discovery
       OPENMINA_DISCOVERY_FILTER_ADDR: false

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### OCaml node
+
+- Update the CI and code to compare with the latest release 3.2.0-alpha1-7f94ae0
+  ([#1236](https://github.com/o1-labs/openmina/pull/1236), fix
+  [#1158](https://github.com/o1-labs/openmina/issues/1158))
+
 ### Dependencies
 
 - bump proc-macro2 from 1.0.93 to 1.0.95

docker-compose.archive.devnet.compare.yml

@@ -100,7 +100,7 @@ services:
         condition: service_healthy
 
   node-ocaml:
-    image: gcr.io/o1labs-192920/mina-daemon:3.0.4-alpha1-889607b-bullseye-devnet
+    image: gcr.io/o1labs-192920/mina-daemon:3.2.0-alpha1-7f94ae0-bullseye-devnet
     container_name: node-ocaml
     environment:
       MINA_CLIENT_TRUSTLIST: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16

node/testing/src/node/ocaml/config.rs

@@ -20,7 +20,7 @@ impl Default for OcamlNodeTestingConfig {
     fn default() -> Self {
         Self {
             initial_peers: vec![],
-            daemon_json: DaemonJson::Custom("/var/lib/coda/config_889607b9.json".to_owned()),
+            daemon_json: DaemonJson::Custom("/var/lib/coda/config_7f94ae0b.json".to_owned()),
             block_producer: None,
         }
     }
@@ -131,7 +131,7 @@ impl OcamlNodeConfig {
 impl OcamlNodeExecutable {
     // pub const DEFAULT_DOCKER_IMAGE: &'static str = "vladsimplestakingcom/mina-light:2.0.0rampup4";
     pub const DEFAULT_DOCKER_IMAGE: &'static str =
-        "gcr.io/o1labs-192920/mina-daemon:3.0.4-alpha1-889607b-bullseye-devnet";
+        "gcr.io/o1labs-192920/mina-daemon:3.2.0-alpha1-7f94ae0-bullseye-devnet";
     pub const DEFAULT_MINA_EXECUTABLE: &'static str = "mina";
 
     fn docker_container_name(tmp_dir: &temp_dir::TempDir) -> String {

node/testing/src/node/ocaml/mod.rs

@@ -411,7 +411,7 @@ fn run_ocaml() {
         graphql_port: 3086,
         client_port: 8301,
         initial_peers: Vec::new(),
-        daemon_json: DaemonJson::Custom("/var/lib/coda/config_889607b9.json".to_owned()),
+        daemon_json: DaemonJson::Custom("/var/lib/coda/config_7f94ae0b.json".to_owned()),
         block_producer: None,
     })
     .unwrap();

node/testing/src/scenarios/multi_node/basic_connectivity_peer_discovery.rs

@@ -34,7 +34,7 @@ impl MultiNodeBasicConnectivityPeerDiscovery {
 
         let ocaml_seed_config = OcamlNodeTestingConfig {
             initial_peers: Vec::new(),
-            daemon_json: DaemonJson::Custom("/var/lib/coda/config_889607b9.json".to_owned()),
+            daemon_json: DaemonJson::Custom("/var/lib/coda/config_7f94ae0b.json".to_owned()),
             block_producer: None,
         };
 

node/testing/src/scenarios/solo_node/basic_connectivity_accept_incoming.rs

@@ -108,7 +108,7 @@ impl SoloNodeBasicConnectivityAcceptIncoming {
                     let node_id = runner.add_ocaml_node(OcamlNodeTestingConfig {
                         initial_peers: vec![node_addr.clone()],
                         daemon_json: DaemonJson::Custom(
-                            "/var/lib/coda/config_889607b9.json".to_owned(),
+                            "/var/lib/coda/config_7f94ae0b.json".to_owned(),
                         ),
                         block_producer: None,
                     });