Merge branch 'main' into stereumAlert

.github/workflows/electron.yaml

@@ -155,19 +155,19 @@ jobs:
         shell: bash
 
       - name: Download ubuntu binary from build into dist
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b
         with:
           name: app-ubuntu-latest
           path: dist
         if: ${{ !contains(github.event.head_commit.message, '[NOCI]') }}
       - name: Download windows binary from build into dist
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b
         with:
           name: app-windows-latest
           path: dist
         if: ${{ !contains(github.event.head_commit.message, '[NOCI]') }}
       - name: Download macos binary from build into dist
-        uses: actions/download-artifact@master
+        uses: actions/download-artifact@e9ef242655d12993efdcda9058dee2db83a2cb9b
         with:
           name: app-macos-latest
           path: dist

.vscode/settings.json

@@ -14,5 +14,8 @@
     "editor.formatOnSave": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "vue3snippets.enable-compile-vue-file-on-did-save-code": true
+  "editor.autoIndent": "none",
+  "vue3snippets.enable-compile-vue-file-on-did-save-code": true,
+  "javascript.format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces": false,
+  "typescript.format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces": false
 }

controls/roles/update-changes/molecule/202/converge.yml

@@ -0,0 +1,10 @@
+---
+- name: Converge
+  hosts: all
+  vars_files:
+  - ../../../../defaults/stereum_defaults.yaml
+
+  tasks:
+    - name: "Include update-changes"
+      include_role:
+        name: "update-changes"

controls/roles/update-changes/molecule/202/molecule.yml

@@ -0,0 +1,27 @@
+---
+#dependency:
+#  name: galaxy
+driver:
+  name: docker
+platforms:
+  - name: "update-changes--2.0.2--ubuntu-23.04"
+    image: ubuntu:lunar
+  # - name: "configure-updates--default--centos-8"
+  #   image: geerlingguy/docker-centos8-ansible
+provisioner:
+  name: ansible
+  env:
+    ANSIBLE_PIPELINING: "True"
+lint: |
+  set -e
+  yamllint .
+  ansible-lint .
+scenario:
+  test_sequence:
+    - destroy
+    - create
+    - prepare
+    - converge
+    - idempotence
+    - verify
+    - destroy

controls/roles/update-changes/molecule/202/playbook.yml

@@ -0,0 +1,7 @@
+---
+- name: Converge
+  hosts: all
+  tasks:
+    - name: "Include update-changes"
+      include_role:
+        name: "update-changes"

controls/roles/update-changes/molecule/202/prepare.yml

@@ -0,0 +1,116 @@
+---
+- name: Prepare
+  hosts: all
+  tasks:
+    - name: Make sure Stereum's config path exists
+      file:
+        path: "/etc/stereum/services"
+        state: directory
+        owner: "root"
+        group: "root"
+        mode: 0644
+      become: yes
+
+    - name: Create Erigon service config
+      copy:
+        dest: "/etc/stereum/services/c3c822b5-5b0c-b779-8a04-fae3563ccfa1.yaml"
+        owner: "root"
+        group: "root"
+        mode: 0644
+        content: |
+          service: ErigonService
+          id: c3c822b5-5b0c-b779-8a04-fae3563ccfa1
+          configVersion: 1
+          command:
+            - erigon
+            - --chain=holesky
+            - --datadir=/opt/data/erigon
+            - --authrpc.addr=0.0.0.0
+            - --authrpc.vhosts=*
+            - --authrpc.port=8551
+            - --authrpc.jwtsecret=/engine.jwt
+            - --rpc.returndata.limit=1000000
+            - --ws
+            - --http
+            - --http.vhosts=*
+            - --http.corsdomain=*
+            - --http.addr=0.0.0.0
+            - --http.port=8545
+            - --http.api=engine,net,eth,web3
+            - --metrics
+            - --metrics.addr=0.0.0.0
+            - --metrics.port=6060
+            - --db.pagesize=16K
+            - --db.size.limit=4TB
+            - --prune=htc
+          entrypoint: []
+          env: {}
+          image: thorax/erigon:v2.54.0
+          ports:
+            - 0.0.0.0:30303:30303/tcp
+            - 0.0.0.0:30303:30303/udp
+            - 127.0.0.1:8545:8545/tcp
+            - 127.0.0.1:8546:8546/tcp
+          volumes:
+            - /opt/stereum/erigon-c3c822b5-5b0c-b779-8a04-fae3563ccfa1/data:/opt/data/erigon
+            - /opt/stereum/erigon-c3c822b5-5b0c-b779-8a04-fae3563ccfa1/engine.jwt:/engine.jwt
+          user: root
+          autoupdate: true
+          network: holesky
+          dependencies:
+            executionClients: []
+            consensusClients: []
+            mevboost: []
+      become: yes
+
+    - name: Create Erigon service config
+      copy:
+        dest: "/etc/stereum/services/da69776a-2468-4e2d-b3fb-7a6dfd9eabf1.yaml"
+        owner: "root"
+        group: "root"
+        mode: 0644
+        content: |
+          service: ErigonService
+          id: da69776a-2468-4e2d-b3fb-7a6dfd9eabf1
+          configVersion: 1
+          command:
+            - erigon
+            - --chain=holesky
+            - --datadir=/opt/data/erigon
+            - --authrpc.addr=0.0.0.0
+            - --authrpc.vhosts=*
+            - --authrpc.port=8551
+            - --authrpc.jwtsecret=/engine.jwt
+            - --rpc.returndata.limit=1000000
+            - --ws
+            - --http
+            - --http.vhosts=*
+            - --http.corsdomain=*
+            - --http.addr=0.0.0.0
+            - --http.port=8545
+            - --http.api=engine,net,eth,web3
+            - --metrics
+            - --metrics.addr=0.0.0.0
+            - --metrics.port=6060
+            - --db.pagesize=16K
+            - --prune=htc
+          entrypoint: []
+          env: {}
+          image: thorax/erigon:v2.54.0
+          ports:
+            - 0.0.0.0:30303:30303/tcp
+            - 0.0.0.0:30303:30303/udp
+            - 127.0.0.1:8545:8545/tcp
+            - 127.0.0.1:8546:8546/tcp
+          volumes:
+            - /opt/stereum/erigon-da69776a-2468-4e2d-b3fb-7a6dfd9eabf1/data:/opt/data/erigon
+            - /opt/stereum/erigon-da69776a-2468-4e2d-b3fb-7a6dfd9eabf1/engine.jwt:/engine.jwt
+          user: root
+          autoupdate: true
+          network: holesky
+          dependencies:
+            executionClients: []
+            consensusClients: []
+            mevboost: []
+      become: yes
+# EOF

controls/roles/update-changes/molecule/202/verify.yml

@@ -0,0 +1,35 @@
+---
+- name: Verify
+  hosts: all
+  gather_facts: false
+  tasks:
+    # Erigon
+    - name: Read ErigonService file 1
+      slurp:
+        src: "/etc/stereum/services/c3c822b5-5b0c-b779-8a04-fae3563ccfa1.yaml"
+      register: erigon_service_configuration1_raw
+
+    # Erigon
+    - name: Read ErigonService file 2
+      slurp:
+        src: "/etc/stereum/services/da69776a-2468-4e2d-b3fb-7a6dfd9eabf1.yaml"
+      register: erigon_service_configuration2_raw
+
+    - name: Parse ErigonService configurations
+      set_fact:
+        erigon_service_configuration1: "{{ erigon_service_configuration1_raw['content'] | b64decode | from_yaml }}"
+        erigon_service_configuration2: "{{ erigon_service_configuration2_raw['content'] | b64decode | from_yaml }}"
+
+    - debug:
+        msg: "{{ erigon_service_configuration1 }}"
+
+    - debug:
+        msg: "{{ erigon_service_configuration2 }}"
+
+    - assert:
+        that:
+          - erigon_service_configuration1.command | select('match', '--db.size.limit.*') | length == 1
+          - erigon_service_configuration2.command | select('match', '--db.size.limit.*') | length == 1
+          - erigon_service_configuration1.command | select('match', '--db.size.limit=4TB') | length == 1
+          - erigon_service_configuration2.command | select('match', '--db.size.limit.8TB') | length == 1
+# EOF

controls/roles/update-changes/tasks/2.0.2/erigon_dbTag.yaml

@@ -0,0 +1,19 @@
+---
+- name: Read service file
+  slurp:
+    src: "{{ item.path }}"
+  register: service_configuration_raw
+
+- name: Parse service's configuration
+  set_fact:
+    service_configuration: "{{ service_configuration_raw['content'] | b64decode | from_yaml }}"
+    service_configuration_text: "{{ service_configuration_raw['content'] | b64decode }}"
+
+- name: Add DB Tag to Erigon
+  lineinfile:
+    path: "{{ item.path }}"
+    insertafter: "- erigon"
+    line: "{{ service_configuration_text | split('\n') | select('match', '^\\s*- --datadir.*') | first | split('-') | first }}- --db.size.limit=8TB"
+  when:
+    - service_configuration.service == "ErigonService"
+    - service_configuration.command | select('match', '--db.size.limit.*') | length == 0

controls/roles/update-changes/tasks/2.0.2/updates-202.yaml

@@ -0,0 +1,9 @@
+---
+- name: Find service configs
+  find:
+    paths: "/etc/stereum/services"
+  register: service_config_files
+
+- name: Include Erigon DB Tag
+  include_tasks: erigon_dbTag.yaml
+  loop: "{{ service_config_files.files }}"

controls/roles/update-changes/tasks/main.yml

@@ -2,4 +2,8 @@
 - name: Include RC23 Update Scripts
   include_tasks: "2.0-rc23/updates-20-rc23.yaml"
   ignore_errors: yes
+
+- name: Include 2.0.2 Update Scripts
+  include_tasks: "2.0.2/updates-202.yaml"
+  ignore_errors: yes
 # EOF

launcher/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stereum-launcher",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "private": true,
   "description": "Stereum Ethereum Node Setup Launcher",
   "author": "stereum.net",
@@ -18,7 +18,7 @@
     "test-coverage": "jest --coverage",
     "watch:css": "npx tailwindcss -i ./src/main.css -o ./public/output.css --watch",
     "lint:fix": "eslint --ext .js,.vue --ignore-path ../.gitignore --fix src",
-    "max": "concurrently \"npm:electron:serve\" \"npm:watch:css\"",
+    "stereum": "concurrently \"npm:electron:serve\" \"npm:watch:css\"",
     "format": "prettier .  --write"
   },
   "dependencies": {
@@ -44,6 +44,7 @@
     "pinia": "^2.0.33",
     "qrcode": "^1.5.1",
     "ssh2": "^1.1.0",
+    "uuid": "^9.0.1",
     "vue": "^3.2.33",
     "vue-i18n": "9.2.2",
     "vue-router": "^4.0.15",
@@ -88,5 +89,4 @@
     "type": "git",
     "url": "[email protected]:stereum-dev/ethereum-node.git"
   }
-}
-
+}