checker.py

@@ -1,374 +0,0 @@
-# flake8: noqa
-# pylint: disable=broad-exception-raised, raise-missing-from, too-many-arguments, redefined-outer-name
-# pylance: disable=reportMissingImports, reportMissingModuleSource, reportGeneralTypeIssues
-# type: ignore
-
-import warnings
-warnings.filterwarnings("ignore", category=Warning)
-
-import re
-from datetime import datetime, timedelta, timezone
-import subprocess
-import os
-import time
-import random
-import sys
-import pkg_resources
-import requests
-import json
-from collections import deque
-
-required_packages = {
-    'grist-api': 'latest',
-    'colorama': 'latest',
-    'requests': '2.31.0',
-    'urllib3': '2.0.7',
-    'charset-normalizer': '3.3.2'
-}
-
-installed_packages = {pkg.key: pkg.version for pkg in pkg_resources.working_set}
-
-for package, version in required_packages.items():
-    if package not in installed_packages or (version != 'latest' and installed_packages[package] != version):
-        if version == 'latest':
-            subprocess.check_call([sys.executable, '-m', 'pip', 'install', package, '--break-system-packages'])
-        else:
-            subprocess.check_call([sys.executable, '-m', 'pip', 'install', f"{package}=={version}", '--break-system-packages'])
-
-from grist_api import GristDocAPI
-import colorama
-
-import logging
-import socket
-
-def self_update(logger):
-    logger.info("Checking for updates..")
-    script_path = os.path.abspath(__file__)
-    update_url = "https://gitea.vvzvlad.xyz/vvzvlad/ritual/raw/branch/main-22aug/checker.py"
-    try:
-        response = requests.get(update_url, timeout=10)
-        if response.status_code == 200:
-            current_content = ""
-            with open(script_path, 'r', encoding='utf-8') as f:
-                current_content = f.read()
-            
-            if current_content != response.text:
-                with open(script_path, 'w', encoding='utf-8') as f:
-                    f.write(response.text)
-                logger.info("Script updated successfully, restarting")
-                os.execv(sys.executable, ['python3'] + sys.argv)
-            else:
-                logger.info("Script is up to date")
-        else:
-            logger.error(f"Failed to download update, status code: {response.status_code}")
-    except Exception as e:
-        logger.error(f"Update error: {str(e)}")
-
-class GRIST:
-    def __init__(self, server, doc_id, api_key, logger):
-        self.server = server
-        self.doc_id = doc_id
-        self.api_key = api_key
-        self.logger = logger
-        self.grist = GristDocAPI(doc_id, server=server, api_key=api_key)
-
-    def table_name_convert(self, table_name):
-        return table_name.replace(" ", "_")
-
-    def to_timestamp(self, dtime: datetime) -> int:
-        if dtime.tzinfo is None:
-            dtime = dtime.replace(tzinfo=timezone(timedelta(hours=3))) 
-        return int(dtime.timestamp())
-
-    def insert_row(self, data, table):
-        data = {key.replace(" ", "_"): value for key, value in data.items()}
-        row_id = self.grist.add_records(self.table_name_convert(table), [data])
-        return row_id
-
-    def update_column(self, row_id, column_name, value, table):
-        if isinstance(value, datetime):
-            value = self.to_timestamp(value)
-        column_name = column_name.replace(" ", "_")
-        self.grist.update_records(self.table_name_convert(table), [{ "id": row_id, column_name: value }])
-
-    def delete_row(self, row_id, table):
-        self.grist.delete_records(self.table_name_convert(table), [row_id])
-
-    def update(self, row_id, updates, table):
-        for column_name, value in updates.items():
-            if isinstance(value, datetime):
-                updates[column_name] = self.to_timestamp(value)
-        updates = {column_name.replace(" ", "_"): value for column_name, value in updates.items()}
-        self.grist.update_records(self.table_name_convert(table), [{"id": row_id, **updates}])
-
-    def fetch_table(self, table):
-        return self.grist.fetch_table(self.table_name_convert(table))
-
-    def find_record(self, id=None, state=None, name=None, table=None):
-        if table is None:
-            raise ValueError("Table is not specified")
-        table_data = self.grist.fetch_table(self.table_name_convert(table))
-        if id is not None:
-            record = [row for row in table_data if row.id == id]
-            return record
-        if state is not None and name is not None:
-            record = [row for row in table_data if row.State == state and row.name == name]
-            return record
-        if state is not None:
-            record = [row for row in table_data if row.State == state]
-            return record
-        if name is not None:
-            record = [row for row in table_data if row.Name == name]
-            return record
-
-    def find_settings(self, key, table):
-        table = self.fetch_table(self.table_name_convert(table))
-        for record in table:
-            if record.Setting == key:
-                if record.Value is None or record.Value == "":
-                    raise ValueError(f"Setting {key} blank")
-                return record.Value
-        raise ValueError(f"Setting {key} not found")
-
-def clean_ansi(text):
-    ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
-    return ansi_escape.sub('', text)
-
-def format_number(number_str):
-    try:
-        number = int(number_str)
-        if number >= 1000:
-            value_in_k = number / 1000.0
-            # Format to 3 decimal places if needed, remove trailing zeros and potentially the dot
-            formatted_num = f"{value_in_k:.3f}".rstrip('0').rstrip('.')
-            return f"{formatted_num}k"
-        return str(number)
-    except (ValueError, TypeError):
-        return "NaN" # Or some other indicator of invalid input
-
-def check_logs(logger, initial_sync_count, previous_status):
-    """
-    Checks docker logs for node status (Syncing, OK, Idle) and updates sync count.
-
-    Args:
-        logger: The logger instance.
-        initial_sync_count: The sync count read from Grist at the start.
-        previous_status: The last known status read from Grist ('Sync', 'OK', 'Idle', or others).
-
-    Returns:
-        A dictionary containing:
-        - status_message: A string describing the current status (e.g., "Sync: 123k (5)").
-        - current_status_type: The type of the current status ('Sync', 'OK', 'Idle', 'Error').
-        - current_sync_count: The updated sync count.
-    """
-    current_sync_count = initial_sync_count # Initialize with the value from Grist
-
-    try:
-        logs = subprocess.run(['docker', 'logs', '--since', '10m', 'infernet-node'], capture_output=True, text=True, check=True)
-        log_content = clean_ansi(logs.stdout)
-
-        last_checking_info = None
-        last_ignored_id = None
-        last_head_sub_id = None
-
-        # Regex patterns
-        checking_pattern = re.compile(r'Checking subscriptions.*last_sub_id=(\d+).*head_sub_id=(\d+).*num_subs_to_sync=(\d+)')
-        ignored_pattern = re.compile(r'Ignored subscription creation.*id=(\d+)')
-        head_sub_pattern = re.compile(r'head sub id is:\s*(\d+)')
-
-        # Use deque to efficiently get the last few relevant lines if needed,
-        # but processing all lines and keeping the last match is simpler here.
-        for line in log_content.splitlines():
-            match = checking_pattern.search(line)
-            if match:
-                last_checking_info = {
-                    "last_sub_id": match.group(1),
-                    "head_sub_id": match.group(2),
-                    "num_subs_to_sync": int(match.group(3))
-                }
-                continue # Prioritize checking_info
-
-            match = ignored_pattern.search(line)
-            if match:
-                last_ignored_id = match.group(1)
-                continue
-
-            match = head_sub_pattern.search(line)
-            if match:
-                last_head_sub_id = match.group(1)
-                # No continue here, allows checking_info from same timeframe to override
-
-        current_status_type = "Idle"
-        status_message = "Idle"
-        
-        if last_checking_info:
-            formatted_id = format_number(last_checking_info["last_sub_id"])
-            if last_checking_info["num_subs_to_sync"] > 0:
-                current_status_type = "Sync"
-                status_message = f"Sync: {formatted_id}" # Use current_sync_count
-                logger.info(f"Node is syncing. Last sub ID: {last_checking_info['last_sub_id']}, Num subs to sync: {last_checking_info['num_subs_to_sync']}")
-            else:
-                current_status_type = "OK"
-                # Increment count only on transition from Sync to OK
-                if previous_status == "Sync":
-                    current_sync_count += 1 # Increment local count
-                    logger.info(f"Sync completed. Sync count incremented to {current_sync_count}.")
-                status_message = f"OK: {formatted_id}" # Use current_sync_count
-                logger.info(f"Node is OK. Last sub ID: {last_checking_info['last_sub_id']}")
-        
-        elif last_ignored_id:
-            # Fallback to "Ignored" logs if "Checking" is missing
-            formatted_id = format_number(last_ignored_id)
-            current_status_type = "Sync" # Assume sync if we only see ignored creations recently
-            status_message = f"Sync: {formatted_id}" # Use current_sync_count
-            logger.info(f"Node possibly syncing (based on ignored logs). Last ignored ID: {last_ignored_id}")
-
-        elif last_head_sub_id:
-            # Fallback to "head sub id" if others are missing
-            formatted_id = format_number(last_head_sub_id)
-            current_status_type = "OK" # Assume OK if this is the latest relevant info
-            # Don't increment sync count here, only on Sync -> OK transition based on "Checking" logs
-            status_message = f"OK: {formatted_id}" # Use current_sync_count
-            logger.info(f"Node status based on head sub id. Head sub ID: {last_head_sub_id}")
-            
-        else:
-            logger.info("No relevant subscription log entries found in the last 10 minutes. Status: Idle.")
-            status_message = "Idle"
-            current_status_type = "Idle"
-
-        # Return the results instead of writing to a file
-        return {
-            "status_message": status_message,
-            "current_status_type": current_status_type,
-            "current_sync_count": current_sync_count
-        }
-
-    except subprocess.CalledProcessError as e:
-        error_msg = f"Error: Docker logs failed ({e.returncode})"
-        logger.error(f"Error running docker logs command: {e.stderr or e.stdout or e}")
-        # Return error status and original sync count
-        return {
-            "status_message": error_msg,
-            "current_status_type": "Error",
-            "current_sync_count": initial_sync_count # Return original count on error
-        }
-    except Exception as e:
-        error_msg = "Error: Log processing failed"
-        logger.error(f"Unexpected error processing logs: {e}", exc_info=True)
-        # Return error status and original sync count
-        return {
-            "status_message": error_msg,
-            "current_status_type": "Error",
-            "current_sync_count": initial_sync_count # Return original count on error
-        }
-
-if __name__ == "__main__":
-    colorama.init(autoreset=True)
-    logger = logging.getLogger("Checker")
-    logger.setLevel(logging.INFO)
-    formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-    ch = logging.StreamHandler()
-    ch.setFormatter(formatter)
-    logger.addHandler(ch)
-
-    logger.info("Checker started")
-    self_update(logger)
-    #random_sleep = random.randint(1, 60)
-    #logger.info(f"Sleeping for {random_sleep} seconds")
-    #time.sleep(random_sleep)
-
-    grist_data = {}
-    with open('/root/node/grist.json', 'r', encoding='utf-8') as f:
-        grist_data = json.loads(f.read())
-
-    GRIST_ROW_NAME = socket.gethostname()
-    NODES_TABLE = "Nodes"
-    grist = GRIST(grist_data.get('grist_server'), grist_data.get('grist_doc_id'), grist_data.get('grist_api_key'), logger)
-    current_vm = grist.find_record(name=GRIST_ROW_NAME, table=NODES_TABLE)[0]
-    def grist_callback(msg): grist.update(current_vm.id, msg, NODES_TABLE)
-
-    # Initialize updates dictionary
-    initial_updates = {}
-    # Check and prepare update for Syncs if it's None or empty
-    if not current_vm.Syncs: # Handles None, empty string, potentially 0 if that's how Grist stores it
-        initial_updates["Syncs"] = 0
-    # Check and prepare update for Reboots if it's None or empty
-    if not current_vm.Reboots: # Handles None, empty string, potentially 0
-        initial_updates["Reboots"] = 0
-
-    # If there are updates, send them to Grist
-    if initial_updates:
-        try:
-            logger.info(f"Found empty initial values, updating Grist: {initial_updates}")
-            grist.update(current_vm.id, initial_updates, NODES_TABLE)
-            # Re-fetch the record to ensure subsequent logic uses the updated values
-            current_vm = grist.find_record(name=GRIST_ROW_NAME, table=NODES_TABLE)[0]
-            logger.info("Grist updated successfully with initial zeros.")
-        except Exception as e:
-            logger.error(f"Failed to update Grist with initial zeros: {e}")
-            # Decide how to proceed: maybe exit, maybe continue with potentially incorrect defaults
-            # For now, we'll log the error and continue using the potentially incorrect defaults from the first fetch
-
-    # Get initial state from Grist (now potentially updated)
-    initial_sync_count = int(current_vm.Syncs or 0) # 'or 0' still useful as fallback
-    reboot_count = int(current_vm.Reboots or 0) # 'or 0' still useful as fallback
-    # Determine previous status type based on Health string (simplified)
-    previous_health_status = current_vm.Health or "Idle"
-    previous_status_type = "Idle" # Default
-    if previous_health_status.startswith("Sync"):
-        previous_status_type = "Sync"
-    elif previous_health_status.startswith("OK"):
-        previous_status_type = "OK"
-    elif previous_health_status.startswith("Error"):
-        previous_status_type = "Error" # Consider error state
-
-    logger.info(f"Initial state from Grist - Syncs: {initial_sync_count}, Health: {previous_health_status}, Reboots: {reboot_count}")
-
-    for attempt in range(3):
-        try:
-            vm_ip = os.popen("ip -4 addr show eth0 | grep -oP '(?<=inet )[^/]+'").read()
-            vm_ip = vm_ip.strip()
-            if vm_ip == "":
-                logger.error("Failed to get VM IP address")
-            else:
-                logger.info(f"VM IP address: {vm_ip}")
-                grist_callback({"IP": f"{vm_ip}"})
-
-
-            # Pass initial state to check_logs
-            result = check_logs(logger, initial_sync_count, previous_status_type)
-
-            grist_updates = {"Health": result["status_message"]}
-            
-            # Update Syncs count in Grist only if it changed
-            if result["current_sync_count"] != initial_sync_count:
-                grist_updates["Syncs"] = result["current_sync_count"]
-                logger.info(f"Sync count changed from {initial_sync_count} to {result['current_sync_count']}")
-
-            # Send updates to Grist
-            grist_callback(grist_updates)
-            logger.info(f"Status update sent: {grist_updates}")
-            
-            # Reboot logic (remains mostly the same, reads Reboots from current_vm)
-            if result["current_status_type"] == "Idle": # Check type, not message
-                uptime_seconds = os.popen("cat /proc/uptime | cut -d'.' -f1").read()
-                uptime_seconds = int(uptime_seconds)
-                if uptime_seconds > 60*60*4:
-                    reboot_count = int(current_vm.Reboots or 0)
-                    reboot_count += 1
-                    # Include reboot count in the final Grist update before rebooting
-                    grist_updates = { "Health": "Rebooting", "Reboots": reboot_count }
-                    grist_callback(grist_updates)
-                    logger.info(f"Idle detected for >4 hours (uptime: {uptime_seconds}s). Rebooting. Reboot count: {reboot_count}")
-                    os.system("reboot")
-            break # Exit loop on success
-        except Exception as e:
-            logger.error(f"Error in main loop, attempt {attempt+1}/3: {e}", exc_info=True)
-            if attempt == 2:
-                # Log final error to Grist on last attempt
-                try:
-                    grist_updates = { "Health": f"Error: Main loop failed - {e}" }
-                    grist_callback(grist_updates)
-                except Exception as grist_e:
-                    logger.error(f"Failed to log final error to Grist: {grist_e}")
-            time.sleep(5) # Wait before retrying

deploy/docker-compose.yaml

@@ -1,6 +1,8 @@
+version: '3'
+
 services:
   node:
-    image: ritualnetwork/infernet-node:1.4.0
+    image: ritualnetwork/infernet-node:1.2.0
     ports:
       - "0.0.0.0:4000:4000"
     volumes:
@@ -19,11 +21,6 @@ services:
       - "host.docker.internal:host-gateway"
     stop_grace_period: 1m
     container_name: infernet-node
-    logging:
-      driver: "json-file"
-      options:
-        max-file: 5
-        max-size: 10m
 
   redis:
     image: redis:latest
@@ -36,11 +33,6 @@ services:
       - redis-data:/data
     restart:
       unless-stopped
-    logging:
-      driver: "json-file"
-      options:
-        max-file: 5
-        max-size: 10m
 
   fluentbit:
     image: fluent/fluent-bit:latest
@@ -55,11 +47,6 @@ services:
       - network
     restart:
       unless-stopped
-    logging:
-      driver: "json-file"
-      options:
-        max-file: 5
-        max-size: 10m
 
   infernet-anvil:
     image: ritualnetwork/infernet-anvil:1.0.0
@@ -71,11 +58,6 @@ services:
     container_name: infernet-anvil
     restart:
       unless-stopped
-    logging:
-      driver: "json-file"
-      options:
-        max-file: 5
-        max-size: 10m
 
 networks:
   network:

grist.json

@@ -1,5 +0,0 @@
-{
-  "grist_server": "###GRIST_SERVER###",
-  "grist_doc_id": "###GRIST_DOC_ID###",
-  "grist_api_key": "###GRIST_API_KEY###"
-}

playbook.yml

@@ -1,48 +1,16 @@
 ---
 - name: System Setup and Configuration
   hosts: all
-  become: true
+  become: yes
+
+  
 
   tasks:
     - name: Set locale to C.UTF-8
       command: localectl set-locale LANG=C.UTF-8
 
-    - name: Create APT configuration file to assume yes
-      ansible.builtin.copy:
-        dest: /etc/apt/apt.conf.d/90forceyes
-        content: |
-          APT::Get::Assume-Yes "true";
-        mode: '0644'
-
-    - name: Append command to .bash_history
-      ansible.builtin.blockinfile:
-        path: "~/.bash_history"
-        create: true
-        block: |
-          cd ~/node; bash rebuild.sh
-          nano ~/node/projects/hello-world/container/config.json
-          docker logs infernet-node -f
-          docker logs --since 10m infernet-node -f
-          journalctl -u node-checker.service
-          journalctl -u grpcbalancer.service
-          nano ~/node/deploy/config.json
-          docker compose -f deploy/docker-compose.yaml down; docker compose -f deploy/docker-compose.yaml up -d
-        marker: ""
-        mode: '0644'
-
-
-    - name: Append command to .bash_rc
-      ansible.builtin.blockinfile:
-        path: "~/.bashrc"
-        create: true
-        insertafter: EOF
-        block: |
-          cd /root/node
-        marker: ""
-        mode: '0644'
-
     - name: Update /etc/bash.bashrc
-      ansible.builtin.blockinfile:
+      blockinfile:
         path: /etc/bash.bashrc
         block: |
           export HISTTIMEFORMAT='%F, %T '
@@ -55,23 +23,27 @@
           export LC_ALL=C.UTF-8
           alias ls='ls --color=auto'
           shopt -s cmdhist
-        create: true
-        marker: ""
-        mode: '0644'
 
-    - name: Update .inputrc for the current user
-      ansible.builtin.blockinfile:
-        path: "{{ ansible_env.HOME }}/.inputrc"
+    - name: Ensure ~/.inputrc exists
+      file:
+        path: /root/.inputrc
+        state: touch
+
+    - name: Update ~/.inputrc
+      blockinfile:
+        path: ~/.inputrc
         block: |
           "\e[A": history-search-backward
           "\e[B": history-search-forward
-        create: true
-        marker: ""
-        mode: '0644'
+
+    - name: Ensure ~/.nanorc exists
+      file:
+        path: /root/.nanorc
+        state: touch
 
     - name: Update ~/.nanorc
-      ansible.builtin.blockinfile:
-        path: "{{ ansible_env.HOME }}/.nanorc"
+      blockinfile:
+        path: ~/.nanorc
         block: |
           set nohelp
           set tabsize 4
@@ -82,31 +54,24 @@
           set backupdir /tmp/
           set locking
           include /usr/share/nano/*.nanorc
-        create: true
-        marker: ""
-        mode: '0644'
 
-    - name: Set hostname
-      ansible.builtin.hostname:
-        name: "{{ serverid }}"
+    - name: Set hostname 
+      shell: |
+        hostnamectl set-hostname {{ serverid }}
+        echo "127.0.1.1 {{ serverid }}" >> /etc/hosts
 
-    - name: Ensure hostname is in /etc/hosts
-      ansible.builtin.lineinfile:
-        path: /etc/hosts
-        regexp: '^127\.0\.1\.1\s+'
-        line: "127.0.1.1 {{ serverid }}"
-        state: present
-
-    #- name: Update and upgrade apt
-    #  ansible.builtin.apt:
-    #    update_cache: true
-    #    upgrade: dist
-    #    force_apt_get: true
-    #  register: apt_update_result
-    #  until: apt_update_result is success
+    - name: Update and upgrade apt
+      apt:
+        update_cache: yes
+        upgrade: dist
+        force_apt_get: yes
+      register: apt_update_result
+      retries: 50
+      delay: 50
+      until: apt_update_result is succeeded
 
     - name: Install necessary packages
-      ansible.builtin.apt:
+      apt:
         name:
           - apt-transport-https
           - ca-certificates
@@ -118,151 +83,132 @@
         state: present
 
     - name: Install pip package web3
-      ansible.builtin.pip:
+      pip:
         name: web3
         extra_args: --break-system-packages
 
-#    - name: Install Docker
-#      ansible.builtin.shell: curl -sL https://get.docker.com | sudo sh -
-#
+    - name: Install Docker
+      shell: curl -sL https://get.docker.com | sudo sh -
+
+    - name: Ensure /etc/docker/daemon.json exists
+      file:
+        path: /etc/docker/daemon.json
+        state: touch
+
     - name: Update Docker daemon configuration for journald logging
-      ansible.builtin.copy:
+      copy:
         dest: /etc/docker/daemon.json
         content: |
-          { 
-          "log-driver": "journald",
-          "registry-mirrors": ["https://dockerregistry.vvzvlad.xyz"]
+          {
+            "log-driver": "journald"
           }
 
     - name: Restart Docker
-      ansible.builtin.service:
+      service:
         name: docker
         state: restarted
 
-    - name: Docker pull hello-world
-      ansible.builtin.shell: docker pull ritualnetwork/hello-world-infernet:latest
+    - name: Docker login
+      shell: docker login -u {{ docker_username }} -p {{ docker_password }}
 
-#    - name: Update journald log SystemMaxUse=2G configuration
-#      ansible.builtin.lineinfile:
-#        path: /etc/systemd/journald.conf
-#        regexp: '^SystemMaxUse='
-#        line: 'SystemMaxUse=2G'
-#        state: present
-#        backup: yes
-#        validate: 'journaldctl check-config %s'
-#
-#    - name: Restart journald
-#      ansible.builtin.service:
-#        name: systemd-journald
-#        state: restarted
+    - name: Update journald log SystemMaxUse=2G configuration
+      lineinfile:
+        path: /etc/systemd/journald.conf
+        line: 'SystemMaxUse=2G'
+        insertafter: EOF
+        create: yes
+
+    - name: Restart journald
+      service:
+        name: systemd-journald
+        state: restarted
 
     - name: Setup Foundry
-      ansible.builtin.shell: |
+      shell: |
         mkdir -p ~/foundry && cd ~/foundry
         curl -L https://foundry.paradigm.xyz | bash
       args:
         executable: /bin/bash
 
     - name: Run foundryup
-      ansible.builtin.shell: |
+      shell: |
         source ~/.bashrc && foundryup
       args:
         executable: /bin/bash
 
-    - name: Clone repository
-      ansible.builtin.git:
-        repo: https://gitea.vvzvlad.xyz/vvzvlad/ritual.git
-        dest: "{{ ansible_env.HOME }}/node"
-        version: "{{ git_version }}"
-        force: true
-      async: "{{ 60 * 15 }}"
-      poll: 30
+    - name: Clone ritual-says-gm repository
+      git:
+        repo: https://gitea.vvzvlad.xyz/vvzvlad/ritual-says-gm.git
+        dest: ~/ritual-says-gm
+        force: yes
 
-    - name: Update environment variables
-      ansible.builtin.shell: |
-        chmod +x ./update.sh
-        ./update.sh ID "{{ serverid }}" 
-        ./update.sh GRIST_SERVER "{{ grist_server }}"
-        ./update.sh GRIST_DOC_ID "{{ grist_doc_id }}"
-        ./update.sh GRIST_API_KEY "{{ grist_api_key }}"
-        ./update.sh WALLET_ADDRESS "{{ wallet }}"
-        ./update.sh PRIVATE_KEY "{{ private_key }}"
-        ./update.sh RPC_URL "{{ rpc_url }}"
-      args:
-        chdir: "{{ ansible_env.HOME }}/node"
-      changed_when: false
+    - name: Update wallet, private key and RPC URL in project
+      shell: |
+        cd ~/ritual-says-gm
+        bash update.sh {{ wallet }} {{ private_key }} {{ rpc_url }}
 
+    - name: Remove old Forge and Infernet SDK
+      shell: |
+        cd ~/ritual-says-gm
+        rm -rf projects/hello-world/contracts/lib/forge-std
+        rm -rf projects/hello-world/contracts/lib/infernet-sdk
 
     - name: Install Forge and Infernet SDK
-      ansible.builtin.shell: |
-        rm -rf {{ ansible_env.HOME }}/node/projects/hello-world/contracts/lib/forge-std
-        rm -rf {{ ansible_env.HOME }}/node/projects/hello-world/contracts/lib/infernet-sdk
-        cd {{ ansible_env.HOME }}/foundry && source {{ ansible_env.HOME }}/.bashrc && foundryup
-        cd {{ ansible_env.HOME }}/node/projects/hello-world/contracts
-        forge install foundry-rs/forge-std
-        forge install ritual-net/infernet-sdk
+      shell: |
+        cd ~/foundry && source ~/.bashrc && foundryup
+        cd ~/ritual-says-gm
+        cd projects/hello-world/contracts
+        forge install --no-commit foundry-rs/forge-std
+        forge install --no-commit ritual-net/infernet-sdk
       args:
         executable: /bin/bash
 
     - name: Deploy container
-      ansible.builtin.shell: project=hello-world make deploy-container
-      args:
-        chdir: "{{ ansible_env.HOME }}/node"
+      shell: |
+        cd ~/ritual-says-gm && project=hello-world make deploy-container
 
     - name: Deploy contracts
-      ansible.builtin.shell: project=hello-world make deploy-contracts 2>&1
+      shell: cd ~/ritual-says-gm && project=hello-world make deploy-contracts 2>&1
       register: contract_deploy_output
-      args:
-        chdir: "{{ ansible_env.HOME }}/node"
-        executable: /bin/bash
-      retries: 5
-      delay: 120
-      async: 120
-      poll: 30
+      ignore_errors: yes
+      retries: 3
+      delay: 53
       until: '"ONCHAIN EXECUTION COMPLETE & SUCCESSFUL" in contract_deploy_output.stdout'
-      failed_when: false
 
     - name: Update CallContract.s.sol with contract address
-      ansible.builtin.shell: bash update_contracts.sh
-      args:
-        chdir: "{{ ansible_env.HOME }}/node"
+      shell: |
+        cd ~/ritual-says-gm
+        contract_address=$(jq -r '.transactions[0].contractAddress' projects/hello-world/contracts/broadcast/Deploy.s.sol/8453/run-latest.json)
+        checksum_address=$(python3 toChecksumAddress.py $contract_address)
+        sed -i "s/SaysGM(.*/SaysGM($checksum_address);/" projects/hello-world/contracts/script/CallContract.s.sol
 
     - name: Call contract
-      ansible.builtin.shell: project=hello-world make call-contract 2>&1
-      register: contract_call_output
-      args:
-        chdir: "{{ ansible_env.HOME }}/node"
-        executable: /bin/bash
-      retries: 5
-      delay: 120
-      async: 120
-      poll: 30
-      until: '"ONCHAIN EXECUTION COMPLETE & SUCCESSFUL" in contract_call_output.stdout'
-      failed_when: false
+      shell: cd ~/ritual-says-gm && project=hello-world make call-contract 2>&1
+      register: contract_output
+      ignore_errors: yes
+      retries: 3
+      delay: 55
+      until: '"ONCHAIN EXECUTION COMPLETE & SUCCESSFUL" in contract_output.stdout'
 
-    - name: Copy checker service file
-      ansible.builtin.copy:
-        dest: /etc/systemd/system/node-checker.service
+    - name: Set Docker containers to restart unless stopped
+      shell: |
+        docker update --restart unless-stopped hello-world
+        docker update --restart unless-stopped infernet-node
+        docker update --restart unless-stopped deploy-redis-1
+        docker update --restart unless-stopped infernet-anvil
+        docker update --restart unless-stopped deploy-fluentbit-1
+
+    - name: Create APT configuration file to assume yes
+      copy:
+        dest: /etc/apt/apt.conf.d/90forceyes
         content: |
-          [Unit]
-          Description=Node Checker Service
-          After=network.target
-
-          [Service]
-          Type=simple
-          User=root
-          WorkingDirectory={{ ansible_env.HOME }}/node
-          ExecStart=/usr/bin/python3 {{ ansible_env.HOME }}/node/checker.py
-          Restart=always
-          RestartSec=600
-
-          [Install]
-          WantedBy=multi-user.target
+          APT::Get::Assume-Yes "true";
+          
+    - name: Set permissions on APT configuration file
+      file:
+        path: /etc/apt/apt.conf.d/90forceyes
         mode: '0644'
 
-    - name: Enable and start node-checker service
-      ansible.builtin.systemd:
-        name: node-checker
-        enabled: yes
-        state: started
-        daemon_reload: yes
+    - name: Remove docker login credentials
+      shell: rm -rf /root/.docker/config.json
+      ignore_errors: yes

projects/hello-world/container/config.json

@@ -5,27 +5,29 @@
     },
     "chain": {
         "enabled": true,
-        "trail_head_blocks": 3,
+        "trail_head_blocks": 0,
         "rpc_url": "###RPC_URL###",
         "registry_address": "0x3B1554f346DFe5c482Bb4BA31b880c1C18412170",
         "wallet": {
             "max_gas_limit": 4000000,
             "private_key": "###PRIVATE_KEY###"
-        },
-        "snapshot_sync": {
-            "sleep": 3,
-            "batch_size": 800,
-            "starting_sub_id": 242029,
-            "sync_period": 30
         }
     },
     "startup_wait": 1.0,
+    "docker": {
+        "username": "your-username",
+        "password": ""
+    },
     "redis": {
         "host": "redis",
         "port": 6379
     },
     "forward_stats": true,
-
+    "snapshot_sync": {
+        "sleep": 2,
+        "batch_size": 10000,
+        "starting_sub_id": 100000
+    },
     "containers": [
         {
             "id": "hello-world",

rebuild.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -e 
-cd ~/node
-project=hello-world make deploy-container
-project=hello-world make deploy-contracts
-bash update_contracts.sh
-project=hello-world make call-contract

update.sh

@@ -1,21 +1,23 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
-if [ "$#" -ne 2 ]; then
-    echo "Usage: $0 <PARAMETER> <NEW_VALUE>"
+if [ "$#" -ne 3 ]; then
+    echo "Usage: $0 <wallet_address> <private_key> <rpc_url>"
     exit 1
 fi
 
-PARAMETER=$1
-NEW_VALUE=$2
+WALLET_ADDRESS=$1
+PRIVATE_KEY=$2
+RPC_URL=$3
 
-# Список файлов
+# List of files
 FILES=(
     "./projects/hello-world/container/config.json"
     "./projects/hello-world/contracts/Makefile"
-    "grist.json"
 )
 
 for FILE in "${FILES[@]}"; do
     EXPANDED_FILE=$(eval echo "$FILE")
-    sed -i "s|###$PARAMETER###|$NEW_VALUE|g" "$EXPANDED_FILE"
-done
+    sed -i "s|###WALLET_ADDRESS###|$WALLET_ADDRESS|g" "$EXPANDED_FILE"
+    sed -i "s|###PRIVATE_KEY###|$PRIVATE_KEY|g" "$EXPANDED_FILE"
+    sed -i "s|###RPC_URL###|$RPC_URL|g" "$EXPANDED_FILE"
+done

update_contracts.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -e 
-contract_address=$(jq -r '.transactions[0].contractAddress' projects/hello-world/contracts/broadcast/Deploy.s.sol/8453/run-latest.json)
-checksum_address=$(python3 toChecksumAddress.py $contract_address)
-sed -i "s/SaysGM(.*/SaysGM($checksum_address);/" projects/hello-world/contracts/script/CallContract.s.sol

ws.code-workspace

@@ -1,28 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "."
-		},
-		{
-			"path": "../ritual-git"
-		}
-	],
-	"settings": {
-		"workbench.colorCustomizations": {
-			"activityBar.activeBackground": "#fb94f8",
-			"activityBar.background": "#fb94f8",
-			"activityBar.foreground": "#15202b",
-			"activityBar.inactiveForeground": "#15202b99",
-			"activityBarBadge.background": "#777b05",
-			"activityBarBadge.foreground": "#e7e7e7",
-			"commandCenter.border": "#15202b99",
-			"sash.hoverBorder": "#fb94f8",
-			"titleBar.activeBackground": "#f963f5",
-			"titleBar.activeForeground": "#15202b",
-			"titleBar.inactiveBackground": "#f963f599",
-			"titleBar.inactiveForeground": "#15202b99"
-		},
-		"peacock.color": "#f963f5",
-		"makefile.configureOnOpen": false
-	}
-}