fixes

Author: JuArce

Makefile

@@ -1736,41 +1736,61 @@ postgres_status: ## Check PostgreSQL cluster status. Usage: make postgres_status
 # ------------------------------------------------------------------------------
 
 .PHONY: gateway_deploy
-gateway_deploy: ## Deploy Gateway & Poller on both servers. Usage: make gateway_deploy ENV=hoodi
+gateway_deploy: ## Deploy Gateway & Poller on both servers. Usage: make gateway_deploy ENV=hoodi [FORCE_REBUILD=true]
 	@if [ -z "$(ENV)" ]; then \
 		echo "Error: ENV must be set (hoodi or mainnet)"; \
 		exit 1; \
 	fi
-	@ansible-playbook $(AGG_MODE_PLAYBOOKS_DIR)/gateway_stack.yaml \
+	@EXTRA_VARS=""; \
+	if [ -n "$(FORCE_REBUILD)" ]; then \
+		EXTRA_VARS="-e force_rebuild=true"; \
+	fi; \
+	ansible-playbook $(AGG_MODE_PLAYBOOKS_DIR)/gateway_stack.yaml \
 		-i $(AGG_MODE_ANSIBLE_DIR)/$(ENV)-inventory.yaml \
 		-e "host=gateway_primary" \
-		-e "env=$(ENV)"
-	@ansible-playbook $(AGG_MODE_PLAYBOOKS_DIR)/gateway_stack.yaml \
+		-e "env=$(ENV)" \
+		$$EXTRA_VARS
+	@EXTRA_VARS=""; \
+	if [ -n "$(FORCE_REBUILD)" ]; then \
+		EXTRA_VARS="-e force_rebuild=true"; \
+	fi; \
+	ansible-playbook $(AGG_MODE_PLAYBOOKS_DIR)/gateway_stack.yaml \
 		-i $(AGG_MODE_ANSIBLE_DIR)/$(ENV)-inventory.yaml \
 		-e "host=gateway_secondary" \
-		-e "env=$(ENV)"
+		-e "env=$(ENV)" \
+		$$EXTRA_VARS
 
 .PHONY: gateway_primary_deploy
-gateway_primary_deploy: ## Deploy Gateway & Poller on primary only. Usage: make gateway_primary_deploy ENV=hoodi
+gateway_primary_deploy: ## Deploy Gateway & Poller on primary only. Usage: make gateway_primary_deploy ENV=hoodi [FORCE_REBUILD=true]
 	@if [ -z "$(ENV)" ]; then \
 		echo "Error: ENV must be set (hoodi or mainnet)"; \
 		exit 1; \
 	fi
-	@ansible-playbook $(AGG_MODE_PLAYBOOKS_DIR)/gateway_stack.yaml \
+	@EXTRA_VARS=""; \
+	if [ -n "$(FORCE_REBUILD)" ]; then \
+		EXTRA_VARS="-e force_rebuild=true"; \
+	fi; \
+	ansible-playbook $(AGG_MODE_PLAYBOOKS_DIR)/gateway_stack.yaml \
 		-i $(AGG_MODE_ANSIBLE_DIR)/$(ENV)-inventory.yaml \
 		-e "host=gateway_primary" \
-		-e "env=$(ENV)"
+		-e "env=$(ENV)" \
+		$$EXTRA_VARS
 
 .PHONY: gateway_secondary_deploy
-gateway_secondary_deploy: ## Deploy Gateway & Poller on secondary only. Usage: make gateway_secondary_deploy ENV=hoodi
+gateway_secondary_deploy: ## Deploy Gateway & Poller on secondary only. Usage: make gateway_secondary_deploy ENV=hoodi [FORCE_REBUILD=true]
 	@if [ -z "$(ENV)" ]; then \
 		echo "Error: ENV must be set (hoodi or mainnet)"; \
 		exit 1; \
 	fi
-	@ansible-playbook $(AGG_MODE_PLAYBOOKS_DIR)/gateway_stack.yaml \
+	@EXTRA_VARS=""; \
+	if [ -n "$(FORCE_REBUILD)" ]; then \
+		EXTRA_VARS="-e force_rebuild=true"; \
+	fi; \
+	ansible-playbook $(AGG_MODE_PLAYBOOKS_DIR)/gateway_stack.yaml \
 		-i $(AGG_MODE_ANSIBLE_DIR)/$(ENV)-inventory.yaml \
 		-e "host=gateway_secondary" \
-		-e "env=$(ENV)"
+		-e "env=$(ENV)" \
+		$$EXTRA_VARS
 
 # ------------------------------------------------------------------------------
 # Metrics Deployment

infra/aggregation_mode/ansible/README.md

@@ -246,8 +246,13 @@ make gateway_deploy ENV=hoodi
 # Or deploy individually
 make gateway_primary_deploy ENV=hoodi
 make gateway_secondary_deploy ENV=hoodi
+
+# Force rebuild (always rebuild binaries from latest code)
+make gateway_deploy ENV=hoodi FORCE_REBUILD=true
 ```
 
+**Note:** By default, the deployment is idempotent and skips building if the binary already exists. Use `FORCE_REBUILD=true` to always rebuild from the latest code in the repository.
+
 **Verify gateway is running:**
 ```bash
 ssh app@agg-mode-hoodi-gateway-1 "sudo systemctl status gateway"
@@ -539,22 +544,49 @@ ansible-playbook infra/aggregation_mode/ansible/playbooks/gateway.yaml \
   -i infra/aggregation_mode/ansible/hoodi-inventory.yaml \
   -e "host=gateway_primary" \
   -e "env=hoodi"
+
+# Deploy gateway with forced rebuild
+ansible-playbook infra/aggregation_mode/ansible/playbooks/gateway.yaml \
+  -i infra/aggregation_mode/ansible/hoodi-inventory.yaml \
+  -e "host=gateway_primary" \
+  -e "env=hoodi" \
+  -e "force_rebuild=true"
 ```
 
 ### Updating Services
 
-**Update gateway code:**
+**Update gateway and poller with latest code:**
+
+The easiest way to update services is using the `FORCE_REBUILD` parameter:
+
+```bash
+# Update both primary and secondary
+make gateway_deploy ENV=hoodi FORCE_REBUILD=true
+
+# Or update individually
+make gateway_primary_deploy ENV=hoodi FORCE_REBUILD=true
+make gateway_secondary_deploy ENV=hoodi FORCE_REBUILD=true
+```
+
+This will:
+1. Pull latest code from the configured branch (staging for hoodi, main for mainnet)
+2. Delete existing binaries
+3. Rebuild gateway and poller from source
+4. Restart the services
+
+**Manual update (alternative):**
+
+If you prefer to update manually:
+
 ```bash
+# Gateway
 ssh app@agg-mode-hoodi-gateway-1
 cd ~/repos/gateway/aligned_layer
 git pull origin staging
 cargo install --path aggregation_mode/gateway --bin gateway --features tls --locked
 sudo systemctl restart gateway
-```
 
-**Update poller code:**
-```bash
-ssh app@agg-mode-hoodi-gateway-1
+# Poller
 cd ~/repos/poller/aligned_layer
 git pull origin staging
 cargo install --path aggregation_mode/payments_poller --bin payments_poller --locked
@@ -563,16 +595,21 @@ systemctl --user restart poller
 
 ### Redeploy with Latest Code
 
-To redeploy with the latest code from git, simply run the deployment again:
+**Idempotent deployment (skip if binary exists):**
 
 ```bash
 make gateway_deploy ENV=hoodi
 ```
 
-The playbooks will:
-1. Pull latest code from the configured branch
-2. Rebuild the binaries
-3. Restart the services
+This pulls the latest code but skips building if the binary already exists. Use this when you only want to update configuration files.
+
+**Force rebuild (always rebuild binaries):**
+
+```bash
+make gateway_deploy ENV=hoodi FORCE_REBUILD=true
+```
+
+This always rebuilds binaries from the latest code, even if they already exist. Use this when you want to deploy code changes.
 
 ### Changing Configuration
 

infra/aggregation_mode/ansible/playbooks/gateway.yaml

@@ -85,6 +85,12 @@
         version: "{{ git_branch }}"
         update: yes
 
+    - name: Remove existing gateway binary (if force rebuild)
+      file:
+        path: /home/{{ ansible_user }}/.cargo/bin/gateway
+        state: absent
+      when: force_rebuild | default(false) | bool
+
     - name: Build gateway with TLS
       shell: |
         export PATH=$HOME/.cargo/bin:$PATH

infra/aggregation_mode/ansible/playbooks/ini/config-mainnet.ini

@@ -59,7 +59,7 @@ gateway_tls_key_path=/home/app/.ssl/key.pem
 
 # Poller Service Settings (same for all pollers)
 poller_last_block_fetched_filepath=/home/app/config/proof-aggregator.last_block_fetched.json
-last_block_fetched_initial_value=0
+last_block_fetched_initial_value=24235289
 
 # ============================================
 # TLS Certificate Management

infra/aggregation_mode/ansible/playbooks/pg_node.yaml

@@ -126,6 +126,14 @@
       register: is_writable
       changed_when: false
 
+    - name: Set password for autoctl_node user in agg_mode database
+      become: true
+      become_user: postgres
+      shell: |
+        psql -d {{ db_name }} -c "ALTER USER {{ db_user }} PASSWORD '{{ db_password }}';"
+      when: is_writable.stdout == 't'
+      no_log: true
+
     - name: Set password for pgautofailover_replicator user
       become: true
       become_user: postgres

infra/aggregation_mode/ansible/playbooks/poller.yaml

@@ -55,6 +55,12 @@
         version: "{{ git_branch }}"
         update: yes
 
+    - name: Remove existing poller binary (if force rebuild)
+      file:
+        path: /home/{{ ansible_user }}/.cargo/bin/payments_poller
+        state: absent
+      when: force_rebuild | default(false) | bool
+
     - name: Build poller
       shell: |
         export PATH=$HOME/.cargo/bin:$PATH
@@ -70,14 +76,19 @@
         owner: "{{ ansible_user }}"
         group: "{{ ansible_user }}"
 
-    - name: Create last_block_fetched file
+    - name: Check if last_block_fetched file exists and get size
+      stat:
+        path: "{{ poller_last_block_fetched_filepath }}"
+      register: last_block_file
+
+    - name: Create or fix last_block_fetched file if empty or missing
       copy:
-        content: '{"last_block_fetched":{{ last_block_fetched_initial_value }}}'
+        content: '{"last_block_fetched": {{ last_block_fetched_initial_value }}}'
         dest: "{{ poller_last_block_fetched_filepath }}"
         mode: '0644'
         owner: "{{ ansible_user }}"
         group: "{{ ansible_user }}"
-        force: no
+      when: not last_block_file.stat.exists or last_block_file.stat.size == 0
 
     - name: Template poller config file
       template: