yetanotherco · JuArce · Nov 14, 2024 · Oct 21, 2024 · Oct 29, 2024 · Oct 30, 2024
diff --git a/Makefile b/Makefile
@@ -1092,6 +1092,20 @@ ansible_batcher_deploy: ## Deploy the Batcher. Parameters: INVENTORY, KEYSTORE
 		-i $(INVENTORY) \
 		-e "keystore_path=$(KEYSTORE)"
 
+ansible_aggregator_create_env: ## Create empty variables files for the Aggregator deploy
+	@cp -n infra/ansible/playbooks/ini/config-aggregator.ini.example infra/ansible/playbooks/ini/config-aggregator.ini
+	@echo "Config files for the Aggregator created in infra/ansible/playbooks/ini"
+	@echo "Please complete the values and run make ansible_aggregator_deploy"
+
+ansible_aggregator_deploy: ## Deploy the Operator. Parameters: INVENTORY
+	@if [ -z "$(INVENTORY)" ] || [ -z "$(ECDSA_KEYSTORE)" ] || [ -z "$(BLS_KEYSTORE)" ]; then \
+		echo "Error: INVENTORY, ECDSA_KEYSTORE, BLS_KEYSTORE must be set."; \
+		exit 1; \
+	fi
+	@ansible-playbook infra/ansible/playbooks/aggregator.yaml \
+		-i $(INVENTORY) \
+		-e "ecdsa_keystore_path=$(ECDSA_KEYSTORE)" \
+		-e "bls_keystore_path=$(BLS_KEYSTORE)"
 
 ansible_operator_create_env: ## Create empty variables files for the Operator deploy
 	@cp -n infra/ansible/playbooks/ini/config-operator.ini.example infra/ansible/playbooks/ini/config-operator.ini

diff --git a/infra/ansible/README.md b/infra/ansible/README.md
diff --git a/infra/ansible/playbooks/aggregator.yaml b/infra/ansible/playbooks/aggregator.yaml
@@ -0,0 +1,116 @@
+- name: Run setup playbook
+  ansible.builtin.import_playbook: setup.yaml
+  vars:
+    host: aggregator
+
+- name: Run go playbook
+  ansible.builtin.import_playbook: go.yaml
+  vars:
+    host: aggregator
+
+- hosts: aggregator
+  vars:
+    service: "aggregator"
+
+  tasks:
+    - name: Update apt and install required system packages
+      become: true
+      apt:
+        pkg:
+          - pkg-config
+          - libssl-dev
+        state: latest
+        update_cache: true
+      vars:
+        ansible_ssh_user: "{{ admin_user }}"
+
+    - name: Create directories for each service if do not exist
+      file:
+        path: /home/{{ ansible_user }}/repos/{{ service }}
+        state: directory
+        mode: '0755'
+        owner: '{{ ansible_user }}'
+        group: '{{ ansible_user }}'
+      loop:
+        - aggregator
+
+    - name: Clone Aligned repository
+      git:
+        repo: https://github.com/yetanotherco/aligned_layer.git
+        dest: /home/{{ ansible_user }}/repos/{{ service }}/aligned_layer
+        version: v0.10.2
+      loop:
+        - aggregator
+
+    - name: Set permissions for cloned repository
+      file:
+        path: /home/{{ ansible_user }}/repos/{{ service }}/aligned_layer
+        mode: '0755'
+        owner: '{{ ansible_user }}'
+        group: '{{ ansible_user }}'
+        recurse: yes
+
+    - name: Copy ECDSA keystore to server
+      copy:
+        src: '{{ ecdsa_keystore_path }}'
+        dest: /home/{{ ansible_user }}/.keystores/aggregator.ecdsa
+        owner: '{{ ansible_user }}'
+        group: '{{ ansible_user }}'
+
+    - name: Copy BLS keystore to server
+      copy:
+        src: '{{ bls_keystore_path }}'
+        dest: /home/{{ ansible_user }}/.keystores/aggregator.bls
+        owner: '{{ ansible_user }}'
+        group: '{{ ansible_user }}'
+
+    - name: Build aggregator
+      shell: 
+        chdir: /home/{{ ansible_user }}/repos/aggregator/aligned_layer/
+        cmd: /usr/local/go/bin/go build -o /home/{{ ansible_user }}/repos/aggregator/aligned_layer/build/aligned-aggregator /home/{{ ansible_user }}/repos/aggregator/aligned_layer/aggregator/cmd/main.go
+
+    - name: Upload config file for aggregator
+      template:
+        src: config-files/config-aggregator.yaml.j2
+        dest: "/home/{{ ansible_user }}/config/config-aggregator.yaml"
+      vars:
+        aligned_layer_deployment_config_file_path: "{{ lookup('ini', 'aligned_layer_deployment_config_file_path', file='ini/config-aggregator.ini') }}"
+        eigen_layer_deployment_config_file_path: "{{ lookup('ini', 'eigen_layer_deployment_config_file_path', file='ini/config-aggregator.ini') }}"
+        eth_rpc_url: "{{ lookup('ini', 'eth_rpc_url', file='ini/config-aggregator.ini') }}"
+        eth_rpc_url_fallback: "{{ lookup('ini', 'eth_rpc_url_fallback', file='ini/config-aggregator.ini') }}"
+        eth_ws_url: "{{ lookup('ini', 'eth_ws_url', file='ini/config-aggregator.ini') }}"
+        eth_ws_url_fallback: "{{ lookup('ini', 'eth_ws_url_fallback', file='ini/config-aggregator.ini') }}"
+        ecdsa_private_key_store_path: "{{ lookup('ini', 'ecdsa_private_key_store_path', file='ini/config-aggregator.ini') }}"
+        ecdsa_private_key_store_password: "{{ lookup('ini', 'ecdsa_private_key_store_password', file='ini/config-aggregator.ini') }}"
+        bls_private_key_store_path: "{{ lookup('ini', 'bls_private_key_store_path', file='ini/config-aggregator.ini') }}"
+        bls_private_key_store_password: "{{ lookup('ini', 'bls_private_key_store_password', file='ini/config-aggregator.ini') }}"
+        enable_metrics: "{{ lookup('ini', 'enable_metrics', file='ini/config-aggregator.ini') }}"
+        metrics_ip_port_address: "{{ lookup('ini', 'metrics_ip_port_address', file='ini/config-aggregator.ini') }}"
+        telemetry_ip_port_address: "{{ lookup('ini', 'telemetry_ip_port_address', file='ini/config-aggregator.ini') }}" 
+
+    - name: Allow access to tcp port 8090
+      become: true
+      ufw:
+        rule: allow
+        port: 8090
+        proto: tcp
+      vars:
+        ansible_ssh_user: "{{ admin_user }}"
+
+    - name: Create systemd services directory
+      file:
+        path: "/home/{{ ansible_user }}/.config/systemd/user/"
+        state: directory
+
+    - name: Add service to systemd
+      template:
+        src: services/aggregator.service.j2
+        dest: "/home/{{ ansible_user }}/.config/systemd/user/aggregator.service"
+        force: no
+
+    - name: Start aggregator service
+      systemd_service:
+        name: aggregator
+        state: started
+        enabled: true
+        scope: user
diff --git a/infra/ansible/playbooks/batcher.yaml b/infra/ansible/playbooks/batcher.yaml
@@ -97,7 +97,6 @@
         telemetry_ip_port_address: "{{ lookup('ini', 'telemetry_ip_port_address', file='ini/config-batcher.ini') }}"
         batcher_replacement_private_key: "{{ lookup('ini', 'batcher_replacement_private_key', file='ini/config-batcher.ini') }}"
 
-
     - name: Upload env file for batcher
       template:
         src: config-files/env-batcher.j2

diff --git a/infra/ansible/playbooks/docker.yaml b/infra/ansible/playbooks/docker.yaml
@@ -44,4 +44,4 @@
         name: "{{ user }}"
         groups: docker
         append: yes
-        state: present
+        state: present
diff --git a/infra/ansible/playbooks/ini/config-aggregator.ini.example b/infra/ansible/playbooks/ini/config-aggregator.ini.example
@@ -0,0 +1,14 @@
+[global]
+aligned_layer_deployment_config_file_path=
+eigen_layer_deployment_config_file_path=
+eth_rpc_url=
+eth_rpc_url_fallback=
+eth_ws_url=
+eth_ws_url_fallback=
+ecdsa_private_key_store_path=
+ecdsa_private_key_store_password=
+bls_private_key_store_path=
+bls_private_key_store_password=
+enable_metrics=
+metrics_ip_port_address=
+telemetry_ip_port_address=
diff --git a/infra/ansible/playbooks/ini/config-register-operator.ini.example b/infra/ansible/playbooks/ini/config-register-operator.ini.example
@@ -7,4 +7,4 @@ private_key_store_path=
 private_key_store_password=
 chain_id=
 weth_address=
-weth_strategy_address=
+weth_strategy_address=
diff --git a/infra/ansible/playbooks/operator.yaml b/infra/ansible/playbooks/operator.yaml
@@ -162,6 +162,13 @@
       vars:
         ansible_ssh_user: "{{ admin_user }}"
 
+    - name: Build the Operator
+      make:
+        chdir: /home/{{ ansible_user }}/repos/operator/aligned_layer
+        target: build_operator
+      environment:
+        PATH: "{{ ansible_env.PATH }}:/usr/bin:/usr/local/go/bin:/home/{{ ansible_user }}/.cargo/bin"
+
     - name: Create systemd services directory
       file:
         path: "/home/{{ ansible_user }}/.config/systemd/user/"

diff --git a/infra/ansible/playbooks/templates/config-files/config-aggregator.yaml.j2 b/infra/ansible/playbooks/templates/config-files/config-aggregator.yaml.j2
@@ -0,0 +1,32 @@
+# Common variables for all the services
+# 'production' only prints info and above. 'development' also prints debug
+environment: "production"
+aligned_layer_deployment_config_file_path: "{{ aligned_layer_deployment_config_file_path }}"
+eigen_layer_deployment_config_file_path: "{{ eigen_layer_deployment_config_file_path }}"
+eth_rpc_url: "{{ eth_rpc_url }}"
+eth_rpc_url_fallback: "{{ eth_rpc_url_fallback }}"
+eth_ws_url: "{{ eth_ws_url }}"
+eth_ws_url_fallback: "{{ eth_ws_url_fallback }}"
+eigen_metrics_ip_port_address: "localhost:9090"
+
+## ECDSA Configurations
+ecdsa:
+  private_key_store_path: "{{ ecdsa_private_key_store_path }}"
+  private_key_store_password: "{{ ecdsa_private_key_store_password }}"
+
+## BLS Configurations
+bls:
+  private_key_store_path: "{{ bls_private_key_store_path }}"
+  private_key_store_password: "{{ bls_private_key_store_password }}"
+
+## Aggregator Configurations
+aggregator:
+  server_ip_port_address: localhost:8090
+  bls_public_key_compendium_address:
+  avs_service_manager_address:
+  enable_metrics: {{ enable_metrics }}
+  metrics_ip_port_address: "{{ metrics_ip_port_address }}"
+  telemetry_ip_port_address: "{{ telemetry_ip_port_address }}"
+  garbage_collector_period: 2m #The period of the GC process. Suggested value for Prod: '168h' (7 days)
+  garbage_collector_tasks_age: 20 #The age of tasks that will be removed by the GC, in blocks. Suggested value for prod: '216000' (30 days)
+  garbage_collector_tasks_interval: 10 #The interval of queried blocks to get an old batch. Suggested value for prod: '900' (3 hours)
diff --git a/infra/ansible/playbooks/templates/config-files/env-aggregator.j2 b/infra/ansible/playbooks/templates/config-files/env-aggregator.j2
@@ -0,0 +1,6 @@
+AWS_SECRET_ACCESS_KEY={{ secret_access_key }}
+AWS_REGION={{ region }}
+AWS_ACCESS_KEY_ID={{ access_key_id }}
+AWS_BUCKET_NAME={{ bucket_name }}
+DOWNLOAD_ENDPOINT={{ download_endpoint }}
+RUST_LOG={{ log_level }} # info, debug, error, warn, etc.
diff --git a/infra/ansible/playbooks/templates/services/aggregator.service.j2 b/infra/ansible/playbooks/templates/services/aggregator.service.j2
@@ -0,0 +1,15 @@
+[Unit]
+Description=Aggregator
+After=network.target
+
+[Service]
+Type=simple
+WorkingDirectory=/home/{{ ansible_user }}/repos/aggregator/aligned_layer/aggregator
+ExecStart=/home/{{ ansible_user }}/repos/aggregator/aligned_layer/build/aligned-aggregator --config /home/{{ ansible_user }}/config/config-aggregator.yaml
+Restart=always
+RestartSec=1
+StartLimitBurst=100
+LimitNOFILE=100000
+
+[Install]
+WantedBy=multi-user.target
diff --git a/infra/ansible/stage_inventory.yaml b/infra/ansible/stage_inventory.yaml
@@ -1,9 +1,9 @@
 aggregator:
   hosts:
     aligned-holesky-aggregator-1:
-      ansible_host: aligned-ansible
-      ansible_user: admin
-      app_user: app
+      ansible_host: aligned-holesky-stage-1-aggregator
+      admin_user: admin
+      ansible_user: app
       ansible_python_interpreter: /usr/bin/python3
 batcher:
   hosts:

diff --git a/infra/services/avs-sync.service b/infra/services/avs-sync.service
@@ -13,4 +13,4 @@ RestartSec=1
 StartLimitBurst=100
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
diff --git a/infra/services/explorer.service b/infra/services/explorer.service
@@ -13,4 +13,4 @@ RestartSec=1
 StartLimitBurst=100
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
diff --git a/infra/services/operator-1.service b/infra/services/operator-1.service
@@ -12,4 +12,4 @@ RestartSec=1
 StartLimitBurst=100
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
diff --git a/infra/services/prometheus.service b/infra/services/prometheus.service
@@ -10,4 +10,4 @@ ExecStart=/home/ubuntu/prometheus-2.52.0.linux-amd64/prometheus --config.file=/h
 Restart=always
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
diff --git a/infra/services/telemetry.service b/infra/services/telemetry.service
@@ -14,4 +14,4 @@ RestartSec=1
 StartLimitBurst=100
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
diff --git a/infra/services/tracker.service b/infra/services/tracker.service
@@ -12,4 +12,4 @@ RestartSec=1
 StartLimitBurst=100
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target