From c8d9317e327a7f79430b8f3e224f31e6152a3f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Thir=C3=A9?= Date: Tue, 21 May 2024 08:49:32 +0200 Subject: [PATCH 1/2] Node/Configuration: Some DAL configuration has default values --- src/lib_crypto_dal/dal_config/dal_config.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib_crypto_dal/dal_config/dal_config.ml b/src/lib_crypto_dal/dal_config/dal_config.ml index a629954d4a5b..795d672d8a72 100644 --- a/src/lib_crypto_dal/dal_config/dal_config.ml +++ b/src/lib_crypto_dal/dal_config/dal_config.ml @@ -59,8 +59,8 @@ let encoding : t Data_encoding.t = (fun (activated, use_mock_srs_for_testing, bootstrap_peers) -> {activated; use_mock_srs_for_testing; bootstrap_peers}) (obj3 - (req "activated" bool) - (req "use_mock_srs_for_testing" bool) + (dft "activated" bool true) + (dft "use_mock_srs_for_testing" bool false) (req "bootstrap_peers" (list string))) [@@coverage off] -- GitLab From a1e7ff9ac55c9b0255e95bc4038e8c951ddbe986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Thir=C3=A9?= Date: Tue, 21 May 2024 08:49:59 +0200 Subject: [PATCH 2/2] Node/Config: Provide domain names for DAL bootstrap nodes --- src/lib_node_config/config_file.ml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/lib_node_config/config_file.ml b/src/lib_node_config/config_file.ml index bbed676605b7..f95b2f00628f 100644 --- a/src/lib_node_config/config_file.ml +++ b/src/lib_node_config/config_file.ml @@ -132,6 +132,13 @@ let blockchain_network_mainnet = ] ~default_bootstrap_peers: ["boot.tzinit.org"; "boot.tzboot.net"; "boot.tzbeta.net"] + ~dal_config: + { + activated = true; + use_mock_srs_for_testing = false; + bootstrap_peers = + ["dalboot.mainnet.tzinit.org"; "dalboot.mainnet.tzboot.net"]; + } let blockchain_network_ghostnet = make_blockchain_network @@ -174,6 +181,13 @@ let blockchain_network_ghostnet = "ghostnet.kaml.fr"; "ghostnet.stakenow.de:9733"; ] + ~dal_config: + { + activated = true; + use_mock_srs_for_testing = false; + bootstrap_peers = + ["dalboot.ghostnet.tzinit.org"; "dalboot.ghostnet.tzboot.net"]; + } let blockchain_network_sandbox = make_blockchain_network @@ -203,6 +217,8 @@ let blockchain_network_sandbox = ~chain_name:"TEZOS" ~sandboxed_chain_name:"SANDBOXED_TEZOS" ~user_activated_upgrades:sandbox_user_activated_upgrades + ~dal_config: + {activated = true; use_mock_srs_for_testing = false; bootstrap_peers = []} let blockchain_network_encoding : blockchain_network Data_encoding.t = let open Data_encoding in -- GitLab