diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 11401b800..76c1d4dd5 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -578,7 +578,7 @@ jobs: # to allow connection with replayer # TODO: remove when replayer supports identify KEEP_CONNECTION_WITH_UNKNOWN_STREAM: true - REPLAYER_MULTIADDR: "/dns4/primary-tcp-proxy.hz.minaprotocol.network/tcp/40110/p2p/12D3KooWPayQEdprqY2m3biReUUybA5LoULpJE7YWu6wetEKKELv" + REPLAYER_MULTIADDR: "/dns4/mina-rust-ci-1-libp2p.gcp.o1test.net/tcp/8302/p2p/12D3KooWQi9rSWT2kmEavbEc5eP13nG1FRStMiERKZB3wPJSkNrE" BPF_ALIAS: /coda/0.0.1/29936104443aaf264a7f0192ac64b1c7173198c1ed404c1bcff5e562e05eb7f6-0.0.0.0 strategy: matrix: diff --git a/.gitignore b/.gitignore index 6c054a415..0eaeb2b6d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,4 @@ website/static/api-docs/ ledger/3.0.0mainnet ledger/berkeley-devnet mina-workdir -.idea/ \ No newline at end of file +.idea/ diff --git a/node/testing/src/scenarios/solo_node/bootstrap.rs b/node/testing/src/scenarios/solo_node/bootstrap.rs index 74f7a3adc..a74dde3e3 100644 --- a/node/testing/src/scenarios/solo_node/bootstrap.rs +++ b/node/testing/src/scenarios/solo_node/bootstrap.rs @@ -22,7 +22,7 @@ pub struct SoloNodeBootstrap; // This test will fail if we don't start with this as the initial time because // the time validation for the first block will reject it. fn first_block_slot_timestamp_nanos(config: &RustNodeTestingConfig) -> u64 { - let first_block_global_slot = 46891; // Update if replay changes + let first_block_global_slot = 290000; // Update if replay changes let protocol_constants = config.genesis.protocol_constants().unwrap(); let genesis_timestamp_ms = protocol_constants.genesis_state_timestamp.0.as_u64(); let milliseconds_per_slot = constraint_constants().block_window_duration_ms; @@ -38,6 +38,7 @@ fn first_block_slot_timestamp_nanos(config: &RustNodeTestingConfig) -> u64 { impl SoloNodeBootstrap { pub async fn run(self, mut runner: ClusterRunner<'_>) { + std::env::set_var("MINA_DISCOVERY_FILTER_ADDR", "true"); use self::TransitionFrontierSyncState::*; const TIMEOUT: Duration = Duration::from_secs(60 * 40); diff --git a/node/testing/tests/single_node.rs b/node/testing/tests/single_node.rs index c21042e3f..91db32656 100644 --- a/node/testing/tests/single_node.rs +++ b/node/testing/tests/single_node.rs @@ -28,8 +28,19 @@ scenario_test!( SoloNodeSyncRootSnarkedLedger ); +// To run locally: +// ```bash +// export MINA_DISCOVERY_FILTER_ADDR=false +// export KEEP_CONNECTION_WITH_UNKNOWN_STREAM=true +// export REPLAYER_MULTIADDR=/dns4/mina-rust-ci-1-libp2p.gcp.o1test.net/tcp/8302/p2p/12D3KooWQi9rSWT2kmEavbEc5eP13nG1FRStMiERKZB3wPJSkNrE +// export BPF_ALIAS=/coda/0.0.1/29936104443aaf264a7f0192ac64b1c7173198c1ed404c1bcff5e562e05eb7f6-0.0.0.0 +// cargo test --release \ +// --package=mina-node-testing +// --package=cli -- \ +// --exact bootstrap_from_replayer +// --nocapture +// ``` scenario_test!( - #[ignore = "investigate failure, see 1591"] bootstrap_from_replayer, SoloNodeBootstrap, SoloNodeBootstrap diff --git a/p2p/src/p2p_state.rs b/p2p/src/p2p_state.rs index 8edf9e581..339aa143f 100644 --- a/p2p/src/p2p_state.rs +++ b/p2p/src/p2p_state.rs @@ -74,7 +74,7 @@ impl P2pState { mina_core::log::info!( mina_core::log::system_time(); kind = "P2pState new", - summary = format!("Current node's id: {peer_id_str}"), + summary = format!("Current node's id: {my_id}"), peer_id_str = peer_id_str, ); } diff --git a/website/docs/developers/scripts/infrastructure/replayer-nodes.txt b/website/docs/developers/scripts/infrastructure/replayer-nodes.txt new file mode 100644 index 000000000..d87cecdde --- /dev/null +++ b/website/docs/developers/scripts/infrastructure/replayer-nodes.txt @@ -0,0 +1 @@ +/dns4/mina-rust-ci-1-libp2p.gcp.o1test.net/tcp/8302/p2p/12D3KooWQi9rSWT2kmEavbEc5eP13nG1FRStMiERKZB3wPJSkNrE \ No newline at end of file diff --git a/website/docs/developers/testing/scenario-tests.md b/website/docs/developers/testing/scenario-tests.md index c064d14b8..bb726feb4 100644 --- a/website/docs/developers/testing/scenario-tests.md +++ b/website/docs/developers/testing/scenario-tests.md @@ -450,7 +450,7 @@ For network connectivity in testing environments, you may need to configure: ```bash # Enable connection to replayer service (used in CI) -export REPLAYER_MULTIADDR="/dns4/primary-tcp-proxy.hz.minaprotocol.network/tcp/40110/p2p/12D3KooWPayQEdprqY2m3biReUUybA5LoULpJE7YWu6wetEKKELv" +export REPLAYER_MULTIADDR="/dns4/mina-rust-ci-1-libp2p.gcp.o1test.net/tcp/8302/p2p/12D3KooWQi9rSWT2kmEavbEc5eP13nG1FRStMiERKZB3wPJSkNrE" # Allow local address discovery export MINA_DISCOVERY_FILTER_ADDR=false diff --git a/website/docs/node-operators/infrastructure/replayer-nodes.mdx b/website/docs/node-operators/infrastructure/replayer-nodes.mdx index df9f10679..b96ed198d 100644 --- a/website/docs/node-operators/infrastructure/replayer-nodes.mdx +++ b/website/docs/node-operators/infrastructure/replayer-nodes.mdx @@ -4,6 +4,9 @@ description: o1Labs replayer nodes for debugging and verification sidebar_position: 7 --- +import CodeBlock from "@theme/CodeBlock"; +import ReplayerNodesList from "!!raw-loader!../../developers/scripts/infrastructure/replayer-nodes.txt"; + # Replayer Nodes This section is still a work in progress. It will cover nodes running with @@ -15,4 +18,9 @@ replaying node execution, see the [Replayer documentation](/docs/developers/testing/replayer) in the developers testing section. -Track progress: [Issue #1619](https://github.com/o1-labs/mina-rust/issues/1619) + + {ReplayerNodesList} +