Skip to content

Commit a7369e3

Browse files
Merge pull request #1631 from o1-labs/bugfix/solo-node-bootstrap
Updated replayer address and first block slot
2 parents ebc2862 + 937ba61 commit a7369e3

File tree

8 files changed

+28
-7
lines changed

8 files changed

+28
-7
lines changed

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ jobs:
578578
# to allow connection with replayer
579579
# TODO: remove when replayer supports identify
580580
KEEP_CONNECTION_WITH_UNKNOWN_STREAM: true
581-
REPLAYER_MULTIADDR: "/dns4/primary-tcp-proxy.hz.minaprotocol.network/tcp/40110/p2p/12D3KooWPayQEdprqY2m3biReUUybA5LoULpJE7YWu6wetEKKELv"
581+
REPLAYER_MULTIADDR: "/dns4/mina-rust-ci-1-libp2p.gcp.o1test.net/tcp/8302/p2p/12D3KooWQi9rSWT2kmEavbEc5eP13nG1FRStMiERKZB3wPJSkNrE"
582582
BPF_ALIAS: /coda/0.0.1/29936104443aaf264a7f0192ac64b1c7173198c1ed404c1bcff5e562e05eb7f6-0.0.0.0
583583
strategy:
584584
matrix:

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ website/static/api-docs/
1919
ledger/3.0.0mainnet
2020
ledger/berkeley-devnet
2121
mina-workdir
22-
.idea/
22+
.idea/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub struct SoloNodeBootstrap;
2222
// This test will fail if we don't start with this as the initial time because
2323
// the time validation for the first block will reject it.
2424
fn first_block_slot_timestamp_nanos(config: &RustNodeTestingConfig) -> u64 {
25-
let first_block_global_slot = 46891; // Update if replay changes
25+
let first_block_global_slot = 290000; // Update if replay changes
2626
let protocol_constants = config.genesis.protocol_constants().unwrap();
2727
let genesis_timestamp_ms = protocol_constants.genesis_state_timestamp.0.as_u64();
2828
let milliseconds_per_slot = constraint_constants().block_window_duration_ms;
@@ -38,6 +38,7 @@ fn first_block_slot_timestamp_nanos(config: &RustNodeTestingConfig) -> u64 {
3838

3939
impl SoloNodeBootstrap {
4040
pub async fn run(self, mut runner: ClusterRunner<'_>) {
41+
std::env::set_var("MINA_DISCOVERY_FILTER_ADDR", "true");
4142
use self::TransitionFrontierSyncState::*;
4243

4344
const TIMEOUT: Duration = Duration::from_secs(60 * 40);

node/testing/tests/single_node.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,19 @@ scenario_test!(
2828
SoloNodeSyncRootSnarkedLedger
2929
);
3030

31+
// To run locally:
32+
// ```bash
33+
// export MINA_DISCOVERY_FILTER_ADDR=false
34+
// export KEEP_CONNECTION_WITH_UNKNOWN_STREAM=true
35+
// export REPLAYER_MULTIADDR=/dns4/mina-rust-ci-1-libp2p.gcp.o1test.net/tcp/8302/p2p/12D3KooWQi9rSWT2kmEavbEc5eP13nG1FRStMiERKZB3wPJSkNrE
36+
// export BPF_ALIAS=/coda/0.0.1/29936104443aaf264a7f0192ac64b1c7173198c1ed404c1bcff5e562e05eb7f6-0.0.0.0
37+
// cargo test --release \
38+
// --package=mina-node-testing
39+
// --package=cli -- \
40+
// --exact bootstrap_from_replayer
41+
// --nocapture
42+
// ```
3143
scenario_test!(
32-
#[ignore = "investigate failure, see 1591"]
3344
bootstrap_from_replayer,
3445
SoloNodeBootstrap,
3546
SoloNodeBootstrap

p2p/src/p2p_state.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ impl P2pState {
7474
mina_core::log::info!(
7575
mina_core::log::system_time();
7676
kind = "P2pState new",
77-
summary = format!("Current node's id: {peer_id_str}"),
77+
summary = format!("Current node's id: {my_id}"),
7878
peer_id_str = peer_id_str,
7979
);
8080
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/dns4/mina-rust-ci-1-libp2p.gcp.o1test.net/tcp/8302/p2p/12D3KooWQi9rSWT2kmEavbEc5eP13nG1FRStMiERKZB3wPJSkNrE

website/docs/developers/testing/scenario-tests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ For network connectivity in testing environments, you may need to configure:
450450

451451
```bash
452452
# Enable connection to replayer service (used in CI)
453-
export REPLAYER_MULTIADDR="/dns4/primary-tcp-proxy.hz.minaprotocol.network/tcp/40110/p2p/12D3KooWPayQEdprqY2m3biReUUybA5LoULpJE7YWu6wetEKKELv"
453+
export REPLAYER_MULTIADDR="/dns4/mina-rust-ci-1-libp2p.gcp.o1test.net/tcp/8302/p2p/12D3KooWQi9rSWT2kmEavbEc5eP13nG1FRStMiERKZB3wPJSkNrE"
454454

455455
# Allow local address discovery
456456
export MINA_DISCOVERY_FILTER_ADDR=false

website/docs/node-operators/infrastructure/replayer-nodes.mdx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ description: o1Labs replayer nodes for debugging and verification
44
sidebar_position: 7
55
---
66

7+
import CodeBlock from "@theme/CodeBlock";
8+
import ReplayerNodesList from "!!raw-loader!../../developers/scripts/infrastructure/replayer-nodes.txt";
9+
710
# Replayer Nodes
811

912
This section is still a work in progress. It will cover nodes running with
@@ -15,4 +18,9 @@ replaying node execution, see the
1518
[Replayer documentation](/docs/developers/testing/replayer) in the developers
1619
testing section.
1720

18-
Track progress: [Issue #1619](https://github.com/o1-labs/mina-rust/issues/1619)
21+
<CodeBlock
22+
language="text"
23+
title="website/docs/developers/scripts/infrastructure/replayer-nodes.txt"
24+
>
25+
{ReplayerNodesList}
26+
</CodeBlock>

0 commit comments

Comments
 (0)