From cc77bb3be223b1786b7023bc86f83cba1e04173a Mon Sep 17 00:00:00 2001 From: Alan McNicholas Date: Tue, 23 Sep 2025 15:26:13 +0100 Subject: [PATCH 1/2] Updating OCaml node config with 3.3.0-alpha1 image paths --- .github/workflows/tests.yaml | 6 +++--- docker-compose.archive.devnet.compare.yml | 2 +- node/testing/src/node/ocaml/config.rs | 4 ++-- node/testing/src/node/ocaml/mod.rs | 2 +- .../multi_node/basic_connectivity_peer_discovery.rs | 2 +- .../solo_node/basic_connectivity_accept_incoming.rs | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 03e62312cd..15e43c8972 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -291,7 +291,7 @@ jobs: runs-on: ubuntu-24.04 timeout-minutes: 20 container: - image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet + image: gcr.io/o1labs-192920/mina-daemon:3.3.0-alpha1-6929a7e-noble-devnet options: --volume debugger_data:/tmp/db env: BPF_ALIAS: /coda/0.0.1/29936104443aaf264a7f0192ac64b1c7173198c1ed404c1bcff5e562e05eb7f6-0.0.0.0 @@ -362,7 +362,7 @@ jobs: - build-tests-webrtc runs-on: ubuntu-24.04 container: - image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet + image: gcr.io/o1labs-192920/mina-daemon:3.3.0-alpha1-6929a7e-noble-devnet options: --volume debugger_data:/tmp/db env: # to allow local addrs discovery @@ -449,7 +449,7 @@ jobs: - build-tests-webrtc runs-on: ubuntu-24.04 container: - image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet + image: gcr.io/o1labs-192920/mina-daemon:3.3.0-alpha1-6929a7e-noble-devnet env: # to allow local addrs discovery MINA_DISCOVERY_FILTER_ADDR: false diff --git a/docker-compose.archive.devnet.compare.yml b/docker-compose.archive.devnet.compare.yml index b627e5113c..23506aebbf 100644 --- a/docker-compose.archive.devnet.compare.yml +++ b/docker-compose.archive.devnet.compare.yml @@ -100,7 +100,7 @@ services: condition: service_healthy node-ocaml: - image: gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet + image: gcr.io/o1labs-192920/mina-daemon:3.3.0-alpha1-6929a7e-noble-devnet container_name: node-ocaml environment: MINA_CLIENT_TRUSTLIST: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16 diff --git a/node/testing/src/node/ocaml/config.rs b/node/testing/src/node/ocaml/config.rs index fce6c65327..3348957dbe 100644 --- a/node/testing/src/node/ocaml/config.rs +++ b/node/testing/src/node/ocaml/config.rs @@ -52,7 +52,7 @@ impl Default for OcamlNodeTestingConfig { fn default() -> Self { Self { initial_peers: vec![], - daemon_json: DaemonJson::Custom("/var/lib/coda/config_939b08d8.json".to_owned()), + daemon_json: DaemonJson::Custom("/var/lib/coda/config_6929a7ec.json".to_owned()), block_producer: None, } } @@ -229,7 +229,7 @@ impl OcamlNodeConfig { impl OcamlNodeExecutable { pub const DEFAULT_DOCKER_IMAGE: &'static str = - "gcr.io/o1labs-192920/mina-daemon:3.2.0-beta2-939b08d-noble-devnet"; + "gcr.io/o1labs-192920/mina-daemon:3.3.0-alpha1-6929a7e-noble-devnet"; pub const DEFAULT_MINA_EXECUTABLE: &'static str = "mina"; fn docker_container_name(tmp_dir: &temp_dir::TempDir) -> String { diff --git a/node/testing/src/node/ocaml/mod.rs b/node/testing/src/node/ocaml/mod.rs index e0d277a505..f839d3bea0 100644 --- a/node/testing/src/node/ocaml/mod.rs +++ b/node/testing/src/node/ocaml/mod.rs @@ -418,7 +418,7 @@ fn run_ocaml() { graphql_port: 3086, client_port: 8301, initial_peers: Vec::new(), - daemon_json: DaemonJson::Custom("/var/lib/coda/config_939b08d8.json".to_owned()), + daemon_json: DaemonJson::Custom("/var/lib/coda/config_6929a7ec.json".to_owned()), block_producer: None, }) .unwrap(); diff --git a/node/testing/src/scenarios/multi_node/basic_connectivity_peer_discovery.rs b/node/testing/src/scenarios/multi_node/basic_connectivity_peer_discovery.rs index b4a4ce3763..3a4c1d6037 100644 --- a/node/testing/src/scenarios/multi_node/basic_connectivity_peer_discovery.rs +++ b/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_939b08d8.json".to_owned()), + daemon_json: DaemonJson::Custom("/var/lib/coda/config_6929a7ec.json".to_owned()), block_producer: None, }; diff --git a/node/testing/src/scenarios/solo_node/basic_connectivity_accept_incoming.rs b/node/testing/src/scenarios/solo_node/basic_connectivity_accept_incoming.rs index 0662621106..c684910557 100644 --- a/node/testing/src/scenarios/solo_node/basic_connectivity_accept_incoming.rs +++ b/node/testing/src/scenarios/solo_node/basic_connectivity_accept_incoming.rs @@ -110,7 +110,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_939b08d8.json".to_owned(), + "/var/lib/coda/config_6929a7ec.json".to_owned(), ), block_producer: None, }); From 7a233ad670e6230ddcf5057bb5c445a5579cdde4 Mon Sep 17 00:00:00 2001 From: Alan <72793054+amc-ie@users.noreply.github.com> Date: Tue, 23 Sep 2025 16:09:58 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md Adding Ocaml update to changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66c361ac6c..b33893ef35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ 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.3.0-alpha1-6929a7e + ([#1454](https://github.com/o1-labs/mina-rust/pull/1454)) + ### Added - **Website**: add o1Labs infrastructure entry, describing the nodes managed by