enable injecting bootnode urls via env vars when in docker

Author: iostat

frontend/Dockerfile

@@ -27,6 +27,10 @@
 # REQUIRED ENVIRONMENT VARIABLES:
 # MINA_FRONTEND_ENVIRONMENT - Frontend configuration (local|webnode|production|fuzzing|staging)
 #
+# OPTIONAL ENVIRONMENT VARIABLES:
+# MINA_WEBNODE_SEED_URLS - Comma separated list of HTTP(S) urls to fetch bootnodes from
+# MINA_WEBNODE_BOOTNODES - Comma separated list of multiaddrs to use as bootnodes
+#
 # USAGE:
 # # Generate .env.docker with current git information
 # ./generate-docker-env.sh

frontend/Makefile

@@ -1,5 +1,9 @@
 # Frontend Makefile
 
+# These are threaded from the outside env into build-webnode
+MINA_WEBNODE_SEED_URLS ?= 
+MINA_WEBNODE_BOOTNODES ?= 
+
 .PHONY: help
 help: ## Display this help message
 	@echo "Frontend Makefile - Available targets:"
@@ -38,7 +42,10 @@ build-production: ## Build the frontend with production configuration
 
 .PHONY: build-webnode
 build-webnode: ## Build the frontend with webnode configuration
-	npx ng build --configuration webnode-local
+	npx ng build \
+	  --define MINA_WEBNODE_SEED_URLS="\"$(MINA_WEBNODE_SEED_URLS)\"" \
+	  --define MINA_WEBNODE_BOOTNODES="\"$(MINA_WEBNODE_BOOTNODES)\"" \
+	  --configuration webnode-local
 	cp dist/frontend/browser/assets/environments/webnode.js \
 		dist/frontend/browser/assets/environments/env.js
 

frontend/angular.json

@@ -62,7 +62,11 @@
             },
             "scripts": [
               "node_modules/aos/dist/aos.js"
-            ]
+            ],
+            "define": {
+              "MINA_WEBNODE_BOOTNODES": "\"\"",
+              "MINA_WEBNODE_SEED_URLS": "\"\""
+            }
           },
           "configurations": {
             "production": {

frontend/src/app/core/services/web-node.service.ts

@@ -161,13 +161,13 @@ export class WebNodeService {
             if (typeof this.webNodeNetwork === 'number') {
               const url = `${window.location.origin}/clusters/${this.webNodeNetwork}/`;
               return {
-                seeds: url + 'seeds',
+                seedUrls: [url + 'seeds'],
                 genesisConfig: url + 'genesis/config',
               };
             } else {
               return {
-                seeds:
-                  'https://bootnodes.minaprotocol.com/networks/devnet-webrtc.txt',
+                seedUrls: CONFIG.globalConfig.webNodeSeedUrls,
+                fixedSeeds: CONFIG.globalConfig.webNodeBootNodes,
               };
             }
           })();
@@ -184,7 +184,14 @@ export class WebNodeService {
             privateKey = null;
           }
 
-          return from(wasm.run(privateKey, urls.seeds, urls.genesisConfig));
+          return from(
+            wasm.run(
+              privateKey,
+              urls.seedUrls,
+              urls.fixedSeeds,
+              urls.genesisConfig,
+            ),
+          );
         }),
         tap((webnode: any) => {
           any(window).webnode = webnode;

frontend/src/app/shared/constants/config.ts

@@ -56,6 +56,7 @@ export function getFirstFeature(
   console.log('getFirstFeature called with config:', {
     config,
     'CONFIG.configs': CONFIG.configs,
+    globalConfig: CONFIG.globalConfig,
   });
 
   if (Array.isArray(config?.features)) {

frontend/src/app/shared/types/core/environment/mina-env.type.ts

@@ -55,6 +55,12 @@ export interface MinaEnv {
     features?: FeaturesConfig;
     /** GraphQL endpoint URL for blockchain queries */
     graphQL?: string;
+
+    /** For WebNodes, optionally supply HTTP(S) URLs to fetch bootnodes from */
+    webNodeSeedUrls?: Readonly<string[]>;
+
+    /** For WebNodes, optionally supply multiaddrs of known bootnodes */
+    webNodeBootNodes?: Readonly<string[]>;
   };
 }
 

frontend/src/environments/environment.webnode-local.ts

@@ -1,5 +1,36 @@
 import { MinaEnv } from '@shared/types/core/environment/mina-env.type';
 
+/** Substituted on launch of docker container from MINA_WEBNODE_SEED_URLS by `ng build` */
+declare const MINA_WEBNODE_SEED_URLS: string;
+
+/** Default list of seed URLs if MINA_WEBNODE_SEED_URLS isn't specified */
+const defaultWebNodeSeedUrls: Readonly<string[]> = [
+  'https://bootnodes.minaprotocol.com/networks/devnet-webrtc.txt',
+  '/webnode/pkg/devnet-webrtc.txt',
+];
+
+/** Substituted on launch of docker container from MINA_WEBNODE_BOOTNODES by `ng build` */
+declare const MINA_WEBNODE_BOOTNODES: string;
+
+/** Default list of bootnodes if MINA_WEBNODE_BOOTNODES is unspecified */
+const defaultWebNodeBootNodes: Readonly<string[]> = [
+  // example:
+  // "/2az589QvS6i3EJiVKUfVHCkyqf4khGy9PjQF7nSQuveF27wp7xX/https/mina-rust-seed-1.gcp.o1test.net/443",
+];
+
+function commaSeparatedEnv(
+  envVal: string,
+  fallback: Readonly<string[]>,
+): Readonly<string[]> {
+  const envTrimmed = envVal.trim();
+  if (envTrimmed.length !== 0) {
+    const envValue = envTrimmed.split(',').map(s => s.trim());
+    return envValue;
+  }
+
+  return fallback;
+}
+
 export const environment: Readonly<MinaEnv> = {
   production: true,
   identifier: 'Web Node FE',
@@ -15,6 +46,14 @@ export const environment: Readonly<MinaEnv> = {
       mempool: [],
       benchmarks: ['wallets'],
     },
+    webNodeSeedUrls: commaSeparatedEnv(
+      MINA_WEBNODE_SEED_URLS ?? '',
+      defaultWebNodeSeedUrls,
+    ),
+    webNodeBootNodes: commaSeparatedEnv(
+      MINA_WEBNODE_BOOTNODES ?? '',
+      defaultWebNodeBootNodes,
+    ),
   },
   configs: [
     {

node/web/src/lib.rs

@@ -1,6 +1,6 @@
 #![cfg(target_family = "wasm")]
 
-use ::node::transition_frontier::genesis::GenesisConfig;
+use ::node::{core::log, transition_frontier::genesis::GenesisConfig};
 pub use mina_node_common::*;
 
 mod rayon;
@@ -28,7 +28,7 @@ fn main() {
     thread::main_thread_init();
     wasm_bindgen_futures::spawn_local(async {
         console_error_panic_hook::set_once();
-        tracing::initialize(tracing::Level::INFO);
+        tracing::initialize(tracing::Level::DEBUG);
 
         init_rayon().await.unwrap();
     });
@@ -77,15 +77,22 @@ fn parse_bp_key(key: JsValue) -> Option<AccountSecretKey> {
 #[wasm_bindgen]
 pub async fn run(
     block_producer: JsValue,
-    seed_nodes_url: Option<String>,
+    seed_nodes_urls: Option<Vec<String>>,
+    seed_nodes_fixed: Option<Vec<String>>,
     genesis_config_url: Option<String>,
 ) -> RpcSender {
     let block_producer = parse_bp_key(block_producer);
 
     let (rpc_sender_tx, rpc_sender_rx) = ::node::core::channels::oneshot::channel();
     let _ = thread::spawn(move || {
         wasm_bindgen_futures::spawn_local(async move {
-            let mut node = setup_node(block_producer, seed_nodes_url, genesis_config_url).await;
+            let mut node = setup_node(
+                block_producer,
+                seed_nodes_urls,
+                seed_nodes_fixed,
+                genesis_config_url,
+            )
+            .await;
             let _ = rpc_sender_tx.send(node.rpc());
             node.run_forever().await;
         });
@@ -98,7 +105,8 @@ pub async fn run(
 
 async fn setup_node(
     block_producer: Option<AccountSecretKey>,
-    seed_nodes_url: Option<String>,
+    seed_nodes_urls: Option<Vec<String>>,
+    seed_nodes_fixed: Option<Vec<String>>,
     genesis_config_url: Option<String>,
 ) -> mina_node_common::Node<NodeService> {
     let block_verifier_index = BlockVerifier::make().await;
@@ -119,18 +127,34 @@ async fn setup_node(
         .work_verifier_index(work_verifier_index.clone());
 
     // TODO(binier): refactor
-    if let Some(seed_nodes_url) = seed_nodes_url {
-        let peers = ::node::core::http::get_bytes(&seed_nodes_url)
-            .await
-            .expect("failed to fetch seed nodes");
-        node_builder.initial_peers(
-            String::from_utf8_lossy(&peers)
-                .split("\n")
-                .filter(|s| !s.trim().is_empty())
-                .map(|s| s.trim().parse().expect("failed to parse seed node addr")),
-        );
+    let mut all_raw_peers = seed_nodes_fixed.unwrap_or_default();
+    if let Some(seed_nodes_urls) = seed_nodes_urls {
+        for seed_nodes_url in seed_nodes_urls {
+            let peers = ::node::core::http::get_bytes(&seed_nodes_url).await;
+            match peers {
+                Ok(s) => {
+                    log::info!("Successfully fetched peers from {seed_nodes_url}");
+                    all_raw_peers.extend(String::from_utf8_lossy(&s).split("\n").map(String::from));
+                }
+                Err(e) => {
+                    log::error!("Failed to fetch peers from {seed_nodes_url}: {e}");
+                }
+            }
+        }
     }
 
+    node_builder.initial_peers(
+        all_raw_peers
+            .iter()
+            .map(|s| s.trim())
+            .filter(|s| !s.is_empty())
+            .flat_map(|s| s.parse().ok())
+            .map(|p| {
+                log::debug!("Using peer: {p:?}");
+                p
+            }),
+    );
+
     if let Some(bp_key) = block_producer {
         thread::spawn(move || {
             BlockProver::make(Some(block_verifier_index), Some(work_verifier_index));