From 2e5c00476141bbeaeaee92f4b6474083ef5c105e Mon Sep 17 00:00:00 2001 From: Nicolas Ochem Date: Wed, 6 Apr 2022 09:57:47 -0700 Subject: [PATCH 1/2] switch to ithaca as default protocol for priv chains * mkchain produces values.yaml for ithaca chain * example in values.yaml comments is now ithaca * remove any trace of the endorser in our code --- README.md | 10 +-- .../scripts/{baker-endorser.sh => baker.sh} | 8 +- charts/tezos/templates/_containers.tpl | 31 +------- charts/tezos/values.yaml | 74 ++++++++++--------- mkchain/tqchain/mkchain.py | 2 +- mkchain/tqchain/parameters.yaml | 56 +++++++------- 6 files changed, 75 insertions(+), 106 deletions(-) rename charts/tezos/scripts/{baker-endorser.sh => baker.sh} (70%) diff --git a/README.md b/README.md index 34e6a0830..13d4d6516 100644 --- a/README.md +++ b/README.md @@ -305,7 +305,7 @@ Said names are traditionally kebab case. At the statefulset level, the following parameters are allowed: - storage_size: the size of the PV - - runs: a list of containers to run, e.g. "baker", "endorser", "tezedge" + - runs: a list of containers to run, e.g. "baker", "tezedge" - instances: a list of nodes to fire up, each is a dictionary defining: - `bake_using_account`: The name of the account that should be used @@ -330,7 +330,6 @@ nodes: storage_size: 15Gi runs: - baker - - endorser - logger instances: - bake_using_account: baker0 @@ -345,7 +344,6 @@ nodes: tezedge-full-node: runs: - baker - - endorser - logger - tezedge instances: @@ -362,10 +360,10 @@ This will run the following nodes: - `tezedge-full-node-1` - `tezedge-full-node-2` -`baking-node-0` will run baker, endorser, and logger containers +`baking-node-0` will run baker and logger containers and will be the only bootstrap node. `full-node-*` are just nodes -with no extras. `tezedge-full-node-*` will be tezedge nodes running baker, -endorser, and logger containers. +with no extras. `tezedge-full-node-*` will be tezedge nodes running baker +and logger containers. To upgrade your Helm release run: diff --git a/charts/tezos/scripts/baker-endorser.sh b/charts/tezos/scripts/baker.sh similarity index 70% rename from charts/tezos/scripts/baker-endorser.sh rename to charts/tezos/scripts/baker.sh index 6a959ff38..5248aa478 100644 --- a/charts/tezos/scripts/baker-endorser.sh +++ b/charts/tezos/scripts/baker.sh @@ -8,14 +8,10 @@ NODE_DATA_DIR="$TEZ_VAR/node/data" proto_command="{{ .command_in_tpl }}" -if [ "${DAEMON}" == "baker" ]; then - extra_args="with local node $NODE_DATA_DIR" -fi - my_baker_account="$(cat /etc/tezos/baker-account )" CLIENT="$TEZ_BIN/tezos-client -d $CLIENT_DIR" -CMD="$TEZ_BIN/tezos-$DAEMON-$proto_command -d $CLIENT_DIR" +CMD="$TEZ_BIN/tezos-baker-$proto_command -d $CLIENT_DIR" # ensure we can run tezos-client commands without specifying client dir ln -s /var/tezos/client /home/tezos/.tezos-client @@ -24,4 +20,4 @@ while ! $CLIENT rpc get chains/main/blocks/head; do sleep 5 done -exec $CMD run ${extra_args} ${my_baker_account} +exec $CMD run with local node $NODE_DATA_DIR ${my_baker_account} diff --git a/charts/tezos/templates/_containers.tpl b/charts/tezos/templates/_containers.tpl index d9b35a46d..fc51a93d7 100644 --- a/charts/tezos/templates/_containers.tpl +++ b/charts/tezos/templates/_containers.tpl @@ -207,7 +207,7 @@ Below set is a trick to get the range and global context. See: https://github.com/helm/helm/issues/5979#issuecomment-518231758 */}} {{- $_ := set $ "command_in_tpl" .command }} -{{ tpl ($.Files.Get "scripts/baker-endorser.sh") $ | indent 6 }} +{{ tpl ($.Files.Get "scripts/baker.sh") $ | indent 6 }} imagePullPolicy: IfNotPresent name: baker-{{ lower .command }} volumeMounts: @@ -222,35 +222,6 @@ https://github.com/helm/helm/issues/5979#issuecomment-518231758 {{- include "tezos.localvars.pod_envvars" $ | indent 4 }} - name: DAEMON value: baker -{{- if or (regexFind "GRANAD" .command) (regexFind "Hangz" .command) }} -{{- /* -Also start endorser for protocols that need it. -*/}} -- image: "{{ or $node_vals_images.octez $.Values.images.octez }}" - command: - - /bin/sh - args: - - "-c" - - | -{{- $_ := set $ "command_in_tpl" .command }} -{{ tpl ($.Files.Get "scripts/baker-endorser.sh") $ | indent 6 }} - imagePullPolicy: IfNotPresent - name: endorser-{{ lower .command }} - volumeMounts: - - mountPath: /etc/tezos - name: config-volume - - mountPath: /var/tezos - name: var-volume - envFrom: - - configMapRef: - name: tezos-config - - secretRef: - name: tezos-secret - env: -{{- include "tezos.localvars.pod_envvars" $ | indent 4 }} - - name: DAEMON - value: endorser -{{- end }} {{- end }} {{- end }} {{- end }} diff --git a/charts/tezos/values.yaml b/charts/tezos/values.yaml index b9fc3e844..94cd41a42 100644 --- a/charts/tezos/values.yaml +++ b/charts/tezos/values.yaml @@ -250,7 +250,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: 011-PtHangz2 + - command: 012-Psithaca #- command: alpha ## Activate a new chain from genesis. Uncommenting this will create an @@ -259,42 +259,44 @@ protocols: ## after chain activation. ## # activation: -# protocol_hash: PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx +# protocol_hash: Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A # 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: -# - "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" -# seed_nonce_revelation_tip: "125000" -# origination_size: 257 -# 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: 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' +# preserved_cycles: 3 +# blocks_per_cycle: 8 +# blocks_per_commitment: 4 +# blocks_per_stake_snapshot: 4 +# blocks_per_voting_period: 64 +# hard_gas_limit_per_operation: '1040000' +# hard_gas_limit_per_block: '5200000' +# proof_of_work_threshold: '-1' +# tokens_per_roll: '8000000000' +# seed_nonce_revelation_tip: '125000' +# baking_reward_fixed_portion: '10000000' +# baking_reward_bonus_per_slot: '4286' +# endorsing_reward_per_slot: '2857' +# hard_storage_limit_per_operation: '60000' +# origination_size: 257 +# cost_per_byte: '1000' +# quorum_max: 7000 +# quorum_min: 2000 +# min_proposal_quorum: 500 +# liquidity_baking_subsidy: '2500000' +# liquidity_baking_sunset_level: 525600 +# liquidity_baking_escape_ema_threshold: 100000 +# max_operations_time_to_live: 120 +# minimal_block_delay: "5" +# delay_increment_per_round: "5" +# consensus_committee_size: 7000 +# consensus_threshold: 4667 +# minimal_participation_ratio: +# numerator: 2 +# denominator: 3 +# max_slashing_period: 2 +# frozen_deposits_percentage: 10 +# double_baking_punishment: "640000000" +# ratio_of_frozen_deposits_slashed_per_double_endorsement: +# numerator: 1 +# denominator: 2 # # # 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 index 99edba2c0..655a9fb35 100644 --- 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": "PtHangz2aRngywmSRGGvrcTyMbbdpWdpFKuS4uMWxg2RaH9i1qx", + "protocol_hash": "Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A", "protocol_parameters": parametersYaml, }, } diff --git a/mkchain/tqchain/parameters.yaml b/mkchain/tqchain/parameters.yaml index 8714f8e11..54920d9fc 100644 --- a/mkchain/tqchain/parameters.yaml +++ b/mkchain/tqchain/parameters.yaml @@ -1,34 +1,36 @@ -preserved_cycles: 2 +preserved_cycles: 3 blocks_per_cycle: 8 blocks_per_commitment: 4 -blocks_per_roll_snapshot: 4 +blocks_per_stake_snapshot: 4 blocks_per_voting_period: 64 -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" -seed_nonce_revelation_tip: "125000" +hard_gas_limit_per_operation: '1040000' +hard_gas_limit_per_block: '5200000' +proof_of_work_threshold: '-1' +tokens_per_roll: '8000000000' +seed_nonce_revelation_tip: '125000' +baking_reward_fixed_portion: '10000000' +baking_reward_bonus_per_slot: '4286' +endorsing_reward_per_slot: '2857' +hard_storage_limit_per_operation: '60000' origination_size: 257 -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 +cost_per_byte: '1000' quorum_max: 7000 +quorum_min: 2000 min_proposal_quorum: 500 -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' +liquidity_baking_sunset_level: 525600 +liquidity_baking_escape_ema_threshold: 100000 +max_operations_time_to_live: 120 +minimal_block_delay: "5" +delay_increment_per_round: "5" +consensus_committee_size: 7000 +consensus_threshold: 4667 +minimal_participation_ratio: + numerator: 2 + denominator: 3 +max_slashing_period: 2 +frozen_deposits_percentage: 10 +double_baking_punishment: "640000000" +ratio_of_frozen_deposits_slashed_per_double_endorsement: + numerator: 1 + denominator: 2 From 78d845075113564c34a526ff37978f42207d5e06 Mon Sep 17 00:00:00 2001 From: Nicolas Ochem Date: Wed, 6 Apr 2022 15:21:58 -0700 Subject: [PATCH 2/2] redo the tests with ithaca --- test/charts/mainnet.expect | 1 - test/charts/mainnet2.expect | 1 - test/charts/private-chain.expect | 274 +++++-------------------------- test/charts/private-chain.in | 55 ++++--- 4 files changed, 71 insertions(+), 260 deletions(-) diff --git a/test/charts/mainnet.expect b/test/charts/mainnet.expect index acf702633..b953f9ae9 100644 --- a/test/charts/mainnet.expect +++ b/test/charts/mainnet.expect @@ -34,7 +34,6 @@ data: null NODES: | - { "rolling-node": { "instances": [ diff --git a/test/charts/mainnet2.expect b/test/charts/mainnet2.expect index 26e11d1dc..4c7dd9325 100644 --- a/test/charts/mainnet2.expect +++ b/test/charts/mainnet2.expect @@ -34,7 +34,6 @@ data: null NODES: | - { "city-block": { "instances": [ diff --git a/test/charts/private-chain.expect b/test/charts/private-chain.expect index e57364caa..5185397bc 100644 --- a/test/charts/private-chain.expect +++ b/test/charts/private-chain.expect @@ -33,43 +33,45 @@ data: "protocol_activation": { "deterministic_faucet_number_of_accounts": 1000, "deterministic_faucet_seed": "oM0TxIV5gYNVd0T9kasdfnv352", - "protocol_hash": "PtGRANADsDU8R9daYKAgWnQYAJ64omN1o3KMGVCykShA97vQbvV", + "protocol_hash": "Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A", "protocol_parameters": { - "baking_reward_per_endorsement": [ - "200000" - ], - "block_security_deposit": "512000000", + "baking_reward_bonus_per_slot": "4286", + "baking_reward_fixed_portion": "10000000", "blocks_per_commitment": 4, "blocks_per_cycle": 8, - "blocks_per_roll_snapshot": 4, + "blocks_per_stake_snapshot": 4, "blocks_per_voting_period": 64, + "consensus_committee_size": 7000, + "consensus_threshold": 4667, "cost_per_byte": "1000", - "delay_per_missing_endorsement": "1", - "endorsement_reward": [ - "2000000" - ], - "endorsement_security_deposit": "64000000", - "endorsers_per_block": 32, - "hard_gas_limit_per_block": "8000000", - "hard_gas_limit_per_operation": "800000", + "delay_increment_per_round": "5", + "double_baking_punishment": "640000000", + "endorsing_reward_per_slot": "2857", + "frozen_deposits_percentage": 10, + "hard_gas_limit_per_block": "5200000", + "hard_gas_limit_per_operation": "1040000", "hard_storage_limit_per_operation": "60000", - "initial_endorsers": 1, "liquidity_baking_escape_ema_threshold": 100000, "liquidity_baking_subsidy": "2500000", "liquidity_baking_sunset_level": 525600, - "michelson_maximum_type_size": 1000, + "max_operations_time_to_live": 120, + "max_slashing_period": 2, "min_proposal_quorum": 500, - "minimal_block_delay": "2", + "minimal_block_delay": "5", + "minimal_participation_ratio": { + "denominator": 3, + "numerator": 2 + }, "origination_size": 257, - "preserved_cycles": 2, + "preserved_cycles": 3, "proof_of_work_threshold": "-1", "quorum_max": 7000, "quorum_min": 2000, + "ratio_of_frozen_deposits_slashed_per_double_endorsement": { + "denominator": 2, + "numerator": 1 + }, "seed_nonce_revelation_tip": "125000", - "time_between_blocks": [ - "10", - "20" - ], "tokens_per_roll": "8000000000" } } @@ -82,7 +84,6 @@ data: null NODES: | - { "af": { "instances": [ @@ -293,16 +294,12 @@ spec: NODE_DIR="$TEZ_VAR/node" NODE_DATA_DIR="$TEZ_VAR/node/data" - proto_command="011-PtHangz2" - - if [ "${DAEMON}" == "baker" ]; then - extra_args="with local node $NODE_DATA_DIR" - fi + proto_command="012-Psithaca" my_baker_account="$(cat /etc/tezos/baker-account )" CLIENT="$TEZ_BIN/tezos-client -d $CLIENT_DIR" - CMD="$TEZ_BIN/tezos-$DAEMON-$proto_command -d $CLIENT_DIR" + CMD="$TEZ_BIN/tezos-baker-$proto_command -d $CLIENT_DIR" # ensure we can run tezos-client commands without specifying client dir ln -s /var/tezos/client /home/tezos/.tezos-client @@ -311,10 +308,10 @@ spec: sleep 5 done - exec $CMD run ${extra_args} ${my_baker_account} + exec $CMD run with local node $NODE_DATA_DIR ${my_baker_account} imagePullPolicy: IfNotPresent - name: baker-011-pthangz2 + name: baker-012-psithaca volumeMounts: - mountPath: /etc/tezos name: config-volume @@ -337,68 +334,7 @@ spec: - name: MY_NODE_CLASS value: af - name: DAEMON - value: baker - - image: "tezos/tezos:v12-release" - command: - - /bin/sh - args: - - "-c" - - | - set -ex - - TEZ_VAR=/var/tezos - TEZ_BIN=/usr/local/bin - CLIENT_DIR="$TEZ_VAR/client" - NODE_DIR="$TEZ_VAR/node" - NODE_DATA_DIR="$TEZ_VAR/node/data" - - proto_command="011-PtHangz2" - - if [ "${DAEMON}" == "baker" ]; then - extra_args="with local node $NODE_DATA_DIR" - fi - - my_baker_account="$(cat /etc/tezos/baker-account )" - - CLIENT="$TEZ_BIN/tezos-client -d $CLIENT_DIR" - CMD="$TEZ_BIN/tezos-$DAEMON-$proto_command -d $CLIENT_DIR" - - # ensure we can run tezos-client commands without specifying client dir - ln -s /var/tezos/client /home/tezos/.tezos-client - - while ! $CLIENT rpc get chains/main/blocks/head; do - sleep 5 - done - - exec $CMD run ${extra_args} ${my_baker_account} - - imagePullPolicy: IfNotPresent - name: endorser-011-pthangz2 - volumeMounts: - - mountPath: /etc/tezos - name: config-volume - - mountPath: /var/tezos - name: var-volume - envFrom: - - configMapRef: - name: tezos-config - - secretRef: - name: tezos-secret - env: - - name: MY_POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - - name: MY_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: MY_POD_TYPE - value: node - - name: MY_NODE_CLASS - value: af - - name: DAEMON - value: endorser + value: baker - image: "tezos-k8s-utils:dev" imagePullPolicy: IfNotPresent name: logger @@ -840,75 +776,12 @@ spec: NODE_DIR="$TEZ_VAR/node" NODE_DATA_DIR="$TEZ_VAR/node/data" - proto_command="011-PtHangz2" - - if [ "${DAEMON}" == "baker" ]; then - extra_args="with local node $NODE_DATA_DIR" - fi - - my_baker_account="$(cat /etc/tezos/baker-account )" - - CLIENT="$TEZ_BIN/tezos-client -d $CLIENT_DIR" - CMD="$TEZ_BIN/tezos-$DAEMON-$proto_command -d $CLIENT_DIR" - - # ensure we can run tezos-client commands without specifying client dir - ln -s /var/tezos/client /home/tezos/.tezos-client - - while ! $CLIENT rpc get chains/main/blocks/head; do - sleep 5 - done - - exec $CMD run ${extra_args} ${my_baker_account} - - imagePullPolicy: IfNotPresent - name: baker-011-pthangz2 - volumeMounts: - - mountPath: /etc/tezos - name: config-volume - - mountPath: /var/tezos - name: var-volume - envFrom: - - configMapRef: - name: tezos-config - env: - - name: MY_POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - - name: MY_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: MY_POD_TYPE - value: node - - name: MY_NODE_CLASS - value: eu - - name: DAEMON - value: baker - - image: "tezos/tezos:v10-release" - command: - - /bin/sh - args: - - "-c" - - | - set -ex - - TEZ_VAR=/var/tezos - TEZ_BIN=/usr/local/bin - CLIENT_DIR="$TEZ_VAR/client" - NODE_DIR="$TEZ_VAR/node" - NODE_DATA_DIR="$TEZ_VAR/node/data" - - proto_command="011-PtHangz2" - - if [ "${DAEMON}" == "baker" ]; then - extra_args="with local node $NODE_DATA_DIR" - fi + proto_command="012-Psithaca" my_baker_account="$(cat /etc/tezos/baker-account )" CLIENT="$TEZ_BIN/tezos-client -d $CLIENT_DIR" - CMD="$TEZ_BIN/tezos-$DAEMON-$proto_command -d $CLIENT_DIR" + CMD="$TEZ_BIN/tezos-baker-$proto_command -d $CLIENT_DIR" # ensure we can run tezos-client commands without specifying client dir ln -s /var/tezos/client /home/tezos/.tezos-client @@ -917,10 +790,10 @@ spec: sleep 5 done - exec $CMD run ${extra_args} ${my_baker_account} + exec $CMD run with local node $NODE_DATA_DIR ${my_baker_account} imagePullPolicy: IfNotPresent - name: endorser-011-pthangz2 + name: baker-012-psithaca volumeMounts: - mountPath: /etc/tezos name: config-volume @@ -929,8 +802,6 @@ spec: envFrom: - configMapRef: name: tezos-config - - secretRef: - name: tezos-secret env: - name: MY_POD_IP valueFrom: @@ -945,7 +816,7 @@ spec: - name: MY_NODE_CLASS value: eu - name: DAEMON - value: endorser + value: baker - image: "tezos-k8s-utils:dev" imagePullPolicy: IfNotPresent name: logger @@ -1205,16 +1076,12 @@ spec: NODE_DIR="$TEZ_VAR/node" NODE_DATA_DIR="$TEZ_VAR/node/data" - proto_command="011-PtHangz2" - - if [ "${DAEMON}" == "baker" ]; then - extra_args="with local node $NODE_DATA_DIR" - fi + proto_command="012-Psithaca" my_baker_account="$(cat /etc/tezos/baker-account )" CLIENT="$TEZ_BIN/tezos-client -d $CLIENT_DIR" - CMD="$TEZ_BIN/tezos-$DAEMON-$proto_command -d $CLIENT_DIR" + CMD="$TEZ_BIN/tezos-baker-$proto_command -d $CLIENT_DIR" # ensure we can run tezos-client commands without specifying client dir ln -s /var/tezos/client /home/tezos/.tezos-client @@ -1223,10 +1090,10 @@ spec: sleep 5 done - exec $CMD run ${extra_args} ${my_baker_account} + exec $CMD run with local node $NODE_DATA_DIR ${my_baker_account} imagePullPolicy: IfNotPresent - name: baker-011-pthangz2 + name: baker-012-psithaca volumeMounts: - mountPath: /etc/tezos name: config-volume @@ -1249,68 +1116,7 @@ spec: - name: MY_NODE_CLASS value: us - name: DAEMON - value: baker - - image: "tezos/tezos:v12-release" - command: - - /bin/sh - args: - - "-c" - - | - set -ex - - TEZ_VAR=/var/tezos - TEZ_BIN=/usr/local/bin - CLIENT_DIR="$TEZ_VAR/client" - NODE_DIR="$TEZ_VAR/node" - NODE_DATA_DIR="$TEZ_VAR/node/data" - - proto_command="011-PtHangz2" - - if [ "${DAEMON}" == "baker" ]; then - extra_args="with local node $NODE_DATA_DIR" - fi - - my_baker_account="$(cat /etc/tezos/baker-account )" - - CLIENT="$TEZ_BIN/tezos-client -d $CLIENT_DIR" - CMD="$TEZ_BIN/tezos-$DAEMON-$proto_command -d $CLIENT_DIR" - - # ensure we can run tezos-client commands without specifying client dir - ln -s /var/tezos/client /home/tezos/.tezos-client - - while ! $CLIENT rpc get chains/main/blocks/head; do - sleep 5 - done - - exec $CMD run ${extra_args} ${my_baker_account} - - imagePullPolicy: IfNotPresent - name: endorser-011-pthangz2 - volumeMounts: - - mountPath: /etc/tezos - name: config-volume - - mountPath: /var/tezos - name: var-volume - envFrom: - - configMapRef: - name: tezos-config - - secretRef: - name: tezos-secret - env: - - name: MY_POD_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - - name: MY_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: MY_POD_TYPE - value: node - - name: MY_NODE_CLASS - value: us - - name: DAEMON - value: endorser + value: baker - command: - python args: @@ -1531,7 +1337,7 @@ spec: echo Activating chain: $CLIENT -d /var/tezos/client --block \ genesis activate protocol \ - PtGRANADsDU8R9daYKAgWnQYAJ64omN1o3KMGVCykShA97vQbvV \ + Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A \ with fitness -1 and key \ $( cat /etc/tezos/activation_account_name ) \ and parameters /etc/tezos/parameters.json 2>&1 | head -200 diff --git a/test/charts/private-chain.in b/test/charts/private-chain.in index b430b80a9..f0749011b 100644 --- a/test/charts/private-chain.in +++ b/test/charts/private-chain.in @@ -10,37 +10,44 @@ activation: deterministic_faucet_seed: oM0TxIV5gYNVd0T9kasdfnv352 deterministic_faucet_number_of_accounts: 1000 - protocol_hash: PtGRANADsDU8R9daYKAgWnQYAJ64omN1o3KMGVCykShA97vQbvV + protocol_hash: Psithaca2MLRFYargivpo7YvUr7wUDqyxrdhC5CQq78mRvimz6A protocol_parameters: - baking_reward_per_endorsement: ['200000'] - block_security_deposit: '512000000' - blocks_per_commitment: 4 + preserved_cycles: 3 blocks_per_cycle: 8 - blocks_per_roll_snapshot: 4 + blocks_per_commitment: 4 + blocks_per_stake_snapshot: 4 blocks_per_voting_period: 64 - cost_per_byte: '1000' - delay_per_missing_endorsement: '1' - endorsement_reward: ['2000000'] - endorsement_security_deposit: '64000000' - endorsers_per_block: 32 - hard_gas_limit_per_block: '8000000' - hard_gas_limit_per_operation: '800000' + hard_gas_limit_per_operation: '1040000' + hard_gas_limit_per_block: '5200000' + proof_of_work_threshold: '-1' + tokens_per_roll: '8000000000' + seed_nonce_revelation_tip: '125000' + baking_reward_fixed_portion: '10000000' + baking_reward_bonus_per_slot: '4286' + endorsing_reward_per_slot: '2857' hard_storage_limit_per_operation: '60000' - initial_endorsers: 1 - liquidity_baking_escape_ema_threshold: 100000 - liquidity_baking_subsidy: '2500000' - liquidity_baking_sunset_level: 525600 - michelson_maximum_type_size: 1000 - min_proposal_quorum: 500 - minimal_block_delay: '2' origination_size: 257 - preserved_cycles: 2 - proof_of_work_threshold: '-1' + cost_per_byte: '1000' quorum_max: 7000 quorum_min: 2000 - seed_nonce_revelation_tip: '125000' - time_between_blocks: ['10', '20'] - tokens_per_roll: '8000000000' + min_proposal_quorum: 500 + liquidity_baking_subsidy: '2500000' + liquidity_baking_sunset_level: 525600 + liquidity_baking_escape_ema_threshold: 100000 + max_operations_time_to_live: 120 + minimal_block_delay: "5" + delay_increment_per_round: "5" + consensus_committee_size: 7000 + consensus_threshold: 4667 + minimal_participation_ratio: + numerator: 2 + denominator: 3 + max_slashing_period: 2 + frozen_deposits_percentage: 10 + double_baking_punishment: "640000000" + ratio_of_frozen_deposits_slashed_per_double_endorsement: + numerator: 1 + denominator: 2 bootstrap_peers: [] expected_proof_of_work: 0 full_snapshot_url: null