Update chain spec files

PR #2402 forgot to update the chain specs.

This also adds a script to easily update the spec files for all
networks.

Author: JamesHinshelwood

z2/resources/chain-specs/zq2-devnet.toml

@@ -21,6 +21,5 @@ consensus.minimum_stake = "10_000_000_000_000_000_000_000_000"
 consensus.eth_block_gas_limit = 84000000
 consensus.gas_price = "4_761_904_800_000"
 consensus.scilla_call_gas_exempt_addrs = []
-consensus.contract_upgrade_block_heights = { deposit_v3 = 3600, deposit_v4 = 428400 }
 
 api_servers = [{ port = 4201, enabled_apis = [{ namespace = "eth", apis = ["blockNumber"] }] }, { port = 4202, enabled_apis = ["admin", "debug", "erigon", "eth", "net", "ots", "trace", "txpool", "web3", "zilliqa"] }]

z2/resources/chain-specs/zq2-infratest.toml

@@ -20,6 +20,5 @@ consensus.minimum_stake = "10_000_000_000_000_000_000_000_000"
 consensus.eth_block_gas_limit = 84000000
 consensus.gas_price = "4_761_904_800_000"
 consensus.scilla_call_gas_exempt_addrs = []
-consensus.contract_upgrade_block_heights = { deposit_v4 = 0 }
 
 api_servers = [{ port = 4201, enabled_apis = [{ namespace = "eth", apis = ["blockNumber"] }] }, { port = 4202, enabled_apis = ["admin", "debug", "erigon", "eth", "net", "ots", "trace", "txpool", "web3", "zilliqa"] }]

z2/resources/chain-specs/zq2-perftest.toml

@@ -1,5 +1,9 @@
 p2p_port = 3333
-bootstrap_address = [ "12D3KooWS1GB4h6Et6XZmW1bkrVWo8ur7BWFyZaM9mH6dGUnuMaf", "/dns/bootstrap.zq2-perftest.zilstg.dev/tcp/3333" ]
+
+bootstrap_address = [
+  "12D3KooWS1GB4h6Et6XZmW1bkrVWo8ur7BWFyZaM9mH6dGUnuMaf",
+  "/dns/bootstrap.zq2-perftest.zilstg.dev/tcp/3333"
+]
 
 [[nodes]]
 eth_chain_id = 33469
@@ -16,6 +20,5 @@ consensus.minimum_stake = "10_000_000_000_000_000_000_000_000"
 consensus.eth_block_gas_limit = 84000000
 consensus.gas_price = "4_761_904_800_000"
 consensus.scilla_call_gas_exempt_addrs = []
-consensus.contract_upgrade_block_heights = { deposit_v4 = 0 }
 
 api_servers = [{ port = 4201, enabled_apis = [{ namespace = "eth", apis = ["blockNumber"] }] }, { port = 4202, enabled_apis = ["admin", "debug", "erigon", "eth", "net", "ots", "trace", "txpool", "web3", "zilliqa"] }]

z2/resources/chain-specs/zq2-protomainnet.toml

@@ -27,4 +27,4 @@ consensus.genesis_fork = { at_height = 0, call_mode_1_sets_caller_to_parent_call
 consensus.forks = [
     { at_height = 5342400, failed_scilla_call_from_gas_exempt_caller_causes_revert = true, call_mode_1_sets_caller_to_parent_caller = true },
     { at_height = 7966800, scilla_messages_can_call_evm_contracts = true, scilla_contract_creation_increments_account_balance = true, scilla_json_preserve_order = true },
-]
+]

z2/resources/chain-specs/zq2-prototestnet.toml

@@ -28,4 +28,4 @@ consensus.forks = [
     { at_height = 8404000, failed_scilla_call_from_gas_exempt_caller_causes_revert = true, call_mode_1_sets_caller_to_parent_caller = true },
     { at_height = 10200000, scilla_messages_can_call_evm_contracts = true },
     { at_height = 11152000, scilla_contract_creation_increments_account_balance = true, scilla_json_preserve_order = true },
-]
+]

z2/resources/config.tera.toml

@@ -20,7 +20,9 @@ consensus.minimum_stake = "10_000_000_000_000_000_000_000_000"
 consensus.eth_block_gas_limit = 84000000
 consensus.gas_price = "4_761_904_800_000"
 consensus.scilla_call_gas_exempt_addrs = {{ whitelisted_evm_contract_addresses }}
+{%- if contract_upgrade_block_heights %}
 consensus.contract_upgrade_block_heights = {{ contract_upgrade_block_heights }}
+{%- endif %}
 
 {%- if role == "checkpoint" %}
 # Checkpoint configuration

z2/src/chain.rs

@@ -165,27 +165,22 @@ impl Chain {
     }
 
     // Warning: Contract upgrades occur only at epoch boundaries, ie at block heights which are a multiple of blocks_per_epoch
-    pub fn get_contract_upgrades_block_heights(&self) -> ContractUpgradesBlockHeights {
+    pub fn get_contract_upgrades_block_heights(&self) -> Option<ContractUpgradesBlockHeights> {
         match self {
-            Self::Zq2Devnet => ContractUpgradesBlockHeights {
-                deposit_v3: None,
-                deposit_v4: None,
-                deposit_v5: Some(0),
-            },
-            Self::Zq2ProtoMainnet => ContractUpgradesBlockHeights {
+            Self::Zq2ProtoMainnet => Some(ContractUpgradesBlockHeights {
                 // estimated: 2024-12-20T23:33:12Z
                 deposit_v3: Some(5342400),
                 // estimated: 2025-02-12T13:25:00Z
                 deposit_v4: Some(7966800),
                 deposit_v5: None,
-            },
-            Self::Zq2ProtoTestnet => ContractUpgradesBlockHeights {
+            }),
+            Self::Zq2ProtoTestnet => Some(ContractUpgradesBlockHeights {
                 deposit_v3: Some(8406000),
                 // estimated: 2025-02-03T13:55:00Z
                 deposit_v4: Some(10890000),
                 deposit_v5: None,
-            },
-            _ => ContractUpgradesBlockHeights::default(),
+            }),
+            _ => None,
         }
     }
 

z2/src/chain/node.rs

@@ -895,7 +895,7 @@ impl ChainNode {
         );
         ctx.insert(
             "contract_upgrade_block_heights",
-            &contract_upgrade_block_heights.to_toml().to_string(),
+            &contract_upgrade_block_heights.map(|c| c.to_toml().to_string()),
         );
         // convert json to toml formatting
         let toml_servers: toml::Value = serde_json::from_value(api_servers)?;

z2/update-chain-specs.sh

@@ -0,0 +1 @@
+for network in {protomainnet,prototestnet,devnet,infratest,perftest,richard,uccbtest}; do z2 deployer get-config-file zq2-$network.yaml --out z2/resources/chain-specs/zq2-$network.toml; done