45 Commits
v3.7.2 ... main

Author SHA1 Message Date
103d80f2dc feat: Update en default version to 28.2.1 (#45)
Some checks failed
Release / Release (push) Has been cancelled
CI / Ansible lint (push) Failing after 17s
CI / Lint (push) Has been cancelled
## What 

Update default EN version to 28.2.1

## Why 

Stable version upgrade

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [x] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Documentation comments have been added / updated.
2025-05-23 10:46:56 +02:00
5d8aaa769d feat!: Expose consensus debug port, restart EN on config file change (#42)
Some checks failed
Release / Release (push) Has been cancelled
CI / Lint (push) Has been cancelled
CI / Ansible lint (push) Has been cancelled
## What 

Subj

## Why 

QoL

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [x] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Documentation comments have been added / updated.
2025-04-25 16:54:26 +02:00
17d9ecd1ce feat: (fake release trigger) Bump default EN to v27.2.0 (#41)
## What 

Subj

## Why 

Due to incorrect repo merge settings it was allowed to merge without
squash so commits went to main without semver prefixes and did not
trigger release

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [x] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Documentation comments have been added / updated.
2025-04-25 12:23:39 +02:00
5071bb3423 Merge pull request #39 from matter-labs/update_27.2.0
feat: update default EN version to 27.2.0
2025-04-25 12:05:28 +02:00
fa4f00a62d Merge pull request #40 from matter-labs/consensus-debug-port
feat: Consensus debug config
2025-04-25 12:04:08 +02:00
f3ce6ce204 feat: Consensus debug config 2025-04-25 11:51:05 +02:00
cd5df40065 update EN versio to 27.2.0 2025-04-24 13:08:43 +03:00
4bd3805af1 Merge pull request #38 from matter-labs/docs
Some checks failed
Release / Release (push) Has been cancelled
CI / Lint (push) Has been cancelled
CI / Ansible lint (push) Has been cancelled
chore(docs): Update link to EN mainnet DB backup
2024-12-16 17:45:26 +07:00
8006ed9328 chore(docs): Update link to EN mainnet backup 2024-12-16 17:38:02 +07:00
c497fc0982 Merge pull request #37 from matter-labs/yorik-patch-1
Some checks failed
Release / Release (push) Has been cancelled
CI / Lint (push) Has been cancelled
CI / Ansible lint (push) Has been cancelled
feat: Fake PR to force release
2024-12-04 15:49:30 +01:00
57f3fb74e4 feat: Fake PR to force release 2024-12-04 15:47:39 +01:00
aa018348d8 Merge pull request #36 from matter-labs/gprusak-rate-limit
feat(consensus): bumped inbound connections limit
2024-12-04 15:04:28 +01:00
b8e3b89cf5 bumped inbound connections limit 2024-12-03 17:47:46 +01:00
d276d7b290 Merge pull request #35 from matter-labs/backup-user
Some checks failed
Release / Release (push) Has been cancelled
CI / Lint (push) Has been cancelled
CI / Ansible lint (push) Has been cancelled
feat: Added user with backup permissions only
2024-11-27 15:45:36 +01:00
60333c40da feat: Added user with backup permissions only 2024-11-27 15:24:20 +01:00
2eb2b1f6d4 feat: Added user with backup permissions only 2024-11-27 15:12:12 +01:00
69777ac4e8 feat: Added user with backup permissions only 2024-11-27 15:08:46 +01:00
46e2a6e0e4 feat: Added user with backup permissions only 2024-11-27 14:51:33 +01:00
c5ab63672b Merge pull request #34 from matter-labs/add-more-replication
Some checks failed
Release / Release (push) Has been cancelled
CI / Lint (push) Has been cancelled
CI / Ansible lint (push) Has been cancelled
feat: Configure replication from postgres collection
2024-11-20 18:04:24 +01:00
22a1d06ef7 fix lint 2024-11-20 17:59:52 +01:00
655b461ba5 add libpq-dev 2024-11-20 17:55:22 +01:00
45feed1069 add psycopg2 2024-11-20 17:51:20 +01:00
5298e9f87d add psycopg2 2024-11-20 17:48:55 +01:00
576f8eb252 change priv to role_attr_flags 2024-11-20 17:44:12 +01:00
b672d803f0 fixed lint 2024-11-20 17:01:52 +01:00
5e8657ac3b fixed lint 2024-11-20 17:00:14 +01:00
4f1b6a37ab fixed lint 2024-11-20 16:59:27 +01:00
9034dc5fd4 feat: Configure replication from postgres collection 2024-11-20 16:42:58 +01:00
dac0b0cc80 feat: Configure replication from postgres collection 2024-11-20 16:37:33 +01:00
10ea272736 Merge pull request #33 from matter-labs/fix-type-postgres_replication_interface
fix: Rename variable postgres_replication_bind_address
2024-11-20 10:41:23 +01:00
3fa5c8622b fix: Rename variable postgres_replication_bind_address 2024-11-20 10:40:16 +01:00
64198202a5 Merge pull request #32 from matter-labs/fix-typo
fix: Fixed typo in validation step for replication
2024-11-20 10:36:36 +01:00
0d1717f38a fix: Fixed typo in validation step for replication 2024-11-20 10:35:18 +01:00
13ef869339 Merge pull request #31 from matter-labs/add-replication-vars
Some checks are pending
Release / Release (push) Waiting to run
feat: Added optional postgres replication
2024-11-19 16:35:45 +01:00
cfbaed74f0 Added replication flags 2024-11-19 16:28:13 +01:00
6f1e025785 Added replication flags 2024-11-19 16:26:57 +01:00
f347a9173e feat: Added optional postgres replication 2024-11-19 16:12:31 +01:00
2bf98e9273 feat: Added optional postgres replication 2024-11-19 16:11:28 +01:00
dde435ca95 Merge pull request #30 from matter-labs/fix-snapshot-conf
feat: Bump default EN version, fix snapshot recovery config
2024-10-02 17:23:55 +02:00
8d085aa960 dedup 2024-10-02 17:21:47 +02:00
b85a7d5c65 feat: Bump default EN version, fix snapshot recovery config 2024-10-02 17:18:15 +02:00
6a3c8cb263 Merge pull request #28 from matter-labs/ya-zkd-1817-upgrade-external-nodes-on-hetzner5
fix: Route all consensus traffic to the docker port.
2024-08-13 13:57:35 +02:00
ed4feb99bc fix: Route all consensus traffic to the docker port. 2024-08-13 13:56:28 +02:00
605525c7ba Merge pull request #27 from matter-labs/ya-zkd-1817-upgrade-external-nodes-on-hetzner4
feat: Add traefik configuration for consensus TCP port, open it in firewall
2024-08-13 13:36:58 +02:00
5bdeb0fcfa feat: Add traefik configuration for consensus TCP port, open it in
firewall
2024-08-13 13:32:10 +02:00
11 changed files with 203 additions and 39 deletions

View File

@ -99,10 +99,10 @@ Basic auth secret can be generated by `htpasswd` and `sed` for interpolation:
2. Prepare the latest database backup on your host. you can download it from our public GCS buckets:
Skip this step if you are recovering from a snapshot!
* [Era Mainnet latest dump](https://storage.googleapis.com/zksync-era-mainnet-external-node-backups/external_node_latest.pgdump)
* [Era Mainnet latest dump](https://en-backups.matterlabs.dev/)
* [Era Sepolia Testnet latest dump](https://storage.googleapis.com/zksync-era-testnet-sepolia-external-node-backups/external_node_latest.pgdump)
Downloaded dump file should be placed into `{{ storage_directory }}/pg_backups` directory (`/usr/src/en/pg_backups` by default)
Downloaded dump, if needed, should be unarchived and named `external_node_latest.pgdump`. File should be placed into `{{ storage_directory }}/pg_backups` directory (`/usr/src/en/pg_backups` by default).
3. **OPTIONAL**: If you already have running node, you can copy its tree and state directory to a new host's `{{ storage_directory }}/db`. (`/usr/src/en/db` by default)
Skip this step if you are recovering from a snapshot!

View File

@ -11,7 +11,7 @@ docker_compose_version: "v2.23.0"
# Versions of External Node and 3rd party components
traefik_version: 2.11
postgres_version: 14
external_node_version: 24.16.0
external_node_version: 28.2.1
external_node_raw_docker_tag: ""
vmagent_version: 1.100.1
cadvisor_version: 0.47.2
@ -56,6 +56,17 @@ postgres_arguments:
- max_parallel_maintenance_workers=4
- -c
- checkpoint_timeout=1800
enable_postgres_replication: false
# IP address of the interface replication
postgres_replications_arguments: []
postgres_replica_user_name: ""
postgres_replica_user_password: ""
postgres_replica_auth_method: "scram-sha-256"
postgres_replication_bind_address: ""
postgres_replica_address: ""
backup_db_user: ""
backup_db_password: ""
backup_db_name: ""
# Enable TLS for traefik
enable_tls: false
@ -78,6 +89,10 @@ enable_consensus: false
consensus_secrets_file: ""
consensus_port: 3054
consensus_outbound: []
consensus_debug_port: 5000
enable_consensus_debug_port: false
expose_consensus_debug_port: false
consensus_debug_port_path_prefix: "/consensus_debug"
# External Node and database options
database_name: ""

View File

@ -8,16 +8,16 @@ To run this playbook, first install dependencies
```shell
ansible-galaxy install -r requirements.yml
```
```
and then you can run the playbook using
```shell
ansible-playbook playbook.yml -i hosts.ini -K
```
```
To see logs you can use
```shell
docker logs en-external_node-1
```
docker logs en-external_node-1
```

View File

@ -8,5 +8,10 @@ roles:
version: "v3.3.0"
collections:
- name: community.docker
version: 4.5.2
- name: community.general
version: 8.4.0
# Collection for the replication only.
- name: community.postgresql
version: 3.7.0

8
handlers/main.yml Normal file
View File

@ -0,0 +1,8 @@
---
- name: Restart external-node service
community.docker.docker_compose_v2:
project_src: "{{ configuration_directory }}"
files: "{{ docker_compose_files }}"
state: restarted
services:
- external_node

View File

@ -49,6 +49,23 @@
source: "{{ loadbalancer_ip | mandatory }}"
jump: ACCEPT
- name: Allow consensus port traffic from any IP
when: enable_consensus
ansible.builtin.iptables:
chain: INPUT
protocol: tcp
destination_port: "{{ consensus_port }}"
jump: ACCEPT
- name: Allow postgres replication traffic from replica only
when: enable_postgres_replication
ansible.builtin.iptables:
chain: INPUT
protocol: tcp
destination_port: 5432
source: "{{ postgres_replica_address }}"
jump: ACCEPT
- name: Set default policy to DROP
ansible.builtin.iptables:
chain: INPUT

View File

@ -9,3 +9,7 @@
- name: Prepare configs
ansible.builtin.include_tasks: provision.yml
- name: Configure replication on main instance
ansible.builtin.include_tasks: replication.yml
when: enable_postgres_replication

View File

@ -32,11 +32,35 @@
- l2_chain_id
- l1_chain_id
- name: "Verify that required variables for replication is set"
when: enable_postgres_replication
ansible.builtin.assert:
that:
- postgress_replication_required_var != ""
fail_msg: "{{ postgress_replication_required_var }} needs to be set for the role for postgres replication to work"
success_msg: "Required variable for postgres replication {{ postgress_replication_required_var }} isn't empty"
loop_control:
loop_var: postgress_replication_required_var
with_items:
- enable_postgres_replication
- postgres_replication_bind_address
- postgres_replica_address
- postgres_replications_arguments
- postgres_replica_user_name
- postgres_replica_user_password
- name: Check required en vars empty
ansible.builtin.fail:
msg: "Variable '{{ item }}' is empty"
when: vars[item] == ""
with_items: "{{ en_required_variables }}"
- name: "Verify consensus debug port configuration"
ansible.builtin.fail:
msg: "Cannot expose consensus debug port (expose_consensus_debug_port=true) if it is not enabled (enable_consensus_debug_port=false)."
when:
- enable_consensus
- expose_consensus_debug_port
- not enable_consensus_debug_port
- name: Create main configs
ansible.builtin.template:
@ -50,6 +74,8 @@
dest: "{{ configuration_directory }}/external_node.env"
- src: "templates/postgres.env.j2"
dest: "{{ configuration_directory }}/postgres.env"
loop_control:
label: "{{ item.dest }}"
- name: Create restore script
register: restore_dump_script
@ -82,6 +108,7 @@
src: "templates/consensus_config.yaml.j2"
dest: "{{ configuration_directory }}/consensus_config.yaml"
mode: '0644'
notify: Restart external-node service
- name: Decrypt consensus_secrets
when: enable_consensus
@ -90,24 +117,17 @@
dest: "{{ configuration_directory }}/consensus_secrets.yaml"
decrypt: true
mode: '0600'
notify: Restart external-node service
- name: Run docker-compose without monitoring
when: not enable_monitoring
ansible.builtin.shell:
cmd: nohup docker compose -f docker-compose.yaml up -d </dev/null >/dev/null 2>&1 &
chdir: "{{ configuration_directory }}"
changed_when: false
- name: Set docker compose files list
ansible.builtin.set_fact:
docker_compose_files: "{{ ['docker-compose.yaml'] + (['monitoring.yaml'] if enable_monitoring else []) }}"
- name: Run docker-compose with monitoring
when: enable_monitoring and (not restore_dump_script.changed)
ansible.builtin.shell:
cmd: nohup docker compose -f monitoring.yaml -f docker-compose.yaml up -d </dev/null >/dev/null 2>&1 &
chdir: "{{ configuration_directory }}"
changed_when: false
- name: Run docker-compose with monitoring with recreation
when: enable_monitoring and restore_dump_script.changed
ansible.builtin.shell:
cmd: nohup docker compose -f monitoring.yaml -f docker-compose.yaml up -d --force-recreate </dev/null >/dev/null 2>&1 &
chdir: "{{ configuration_directory }}"
changed_when: false
- name: Run docker compose services (non-blocking)
community.docker.docker_compose_v2:
project_src: "{{ configuration_directory }}"
files: "{{ docker_compose_files }}"
state: present
pull: "{{ docker_pull_policy | default('missing') }}"
recreate: "{{ 'always' if restore_dump_script.changed else 'auto' }}"
wait: false

60
tasks/replication.yml Normal file
View File

@ -0,0 +1,60 @@
---
- name: Install libpq-dev packages
ansible.builtin.apt:
update_cache: true
name: libpq-dev
- name: Install psycopg2 python package
ansible.builtin.pip:
name: psycopg2
- name: Grant user replication access for replication.
community.postgresql.postgresql_pg_hba:
dest: "{{ storage_directory }}/postgres/pg_hba.conf"
contype: host
users: "{{ postgres_replica_user_name }}"
source: "{{ postgres_replica_address }}/32"
databases: replication
method: "{{ postgres_replica_auth_method }}"
- name: Create postgres replication user
community.postgresql.postgresql_user:
login_host: "{{ postgres_replication_bind_address }}"
login_user: "{{ database_username }}"
login_password: "{{ database_password }}"
name: "{{ postgres_replica_user_name }}"
password: "{{ postgres_replica_user_password }}"
role_attr_flags: "REPLICATION"
- name: Create replication slot if doesn't exist
community.postgresql.postgresql_slot:
login_host: "{{ postgres_replication_bind_address }}"
login_user: "{{ database_username }}"
login_password: "{{ database_password }}"
slot_name: replica
- name: Reload postgres configuration
community.postgresql.postgresql_query:
login_host: "{{ postgres_replication_bind_address }}"
login_user: "{{ database_username }}"
login_password: "{{ database_password }}"
query: "SELECT pg_reload_conf()"
- name: Create postgres backup user
community.postgresql.postgresql_user:
login_host: "{{ postgres_replication_bind_address }}"
login_user: "{{ database_username }}"
login_password: "{{ database_password }}"
name: "{{ backup_db_user }}"
password: "{{ backup_db_password }}"
- name: Grant role pg_read_all_data to backup user
community.postgresql.postgresql_membership:
login_host: "{{ postgres_replication_bind_address }}"
login_user: "{{ database_username }}"
login_password: "{{ database_password }}"
group: pg_read_all_data
target_roles:
- "{{ backup_db_user }}"
state: present

View File

@ -1,9 +1,13 @@
server_addr: '0.0.0.0:3054'
public_addr: '{{ ansible_default_ipv4.address }}:{{ consensus_port }}'
max_payload_size: 5000000
gossip_dynamic_inbound_limit: 100
gossip_static_outbound:
{% for item in consensus_outbound %}
- key: {{ item.key }}
addr: {{ item.addr }}
{% endfor %}
gossip_dynamic_inbound_limit: 200
{% if enable_consensus_debug_port %}
debug_page_addr: "0.0.0.0:{{ consensus_debug_port }}"
{% endif %}
rpc_config:
get_block_rate:
burst: 5
refresh: # 0.2s
seconds: 0
nanos: 200000000

View File

@ -8,10 +8,13 @@ services:
- "--log.level=INFO"
- "--providers.docker=true"
- "--providers.docker.exposedbydefault=false"
- "--entrypoints.web.address=:80"
- "--entrypoints.external_node_health.address=:3080"
- "--entryPoints.web.address=:80"
- "--entryPoints.external_node_health.address=:3080"
{% if enable_consensus %}
- "--entryPoints.external_node_consensus.address=:{{ consensus_port }}"
{% endif %}
{% if enable_tls %}
- "--entrypoints.websecure.address=:443"
- "--entryPoints.websecure.address=:443"
- "--certificatesresolvers.en_resolver.acme.tlschallenge=true"
- "--certificatesresolvers.en_resolver.acme.storage=/letsencrypt/acme.json"
- "--certificatesresolvers.myresolver.acme.email={{ acme_email }}"
@ -40,12 +43,21 @@ services:
- ./restore_dump.sh:/docker-entrypoint-initdb.d/restore_dump.sh
env_file:
- postgres.env
{% if enable_postgres_replication %}
ports:
- "{{ postgres_replication_bind_address }}:5432:5432"
{% endif %}
command:
- postgres
- -c
{% for argument in postgres_arguments %}
- {{ argument }}
{% endfor %}
{% if enable_postgres_replication %}
{% for repl_argument in postgres_replications_arguments %}
- {{ repl_argument }}
{% endfor %}
{% endif %}
external_node:
{% if not external_node_raw_docker_tag %}
image: "matterlabs/external-node:v{{ external_node_version }}"
@ -68,7 +80,6 @@ services:
- "traefik.http.routers.external_node_main.entrypoints=web"
{% endif %}
- "traefik.http.routers.external_node_main.service=external_node_main"
- "traefik.http.services.external_node_health.loadbalancer.server.port={{ healthcheck_port }}"
- "traefik.http.routers.external_node_health.rule=PathPrefix(`/`)"
- "traefik.http.routers.external_node_health.entrypoints=external_node_health"
@ -76,6 +87,26 @@ services:
{% if enable_basic_auth %}
- "traefik.http.routers.external_node_main.middlewares=external_node_auth"
- "traefik.http.middlewares.external_node_auth.basicauth.users={{ basic_auth_secret }}"
{% endif %}
{% if enable_consensus %}
- "traefik.tcp.services.external_node_consensus.loadbalancer.server.port={{ consensus_port }}"
- "traefik.tcp.routers.external_node_consensus.rule=HostSNI(`*`)"
- "traefik.tcp.routers.external_node_consensus.entrypoints=external_node_consensus"
- "traefik.tcp.routers.external_node_consensus.service=external_node_consensus"
{% endif %}
{% if enable_consensus and expose_consensus_debug_port %}
- "traefik.http.services.external_node_consensus_debug.loadbalancer.server.port={{ consensus_debug_port }}"
- "traefik.http.routers.external_node_consensus_debug.rule=PathPrefix(`{{ consensus_debug_port_path_prefix }}`)"
{% if enable_tls %}
- "traefik.http.routers.external_node_consensus_debug.entrypoints=websecure"
- "traefik.http.routers.external_node_consensus_debug.tls.certresolver=myresolver"
{% else %}
- "traefik.http.routers.external_node_consensus_debug.entrypoints=web"
{% endif %}
- "traefik.http.routers.external_node_consensus_debug.service=external_node_consensus_debug"
{% if enable_basic_auth %}
- "traefik.http.routers.external_node_consensus_debug.middlewares=external_node_auth"
{% endif %}
{% endif %}
expose:
- {{ rpc_http_port }}
@ -84,6 +115,9 @@ services:
- {{ metrics_port }}
{% if enable_consensus %}
- {{ consensus_port }}
{% if expose_consensus_debug_port %}
- {{ consensus_debug_port }}
{% endif %}
{% endif %}
environment:
ZKSYNC_HOME: "/"
@ -118,9 +152,6 @@ services:
- "external_node.env"
- "postgres.env"
command:
{% if enable_snapshots_recovery %}
- --enable-snapshots-recovery
{% endif %}
{% if enable_consensus %}
- --enable-consensus
secrets: