move to hangzhou (#370)

* move to hangzhou * update lb threshold to match mainnet * change default LB escape value in values.yaml comment to match mainnet
oxheadalpha · Mar 11, 2022 · 47d4783 · 47d4783
1 parent bb879dd
commit 47d4783
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 40 deletions.
diff --git a/charts/tezos/values.yaml b/charts/tezos/values.yaml
@@ -229,7 +229,7 @@ expected_proof_of_work: 26
 ## - If specifying the name of the network, the network's name must be
 ##   recognized by the docker image passed as .Values.images.octez above.
 ## - Additionally, you can pass a url that returns the config.json of the
-##   network. Example: "https://teztnets.xyz/granadanet". In general you
+##   network. Example: "https://teztnets.xyz/mondaynet". In general you
 ##   shouldn't need this and should just specifiy the network's name.
 node_config_network:
   chain_name: mainnet
@@ -241,7 +241,7 @@ protocols:
   # You may want to run two or more if you are expecting an on-chain upgrade.
   # Be mindful that running more protocols will start more containers in your
   # pods which may consume more memory.
-  - command: 010-PtGRANAD
+  - command: 011-PtHangz2
   #- command: alpha
 
 ## Activate a new chain from genesis. Uncommenting this will create an
@@ -250,38 +250,42 @@ protocols:
 ## after chain activation.
 ##
 # activation:
-#   protocol_hash: PtGRANADsDU8R9daYKAgWnQYAJ64omN1o3KMGVCykShA97vQbvV
-#   # parameters.json
-#   protocol_parameters:
+#  protocol_hash: PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx
+#  protocol_parameters:
 #     preserved_cycles: 2
 #     blocks_per_cycle: 8
 #     blocks_per_commitment: 4
 #     blocks_per_roll_snapshot: 4
 #     blocks_per_voting_period: 64
-#     time_between_blocks: ["10", "20"]
-#     endorsers_per_block: 32
-#     hard_gas_limit_per_operation: "800000"
-#     hard_gas_limit_per_block: "8000000"
-#     proof_of_work_threshold: "-1"
+#     time_between_blocks:
+#       - "20"
+#       - "10"
+#     endorsers_per_block: 256
+#     hard_gas_limit_per_operation: "1040000"
+#     hard_gas_limit_per_block: "5200000"
+#     proof_of_work_threshold: "70368744177663"
 #     tokens_per_roll: "8000000000"
-#     michelson_maximum_type_size: 1000
 #     seed_nonce_revelation_tip: "125000"
 #     origination_size: 257
-#     block_security_deposit: "512000000"
-#     endorsement_security_deposit: "64000000"
-#     endorsement_reward: ["2000000", "200000"]
-#     cost_per_byte: "1000"
+#     block_security_deposit: "640000000"
+#     endorsement_security_deposit: "2500000"
+#     baking_reward_per_endorsement:
+#       - "78125"
+#       - "11719"
+#     endorsement_reward:
+#       - "78125"
+#       - "52083"
+#     cost_per_byte: "250"
 #     hard_storage_limit_per_operation: "60000"
 #     quorum_min: 2000
 #     quorum_max: 7000
 #     min_proposal_quorum: 500
-#     initial_endorsers: 1
-#     delay_per_missing_endorsement: "1"
-#     baking_reward_per_endorsement: ["200000", "20000"]
-#     minimal_block_delay: "2"
-#     liquidity_baking_subsidy: "2500000"
-#     liquidity_baking_sunset_level: 525600
-#     liquidity_baking_escape_ema_threshold: 100000
+#     initial_endorsers: 192
+#     delay_per_missing_endorsement: "2"
+#     liquidity_baking_escape_ema_threshold: 666667
+#     liquidity_baking_subsidy: '2500000'
+#     liquidity_baking_sunset_level: 10000000
+#     minimal_block_delay: '5'
 #
 #   # Pass url pointing to additional contracts that you want injected at activation.
 #   # This data is typically too large to pass it directly inside helm chart.

diff --git a/mkchain/tqchain/mkchain.py b/mkchain/tqchain/mkchain.py
@@ -268,7 +268,7 @@ def main():
         parametersYaml = yaml.safe_load(yaml_file)
         activation = {
             "activation": {
-                "protocol_hash": "PtGRANADsDU8R9daYKAgWnQYAJ64omN1o3KMGVCykShA97vQbvV",
+                "protocol_hash": "PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx",
                 "protocol_parameters": parametersYaml,
             },
         }

diff --git a/mkchain/tqchain/parameters.yaml b/mkchain/tqchain/parameters.yaml
@@ -3,27 +3,32 @@ blocks_per_cycle: 8
 blocks_per_commitment: 4
 blocks_per_roll_snapshot: 4
 blocks_per_voting_period: 64
-time_between_blocks: ["10", "20"]
-endorsers_per_block: 32
-hard_gas_limit_per_operation: "800000"
-hard_gas_limit_per_block: "8000000"
-proof_of_work_threshold: "-1"
+time_between_blocks:
+  - "20"
+  - "10"
+endorsers_per_block: 256
+hard_gas_limit_per_operation: "1040000"
+hard_gas_limit_per_block: "5200000"
+proof_of_work_threshold: "70368744177663"
 tokens_per_roll: "8000000000"
-michelson_maximum_type_size: 1000
 seed_nonce_revelation_tip: "125000"
 origination_size: 257
-block_security_deposit: "512000000"
-endorsement_security_deposit: "64000000"
-endorsement_reward: ["2000000"]
-cost_per_byte: "1000"
+block_security_deposit: "640000000"
+endorsement_security_deposit: "2500000"
+baking_reward_per_endorsement:
+  - "78125"
+  - "11719"
+endorsement_reward:
+  - "78125"
+  - "52083"
+cost_per_byte: "250"
 hard_storage_limit_per_operation: "60000"
 quorum_min: 2000
 quorum_max: 7000
 min_proposal_quorum: 500
-initial_endorsers: 1
-delay_per_missing_endorsement: "1"
-baking_reward_per_endorsement: ["200000"]
-minimal_block_delay: "2"
-liquidity_baking_subsidy: "2500000"
-liquidity_baking_sunset_level: 525600
-liquidity_baking_escape_ema_threshold: 100000
+initial_endorsers: 192
+delay_per_missing_endorsement: "2"
+liquidity_baking_escape_ema_threshold: 666667
+liquidity_baking_subsidy: '2500000'
+liquidity_baking_sunset_level: 10000000
+minimal_block_delay: '5'