From abce81fcff509d879ae5938d01c4fcaed09c36d5 Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Mon, 3 Oct 2022 16:07:08 +0200 Subject: [PATCH 1/4] Node: add user-activated upgrade for Ghostnet --- src/bin_node/node_config_file.ml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin_node/node_config_file.ml b/src/bin_node/node_config_file.ml index 4cc97dacdf95..9c21221fad1e 100644 --- a/src/bin_node/node_config_file.ml +++ b/src/bin_node/node_config_file.ml @@ -191,6 +191,7 @@ let blockchain_network_ghostnet = [ (8191l, "Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A"); (765952l, "PtJakart2xVj7pYXJBXrqHgd82rdkLey5ZeeGwDgPp9rhQUbSqY"); + (1191936l, "PtKathmankSpLLDALzWw7CGD2j2MtyveTwboEYokqUCP4a1LxMg"); ] ~default_bootstrap_peers: [ -- GitLab From 7e679033784dba8ffe956a9e685a4d9afd52003e Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Mon, 3 Oct 2022 16:11:32 +0200 Subject: [PATCH 2/4] Node: remove Giganode from bootstrap peers --- src/bin_node/node_config_file.ml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/bin_node/node_config_file.ml b/src/bin_node/node_config_file.ml index 9c21221fad1e..d40a1ee2d971 100644 --- a/src/bin_node/node_config_file.ml +++ b/src/bin_node/node_config_file.ml @@ -97,8 +97,6 @@ let sandbox_user_activated_upgrades = [] (* END_PATCHING_ZONE_FOR_SANDBOX_USER_ACTIVATED_UPGRADES *) let blockchain_network_mainnet = - let giganode_1 = "116.202.172.21" in - let giganode_2 = "95.216.45.62" in make_blockchain_network ~alias:"mainnet" { @@ -124,7 +122,7 @@ let blockchain_network_mainnet = ( "PtHangzHogokSuiMHemCuowEavgYTP8J5qQ9fQS793MHYFpCY3r", "PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx" ); ] - ~default_bootstrap_peers:["boot.tzbeta.net"; giganode_1; giganode_2] + ~default_bootstrap_peers:["boot.tzbeta.net"] let blockchain_network_hangzhounet = make_blockchain_network -- GitLab From 142d536220683f9aa34bd483fe0332e824283db0 Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Mon, 3 Oct 2022 16:14:51 +0200 Subject: [PATCH 3/4] Node: remove --network Hangzhounet and Jakartanet --- src/bin_node/node_config_file.ml | 73 -------------------------------- 1 file changed, 73 deletions(-) diff --git a/src/bin_node/node_config_file.ml b/src/bin_node/node_config_file.ml index d40a1ee2d971..52829f491d0d 100644 --- a/src/bin_node/node_config_file.ml +++ b/src/bin_node/node_config_file.ml @@ -124,42 +124,6 @@ let blockchain_network_mainnet = ] ~default_bootstrap_peers:["boot.tzbeta.net"] -let blockchain_network_hangzhounet = - make_blockchain_network - ~alias:"hangzhounet" - { - time = Time.Protocol.of_notation_exn "2021-11-04T15:00:00Z"; - block = - Block_hash.of_b58check_exn - "BLockGenesisGenesisGenesisGenesisGenesis7e8c4d4snJW"; - protocol = - Protocol_hash.of_b58check_exn - "Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P"; - } - ~genesis_parameters: - { - context_key = "sandbox_parameter"; - values = - `O - [ - ( "genesis_pubkey", - `String "edpkuYLienS3Xdt5c1vfRX1ibMxQuvfM67ByhJ9nmRYYKGAAoTq1UC" - ); - ]; - } - ~chain_name:"TEZOS_HANGZHOUNET_2021-11-04T15:00:00Z" - ~sandboxed_chain_name:"SANDBOXED_TEZOS" - ~user_activated_upgrades: - [(8191l, "PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx")] - ~default_bootstrap_peers: - [ - "hangzhounet.teztnets.xyz"; - "hangzhounet.kaml.fr"; - "hangzhounet.smartpy.io"; - "hangzhounet.tezos.co.il"; - "hangzhounet.boot.tez.ie"; - ] - let blockchain_network_ghostnet = make_blockchain_network ~alias:"ghostnet" @@ -201,41 +165,6 @@ let blockchain_network_ghostnet = "ghostnet.visualtez.com"; ] -let blockchain_network_jakartanet = - make_blockchain_network - ~alias:"jakartanet" - { - time = Time.Protocol.of_notation_exn "2022-04-27T15:00:00Z"; - block = - Block_hash.of_b58check_exn - "BLockGenesisGenesisGenesisGenesisGenesisbd16dciJxo9"; - protocol = - Protocol_hash.of_b58check_exn - "Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P"; - } - ~genesis_parameters: - { - context_key = "sandbox_parameter"; - values = - `O - [ - ( "genesis_pubkey", - `String "edpkuYLienS3Xdt5c1vfRX1ibMxQuvfM67ByhJ9nmRYYKGAAoTq1UC" - ); - ]; - } - ~chain_name:"TEZOS_JAKARTANET_2022-04-27T15:00:00Z" - ~sandboxed_chain_name:"SANDBOXED_TEZOS" - ~user_activated_upgrades: - [(8192l, "PtJakart2xVj7pYXJBXrqHgd82rdkLey5ZeeGwDgPp9rhQUbSqY")] - ~default_bootstrap_peers: - [ - "jakartanet.teztnets.xyz"; - "jakartanet.boot.ecadinfra.com"; - "jakartanet.kaml.fr"; - "jakartanet.visualtez.com"; - ] - let blockchain_network_kathmandunet = make_blockchain_network ~alias:"kathmandunet" @@ -368,8 +297,6 @@ let builtin_blockchain_networks_with_tags = [ (1, blockchain_network_sandbox); (4, blockchain_network_mainnet); - (16, blockchain_network_hangzhounet); - (18, blockchain_network_jakartanet); (19, blockchain_network_ghostnet); (20, blockchain_network_kathmandunet); ] -- GitLab From 15cc9c4790bb53708f855efe6ee32b47c8222bef Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Mon, 3 Oct 2022 16:19:55 +0200 Subject: [PATCH 4/4] Changelog: update with network config changes --- CHANGES.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index d62bdffa3ddb..0bb30c77b827 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -87,6 +87,14 @@ Node consequence, the storage footprint will be lowered and only the last 6 cycles will be available (10 previously). +- Removed Giganode from the list of bootstrap peers for Mainnet. + +- Removed the ``--network hangzhounet`` and ``--network jakartanet`` + built-in network aliases. + +- Add third user-activated upgrade to the ``--network ghostnet`` built-in + network alias (at level 1191936 for Kathmandu). + Client ------ -- GitLab