New beta

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 100
+exclude = .git,__pycache__,docs/source/conf.py,old,build,dist,venv,.venv,node_modules,helper-scripts

.gitignore

@@ -14,18 +14,19 @@ wallets/*
 # ansible
 skale-nodes/ansible/my-inventory
 skale-nodes/ansible/inventory/
+skale-nodes/ansible/inventory*
 skale-nodes/ansible/files/base-key*.txt
 skale-nodes/ansible/files/dev*
 skale-nodes/ansible/files/authorized_keys
 skale-nodes/ansible/files/validator-id*.txt
 skale-nodes/ansible/terraform/do/hosts
 skale-nodes/ansible/terraform/aws/hosts*
-skale-nodes/ansible/ansible.cfg
 skale-nodes/ansible/sgx/ansible.cfg
 
 skale-nodes/ansible/files/base-key.txt
 skale-nodes/ansible/files/validator-key.txt
 skale-nodes/ansible/files/validator-id.txt
+skale-nodes/ansible/files/passive-id.txt
 
 skale-nodes/ansible/files/cert.pem
 skale-nodes/ansible/files/privkey.pem
@@ -54,3 +55,4 @@ bare-metal/ansible/files/restart_vm*
 bare-metal/ansible/conf*
 
 skale-nodes/ansible/group_vars/all
+skale-nodes/ansible/roles/base_provision/files/files/authorized_keys

README.md

@@ -1,11 +1,20 @@
-# SKALE Node Provisoning
+# SKALE and Fair Node Provisioning
 
 [![Discord](https://img.shields.io/discord/534485763354787851.svg)](https://discord.gg/vvUtWJB)
 
-This repo will help deploy and register multiple SKALE nodes in the cloud automatically.
+This repo will help deploy and register multiple SKALE and Fair nodes in the cloud automatically.
 
 NOTE: This is for QA and testing purposes only.
 
+- [Fair Node Provisoning](#fair-node-provisoning)
+  - [Fair network creating](#fair-network-creating)
+    - [Setup Fair boot nodes](#1-prepare-inventory)
+    - [Prepare inventory](#2-setup-fair-boot-nodes)
+    - [Create schain](#3-create-schain)
+    - [Deploy Fair contracts](#4-deploy-fair-contracts) 
+    - [Migrate Fair boot nodes](#5-migrate-fair-boot-nodes)
+    - [Setup Fair nodes](#6-setup-fair-nodes)
+
 - [SKALE Node Provisoning](#skale-node-provisoning)
   - [Host requirements](#host-requirements)
   - [Supported providers](#supported-providers)
@@ -21,6 +30,57 @@ NOTE: This is for QA and testing purposes only.
     - [Run main script without IMA deployment](#run-main-script-without-ima-deployment)
     - [Run skaled monitor](#run-skaled-monitor)
 
+
+# Fair Node Provisioning
+
+## Fair network creation
+
+### 1. Prepare inventory
+1) Set `node_type=fair_boot`
+2) Set `build_type=git` (to use Docker image versions specified in the corresponding branch of the 
+`skale-node` repository on GitHub), or `build_type=source` (to build from source). In the second 
+case, set the appropriate local paths to the required cloned repositories and set  
+`container_configs_dir` variable (usually it's `/root/skale-node`).
+3) Don't forget to set all other necessary variables like `eth_private_key`, `endpoint`, etc.
+
+### 2. Setup Fair boot nodes
+```bash
+ansible-playbook -i inventory main.yaml
+```
+The following playbooks are processed here: _deploy_contracts.yaml, sgx_sim.yaml, setup.yaml, 
+validator.yaml, signature.yaml, link_addresses.yaml, register.yaml_
+
+### 3. Create schain
+1) Set the schain name (it must match the name specified in the `fair_static_params.yaml` file for 
+the corresponding network in the relevant branch of the `skale-node` repository). For example, for 
+the **devnet**, the typical name is `fair-devnet1`.
+2) Set the desired `chain_type` (for example, LARGE4 - for 4-nodes chain )
+3) Run the following playbook:
+```bash
+ansible-playbook -i inventory create_chain.yaml
+```
+### 4. Deploy Fair contracts
+1) Set `fair_tag` variable (Fair manager version)
+2) Set `boot_endpoint` variable (endpoint of schain that was created before)
+3) Run the following playbook: 
+```bash
+ansible-playbook -i inventory deploy_fair_manager.yaml
+```
+### 5. Migrate Fair boot nodes
+1) Set `node_type=fair`
+2) Run the following playbook:
+```bash
+ansible-playbook -i inventory fair_migrate.yaml
+```
+### 6. Setup Fair nodes
+1) Set `node_type=fair`
+2) Run the following playbook:
+```bash
+ansible-playbook -i inventory main_fair.yaml
+```
+
+# SKALE Node Provisioning
+
 ## Host requirements
 
 - Terraform >= 0.12
@@ -177,3 +237,4 @@ bash utils/generate_hosts.sh
 ```bash
 ansible-playbook -i inventory run_monitor.yaml
 ```
+

bare-metal/README.md

@@ -40,7 +40,7 @@ When Vagrant provision is completed `hosts` file will be created in `bare-metal/
 ansible-playbook -i inventory -v main.yaml
 ```
 
-Default `DISK_MOUNTPOINT` for VirtualBox VMs: `/dev/sdb`
+Default `BLOCK_DEVICE` for VirtualBox VMs: `/dev/sdb`
 
 ## Destroy machines
 

ruff.toml

@@ -0,0 +1,4 @@
+line-length = 100
+
+[format]
+quote-style = "single"

skale-nodes/ansible/ansible.cfg

@@ -0,0 +1,4 @@
+[defaults]
+host_key_checking = False
+stdout_callback = yaml
+inventory = ./inventory

skale-nodes/ansible/archive.yaml

@@ -4,7 +4,7 @@
   roles:
     - role: sync
       tags: sync
-      when: env is defined and env == "dev"
+      when: build_type == "source"
 
     - role: skale_cli
       tags: cli

skale-nodes/ansible/backup_nodes.yaml

@@ -1,6 +1,7 @@
-- name: Backup node
+- name: Backup SKALE or FAIR nodes
   hosts: nodes
-  vars:
-    - ip_address: "{{ hostvars[inventory_hostname].ansible_host }}"
+
   roles:
-    - node_backup
+    - role: node_backup
+      when: node_type is defined and node_type in ['skale', 'fair']
+      tags: backup_node

skale-nodes/ansible/backup_schains.yaml

@@ -1,13 +1,23 @@
 - name: Fetch schain nodes script
   hosts: localhost
+  connection: local
+  gather_facts: false
   serial: True
 
   tasks:
+    - name: Validate node_type
+      fail:
+        msg: >
+          The 'node_type' variable must be defined and set to 'skale' for sChain backup.
+          Current value: '{{ node_type | default('undefined') }}'
+      when: node_type is not defined or node_type != 'skale'
+
     - name: Run fetch schain nodes script
       script: fetch_node_schains.py -u
       environment:
         ETH_PRIVATE_KEY: "{{ eth_private_key }}"
         ENDPOINT: "{{ endpoint }}"
+        MANAGER_CONTRACTS: "{{ manager_contracts }}"
         BASE_DIR: "files"
       args:
         executable: python3
@@ -31,7 +41,7 @@
         node_schains: "{{ hostvars['localhost'].node_schains }}"
 
     - name: Make snapshot
-      include: tasks/schains_backup.yaml
+      include_tasks: tasks/schains_backup.yaml
       vars:
         schains: "{{ node_schains[ip_address] }}"
       when: ip_address in node_schains

skale-nodes/ansible/cleanup_contracts.yaml

@@ -0,0 +1,6 @@
+- name: Cleanup contracts from chains and nodes
+  hosts: 127.0.0.1
+  connection: local
+  roles:
+    - role: cleanup_contracts
+      tags: cleanup_contracts

skale-nodes/ansible/cleanup_sgx.yaml

@@ -1,5 +1,5 @@
 - name: Cleanup sgx
-  hosts: sgx
+  hosts: sgx,nodes
   become: true
   roles:
     - name: Remove all sgx skale software from the machines

skale-nodes/ansible/create_chain.yaml

@@ -0,0 +1,7 @@
+- name: Create chain on SKALE or Fair nodes
+  hosts: 127.0.0.1
+  connection: local
+  roles:
+    - role: create_chain
+      tags:
+        - create_chain

skale-nodes/ansible/delete_chain.yaml

@@ -0,0 +1,7 @@
+- name: Delete chain on SKALE or Fair nodes
+  hosts: 127.0.0.1
+  connection: local
+  roles:
+    - role: delete_chain
+      tags:
+        - delete_chain

skale-nodes/ansible/deploy_fair_manager.yaml

@@ -0,0 +1,14 @@
+- name: Deploy Fair manager contracts
+  hosts: 127.0.0.1
+  connection: local
+  pre_tasks:
+    - name: Fail if node_type is not 'fair_boot'
+      fail:
+        msg: "Stopping playbook. This play requires node_type to be 'fair_boot', but it is '{{ node_type }}'."
+      when: node_type != "fair_boot"
+  roles:
+    - role: deploy_fair
+      tags:
+        - deploy_fair
+
+

skale-nodes/ansible/fair_migrate.yaml

@@ -0,0 +1,19 @@
+- name: Migrate Fair boot node to regular Fair node
+  hosts: nodes
+  become: true
+  pre_tasks:
+    - name: Set node_type to fair for migration
+      set_fact:
+        node_type: "fair"
+      when: node_type is defined and node_type == 'fair_boot'
+
+  roles:
+    - role: sync
+      when: build_type == "source"
+      tags: sync
+
+    - role: config
+      tags: config
+
+    - role: fair_migrate
+      tags: fair_migrate

skale-nodes/ansible/fair_node.yaml

@@ -0,0 +1,4 @@
+- import_playbook: sgx_sim.yaml
+- import_playbook: setup.yaml
+- import_playbook: transfer_funds.yaml
+- import_playbook: register.yaml

skale-nodes/ansible/fair_node_passive.yaml

@@ -0,0 +1,2 @@
+- import_playbook: register_passive_fair.yaml
+- import_playbook: setup.yaml

skale-nodes/ansible/fair_pipeline.yaml

@@ -0,0 +1,12 @@
+- import_playbook: set_fair_boot_node_type.yaml
+- import_playbook: run_anvil.yaml
+- import_playbook: deploy_contracts.yaml
+- import_playbook: sgx_sim.yaml
+- import_playbook: setup.yaml
+- import_playbook: validator.yaml
+- import_playbook: signature.yaml
+- import_playbook: link_addresses.yaml
+- import_playbook: register.yaml
+- import_playbook: create_chain.yaml
+- import_playbook: deploy_fair_manager.yaml
+- import_playbook: fair_migrate.yaml

skale-nodes/ansible/files/cleanup_contracts.py

@@ -1,49 +1,71 @@
 import logging
 import os
+import sys
+from eth_typing import HexStr
 
-from skale import Skale
+from skale import SkaleManager
 from skale.wallets import Web3Wallet
 from skale.utils.web3_utils import init_web3
 from skale.utils.helper import init_default_logger
+from skale.utils.contracts_provision.main import cleanup_nodes
 
 logger = logging.getLogger(__name__)
 init_default_logger()
 
-BASE_DIR = os.getenv('BASE_DIR')
 ENDPOINT = os.getenv('ENDPOINT')
-ABI_FILEPATH = os.path.join(BASE_DIR, 'manager.json')
+MANAGER_CONTRACTS = os.getenv('MANAGER_CONTRACTS')
 ETH_PRIVATE_KEY = os.getenv('ETH_PRIVATE_KEY')
 
-web3 = init_web3(ENDPOINT)
-wallet = Web3Wallet(ETH_PRIVATE_KEY, web3)
-skale = Skale(ENDPOINT, ABI_FILEPATH, wallet)
 
+def init_skale_manager(
+    endpoint: str, alias_or_address: str, eth_private_key: HexStr
+) -> SkaleManager:
+    web3 = init_web3(endpoint)
+    wallet = Web3Wallet(eth_private_key, web3)
+    return SkaleManager(endpoint, alias_or_address, wallet)
 
-def remove_active_nodes():
-    for node_id in skale.nodes.get_active_node_ids():
-        skale.manager.node_exit(node_id, wait_for=True)
+
+def remove_active_nodes(skale):
+    logger.info('Removing all active nodes...')
+    cleanup_nodes(skale)
+    logger.info('Finished removing active nodes')
 
 
 def get_all_schains_names(skale):
     schains_ids = skale.schains_internal.get_all_schains_ids()
-    print(schains_ids)
-    names = [
-        skale.schains.get(sid).get('name')
-        for sid in schains_ids
-    ]
+    logger.info(f'Found chain IDs: {schains_ids}')
+    names = [skale.schains.get(sid).name for sid in schains_ids]
     return names
 
 
-def remove_all_schains():
+def remove_all_schains(skale):
+    logger.info('Removing all chains...')
     schain_names = get_all_schains_names(skale)
+    if not schain_names:
+        logger.info('No chains found to remove')
+        return
     for name in schain_names:
+        logger.info(f'Deleting chain: {name}')
         skale.manager.delete_schain(name, wait_for=True)
+    logger.info('Finished removing chains')
 
 
-def cleanup():
-    remove_all_schains()
-    remove_active_nodes()
+def cleanup(skale):
+    remove_all_schains(skale)
+    remove_active_nodes(skale)
 
 
-if __name__ == "__main__":
-    cleanup()
+if __name__ == '__main__':
+    skale = init_skale_manager(ENDPOINT, MANAGER_CONTRACTS, HexStr(ETH_PRIVATE_KEY))
+    if len(sys.argv) > 1:
+        action = sys.argv[1]
+        if action == 'remove_chains':
+            remove_all_schains(skale)
+        elif action == 'remove_nodes':
+            remove_active_nodes(skale)
+        else:
+            logger.error(f'Unknown action: {action}. Please use "remove_chains" or "remove_nodes"')
+            sys.exit(1)
+    else:
+        logger.info('No action specified, running full cleanup')
+        cleanup(skale)