From 4dfba75dfe29269b79d6d635d3183046d670bf8b 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib_crypto_dal/dal_config/dal_config.ml b/src/lib_crypto_dal/dal_config/dal_config.ml index 85fa5639b9cc..be937db24acc 100644 --- a/src/lib_crypto_dal/dal_config/dal_config.ml +++ b/src/lib_crypto_dal/dal_config/dal_config.ml @@ -52,7 +52,7 @@ let encoding : t Data_encoding.t = conv (fun {activated; bootstrap_peers} -> (activated, bootstrap_peers)) (fun (activated, bootstrap_peers) -> {activated; bootstrap_peers}) - (obj2 (req "activated" bool) (req "bootstrap_peers" (list string))) + (obj2 (dft "activated" bool true) (req "bootstrap_peers" (list string))) [@@coverage off] let default = {activated = true; bootstrap_peers = []} -- GitLab From 9c2f6f44380d4c2df71e5f6ea1683f591a78f5c6 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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/lib_node_config/config_file.ml b/src/lib_node_config/config_file.ml index 8ab5d52c0ed4..68abd312b80b 100644 --- a/src/lib_node_config/config_file.ml +++ b/src/lib_node_config/config_file.ml @@ -134,6 +134,12 @@ let blockchain_network_mainnet = ] ~default_bootstrap_peers: ["boot.tzinit.org"; "boot.tzboot.net"; "boot.tzbeta.net"] + ~dal_config: + { + activated = true; + bootstrap_peers = + ["dalboot.mainnet.tzinit.org"; "dalboot.mainnet.tzboot.net"]; + } let blockchain_network_ghostnet = make_blockchain_network @@ -175,6 +181,12 @@ let blockchain_network_ghostnet = "ghostnet.boot.ecadinfra.com"; "ghostnet.stakenow.de:9733"; ] + ~dal_config: + { + activated = true; + bootstrap_peers = + ["dalboot.ghostnet.tzinit.org"; "dalboot.ghostnet.tzboot.net"]; + } let blockchain_network_sandbox = make_blockchain_network @@ -204,6 +216,7 @@ let blockchain_network_sandbox = ~chain_name:"TEZOS" ~sandboxed_chain_name:"SANDBOXED_TEZOS" ~user_activated_upgrades:sandbox_user_activated_upgrades + ~dal_config:{activated = true; bootstrap_peers = []} let blockchain_network_encoding : blockchain_network Data_encoding.t = let open Data_encoding in -- GitLab