Merge pull request #1421 from vechain/release/hayabusa

Release/hayabusa

Author: otherview

.dockerignore

@@ -0,0 +1,4 @@
+vendor
+.github
+.idea
+compose.yaml

.git-hooks/pre-commit

@@ -1,24 +1,18 @@
 #!/usr/bin/env bash
 #
-# Scan only staged changes for any 64-character hex strings (Ethereum private keys).
-# Override with: git commit --safe-to-ignore-key
+# pre-commit hook: scan staged changes for any 64-character hex strings (Ethereum private keys).
+# To bypass this check, set SAFE_TO_IGNORE_KEY=1 when running git commit.
 
-# 1) detect override flag on parent `git commit`
-if [ -r "/proc/$PPID/cmdline" ]; then
-  parent_cmd=$(tr '\0' ' ' </proc/$PPID/cmdline)
-else
-  parent_cmd=$(ps -o args= -p "$PPID" 2>/dev/null)
-fi
-if [[ "$parent_cmd" == *"--safe-to-ignore-key"* ]]; then
+# 1) If the environment variable is set, skip the scan entirely.
+if [ -n "$SAFE_TO_IGNORE_KEY" ]; then
   exit 0
 fi
 
-# 2) scan only added (+) or modified (-) lines (not the diff headers)
-#    and look for any 64-hex-char run
+# 2) Scan only staged additions or modifications (no context lines) for any 64-hex-char run.
 if git diff --cached --diff-filter=AM -U0 | \
      grep -E --color=never '^(\+[^\+]|-[^-]).*[0-9A-Fa-f]{64}'; then
   echo
-  echo "✖ ERROR: Detected ECDSA private key in staged changes. Commit aborted."
+  echo "✖ ERROR: Detected a 64-character hex string (possible private key) in staged changes. Commit aborted."
   echo
   exit 1
 fi

.github/workflows/on-master-commit.yaml

@@ -7,6 +7,10 @@ on:
       - 'release/*'
       - 'releases/*'
 
+concurrency:
+    group: 'master-commit-ci'
+    cancel-in-progress: false
+
 jobs:
   run-unit-tests:
     name: Run Unit Tests
@@ -29,6 +33,9 @@ jobs:
   run-e2e-tests:
     name: E2E Tests
     uses: ./.github/workflows/test-e2e.yaml
+    permissions:
+      contents: read
+    secrets: inherit
 
   run-smoke-tests:
     name: Smoke Tests
@@ -83,6 +90,7 @@ jobs:
         type=raw,value=${{ needs.generate-tags.outputs.clean_ref_name }}-${{ needs.generate-tags.outputs.tag_date }}-${{ needs.generate-tags.outputs.short_sha }}
         type=raw,value=${{ needs.generate-tags.outputs.clean_ref_name }}-latest
       trigger_internal_ci: true
+
   notify-slack:
     name: Notify Slack
     needs:
@@ -93,7 +101,13 @@ jobs:
       - module-check
       - run-unit-tests
       - run-e2e-tests
-    if: always() && (needs.publish-docker-image.result != 'success' || needs.run-unit-tests.result != 'success' || needs.lint.result != 'success' || needs.run-e2e-tests.result != 'success' || needs.license-check.result != 'success' || needs.module-check.result != 'success')
+    if: github.ref_name == 'master' && always() && (
+      needs.publish-docker-image.result != 'success' || 
+      needs.run-unit-tests.result != 'success' || 
+      needs.lint.result != 'success' || 
+      needs.run-e2e-tests.result != 'success' || 
+      needs.license-check.result != 'success' || 
+      needs.module-check.result != 'success')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code

.github/workflows/on-pull-request.yaml

@@ -29,6 +29,9 @@ jobs:
   run-e2e-tests:
     name: E2E Tests
     uses: ./.github/workflows/test-e2e.yaml
+    permissions:
+      contents: read
+    secrets: inherit
 
   run-smoke-tests:
     name: Smoke Tests

.github/workflows/test-e2e.yaml

@@ -2,7 +2,17 @@ name: E2E Tests
 
 on:
   workflow_call:
-    
+    inputs:
+      hayabusa-e2e-branch:
+        type: string
+        default: 'release/hayabusa'
+  workflow_dispatch:
+    inputs:
+      hayabusa-e2e-branch:
+        description: 'Branch to test against'
+        required: true
+        default: 'release/hayabusa'
+
 permissions:
   contents: read
 
@@ -41,7 +51,7 @@ jobs:
       THOR_IMAGE: vechain/thor:${{ github.sha }}
     name: Run Tests
     steps:
-      # Main: https://github.com/vechain/thor-e2e-tests/tree/edff19f6b2b670f0c5700c26ed7fe576e74c17ce
+      # Main: https://github.com/vechain/thor-e2e-tests/tree/a51bdc9833d1a4641c2d7969414dbe23a4fa345e
       # For release branches, names in the thor and thor-e2e-tests repos should match
       - name: Set e2e repo reference
         id: set-ref
@@ -51,7 +61,7 @@ jobs:
           GITHUB_REF_NAME: ${{ github.ref_name }}
         run: |
           # Default fallback commit
-          DEFAULT_COMMIT="edff19f6b2b670f0c5700c26ed7fe576e74c17ce"
+          DEFAULT_COMMIT="a51bdc9833d1a4641c2d7969414dbe23a4fa345e"
           REF="$DEFAULT_COMMIT"
       
           if [ "$EVENT_NAME" = "pull_request" ]; then
@@ -67,7 +77,7 @@ jobs:
           fi
 
           # Verify if branch exists
-          if ! git ls-remote --heads https://github.com/vechain/thor-e2e-tests.git $REF; then
+          if ! git ls-remote --heads https://github.com/vechain/thor-e2e-tests.git "$REF"; then
             echo "Branch does not exist, using default commit"
             echo "ref=$DEFAULT_COMMIT" >> "$GITHUB_OUTPUT"
           else
@@ -109,3 +119,12 @@ jobs:
           name: e2e-test-results-${{ github.sha }}
           path: ./junit.xml
           retention-days: 14
+
+  run-hayabusa-tests:
+    uses: vechain/hayabusa-e2e/.github/workflows/run-tests.yaml@release/hayabusa
+    with:
+      codebuild-name: codebuild-ThorGHA
+      thor-branch: ${{ github.ref }}
+    permissions:
+      contents: read
+    secrets: inherit

.github/workflows/test-smoke.yaml

@@ -128,6 +128,7 @@ jobs:
 
       - name: Run Smoke Test Separately
         run: |
+          THOR_BRANCH=${{ github.head_ref || github.ref_name }} \
           RUNTESTS=TestSmokeTest,TestGenerateRequests,TestConnectionDiesNoPingResponse,TestConnectionClosedWithoutSubscription \
           TEST_NETWORK_ADDR=http://127.0.0.1:8669 \
           TEST_PK=99f0500549792796c14fed62011a51081dc5b5e68fe8bd8a13b86be829c4fd36 \

.github/workflows/test.yaml

@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install Go
         uses: actions/setup-go@v5
@@ -64,3 +64,44 @@ jobs:
           fail_ci_if_error: true
           files: ./coverage.out
           token: ${{ secrets.CODECOV_TOKEN }}
+
+  solo-test:
+    strategy:
+        matrix:
+            args:
+              - 'solo'
+              - 'solo --hayabusa'
+              - 'solo --on-demand'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.24.x
+
+      - name: Download dependencies
+        run: go mod download
+
+      - name: Start Solo
+        run: nohup go run ./cmd/thor ${{matrix.args}} > thor-solo.log 2>&1 &
+
+      - name: Wait for block 1
+        run: |
+          for i in {1..30}; do
+            status=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:8669/blocks/1 || true)
+            if [ "$status" -eq 200 ]; then
+              echo "✅ Healthcheck passed"
+              exit 0
+            fi
+            echo "Healthcheck failed (status: $status). Retrying in 1s..."
+            sleep 1
+          done
+          echo "❌ Healthcheck failed after 30 attempts"
+          exit 1
+
+      - name: Print Logs
+        if: failure()
+        run: cat thor-solo.log

.golangci.yml

@@ -33,7 +33,7 @@ linters:
           severity: warning
           disabled: false
           exclude:
-            - ""
+            - "builtin/staker/types/*"
   exclusions:
     generated: lax
     presets:

Makefile

@@ -31,8 +31,10 @@ disco:| go_version_check #@ Build the `disco` executable
 	@go build -v -o $(CURDIR)/bin/$@ -ldflags "-X main.version=$(DISCO_VERSION) -X main.gitCommit=$(GIT_COMMIT) -X main.gitTag=$(GIT_TAG) -X main.copyrightYear=$(COPYRIGHT_YEAR)" ./cmd/disco
 	@echo "done. executable created at 'bin/$@'"
 
-dep:| go_version_check
-	@go mod download
+dep:| go_version_check #@ Deprecated legacy dependency management
+
+generate:| go_version_check #@ Generate the `builtin` package
+	@go generate builtin/gen/gen.go
 
 go_version_check:
 	@if test $(MAJOR) -lt $(REQUIRED_GO_MAJOR); then \
@@ -79,7 +81,20 @@ lint_command_check:
 	@command -v golangci-lint || (echo "golangci-lint not found, please install it from https://golangci-lint.run/usage/install/" && exit 1)
 
 lint: | go_version_check lint_command_check #@ Run 'golangci-lint'
+	@echo "running golangci-lint..."
 	@golangci-lint run --config .golangci.yml
+	@echo "running modernize..."
+	@go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@v0.18.1 ./...
+	@echo "done."
+
+lint-fix: | go_version_check lint_command_check #@ Attempt to fix linting issues
+	@echo "running golangci-lint..."
+	@golangci-lint run --config .golangci.yml --fix
+	@echo "running modernize..."
+	@go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@v0.18.1 --fix ./...
+	@echo "running builtin generator..."
+	@go generate ./builtin/gen
+	@echo "done."
 
 license-check: #@ Check license headers
 	@FILE_COUNT=$$(find . -type f -name '*.go' | wc -l); \

README.md

@@ -82,7 +82,7 @@ For more configuration options, see [Command Line Arguments](https://github.com/
 
 #### Prerequisites
 
-Thor requires Go 1.19+ and a C compiler to build. Install them using your preferred package manager before continuing.
+Thor requires <a href="https://golang.org"><img src="https://img.shields.io/github/go-mod/go-version/vechain/thor"/></a> and a C compiler to build. Install them using your preferred package manager before continuing.
 
 #### Commands
 
@@ -122,11 +122,15 @@ Thor will begin syncing the mainnet and can be accessed at [http://localhost:866
 
 #### Docker CLI
 
-```sh
-docker run -d\
-  -v {path-to-your-data-directory}/.org.vechain.thor:/home/thor/.org.vechain.thor\
-  --api-addr 0.0.0.0:8669 -p 127.0.0.1:8669:8669 -p 11235:11235 -p 11235:11235/udp\
-  --name thor-node vechain/thor --network main
+```html
+docker run -d \
+  -v <local-data-dir>/.org.vechain.thor:/home/thor/.org.vechain.thor \
+  -p 127.0.0.1:8669:8669 \
+  -p 11235:11235 \
+  -p 11235:11235/udp \
+  --name thor-node vechain/thor \
+    --network main  \
+    --api-addr 0.0.0.0:8669
 ```
 
 Thor will begin syncing the mainnet and can be accessed at [http://localhost:8669/](http://localhost:8669/).