Merge branch 'main' into static-checker-ci

.github/workflows/delete_workflow_runs.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+
+set -e
+
+if [ $# -eq 0 ]; then
+    echo "Error: No workflow name provided."
+    echo "Usage: $0 <workflow-name>"
+    exit 1
+fi
+
+WORKFLOW_NAME="$1"
+
+echo "Fetching repository information..."
+REPO_INFO=$(gh repo view --json nameWithOwner)
+REPO=$(echo $REPO_INFO | jq -r .nameWithOwner)
+echo "Repository: $REPO"
+
+echo "Searching for workflows with name: '$WORKFLOW_NAME'"
+WORKFLOW_IDS=$(gh api "/repos/$REPO/actions/workflows" | jq -r ".workflows[] | select(.name == \"$WORKFLOW_NAME\") | .id")
+
+if [ -z "$WORKFLOW_IDS" ]; then
+    echo "No workflows found with name '$WORKFLOW_NAME'"
+    exit 1
+fi
+
+echo "Found workflow(s) with ID(s): $WORKFLOW_IDS"
+
+delete_runs() {
+    local workflow_id=$1
+    local page=$2
+    echo "Fetching runs for workflow $workflow_id (page $page)..."
+    RUNS=$(gh api "/repos/$REPO/actions/workflows/$workflow_id/runs?per_page=100&page=$page")
+    RUN_COUNT=$(echo $RUNS | jq '.workflow_runs | length')
+
+    if [ "$RUN_COUNT" -eq 0 ]; then
+        return 1
+    fi
+
+    echo "Deleting $RUN_COUNT runs..."
+    echo $RUNS | jq -r '.workflow_runs[].id' | while read -r run_id; do
+        echo "Deleting run $run_id"
+        gh api -X DELETE "/repos/$REPO/actions/runs/$run_id"
+    done
+
+    return 0
+}
+
+for WORKFLOW_ID in $WORKFLOW_IDS; do
+    echo "Processing workflow ID: $WORKFLOW_ID"
+    page=1
+    while delete_runs $WORKFLOW_ID $page; do
+        ((page++))
+    done
+
+    echo "All runs deleted for workflow ID $WORKFLOW_ID"
+
+    echo "Deleting the workflow itself..."
+    gh api -X DELETE "/repos/$REPO/actions/workflows/$WORKFLOW_ID"
+
+    echo "Workflow with ID $WORKFLOW_ID has been deleted."
+done
+
+echo "All workflows named '$WORKFLOW_NAME' and their runs have been deleted."

.github/workflows/release.yaml → .github/workflows/deploy_gcp_bootnodes.yaml

@@ -1,18 +1,8 @@
-name: release
-
+name: Deploy GCP Testnet Bootnodes 
 on:
   push:
-    branches:
-      - main
-      - test
-      - dev
-
-    paths-ignore:
-      - 'docs/**'
-      - '**.md'
-      - '.github/workflows/build.yaml'
-      - '.github/workflows/gh-release.yaml'
-      - '.github/workflows/publish-to-docs.yaml'
+    tags:
+      - 'v*'  # This will match any tag that starts with 'v'
 
 permissions:
   id-token: write
@@ -22,73 +12,60 @@ jobs:
   build-and-release:
     runs-on: ubuntu-latest
     environment: 
-      name: ${{ github.ref == 'refs/heads/main' && 'main' || github.ref == 'refs/heads/test' && 'test' || 'dev' }}
+      name: "test" #will expand to other envs later, currently "test" deploys to the 5 GCP bootnodes
     outputs:
       environment: ${{ steps.set-env.outputs.environment }}
     steps:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
         go-version: '1.21'
 
     - name: Set Version
-      run: echo "VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
-
+      run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
     - name: Build Binary
       run: |
         make build
-
     - id: auth
       uses: google-github-actions/auth@v2
       with:
         workload_identity_provider: projects/784882329213/locations/global/workloadIdentityPools/github-oidc-pool/providers/github-oidc-provider
-        service_account: gh-masa-oracle-${{ github.ref_name }}@masa-chain.iam.gserviceaccount.com
-
+        service_account: [email protected]
     - name: Install Google Cloud SDK
       uses: google-github-actions/setup-gcloud@v2
       with:
         version: 'latest'
         project_id: ${{ vars.GCP_PROJECT_ID }}
-
     - name: Upload Binary and config for contracts npm modules to GCP
       run: |
-        BINARY_NAME=$(git rev-parse --short HEAD)
-        gsutil cp ./masa-node gs://${{ vars.GCP_BUCKET_NAME }}/$BINARY_NAME/masa-node
-        gsutil cp ./masa-node gs://${{ vars.GCP_BUCKET_NAME }}/masa-node
+        BINARY_NAME=${GITHUB_REF#refs/tags/}
+        gsutil cp ./bin/masa-node gs://${{ vars.GCP_BUCKET_NAME }}/$BINARY_NAME/masa-node
+        gsutil cp ./bin/masa-node gs://${{ vars.GCP_BUCKET_NAME }}/masa-node
         gsutil cp ./contracts/* gs://${{ vars.GCP_BUCKET_NAME }}/$BINARY_NAME/
         gsutil cp ./contracts/* gs://${{ vars.GCP_BUCKET_NAME }}/
 
-    - name: Set environment output
-      id: set-env
-      run: echo "::set-output name=environment::${{ github.ref_name }}"
-
   deploy:
     needs: build-and-release
     runs-on: ubuntu-latest
     environment:
-      name: ${{ needs.build-and-release.outputs.environment }}
+      name: test
     steps:
     - id: auth
       uses: google-github-actions/auth@v2
       with:
         workload_identity_provider: projects/784882329213/locations/global/workloadIdentityPools/github-oidc-pool/providers/github-oidc-provider
-        service_account: gh-masa-oracle-${{ github.ref_name }}@masa-chain.iam.gserviceaccount.com
-
+        service_account: [email protected]
     - name: Update Instance Metadata
       run: |
-        ENVIRONMENT="${{ github.ref_name }}"
+        ENVIRONMENT="test"
         echo "Looking for instances with env metadata: $ENVIRONMENT"
         INSTANCES=$(gcloud compute instances list --filter="metadata.items.ENV=$ENVIRONMENT" --format="get(name)")
-
         echo "Found instances: $INSTANCES"
-
         for INSTANCE in $INSTANCES; do
           ZONE=$(gcloud compute instances list --filter="name=($INSTANCE)" --format="get(zone)" --limit=1)
           echo "Updating instance: $INSTANCE in zone: $ZONE"
-          gcloud compute instances add-metadata $INSTANCE --metadata masa-oracle-redeploy=latest --zone=$(echo $ZONE | tr -d '\n')
+          gcloud compute instances add-metadata $INSTANCE --metadata masa-oracle-redeploy=${GITHUB_REF#refs/tags/} --zone=$(echo $ZONE | tr -d '\n')
         done
-

.github/workflows/tests.yaml

@@ -1,4 +1,4 @@
-name: Go
+name: Run Go Tests
 
 on:
   push:
@@ -24,4 +24,4 @@ jobs:
       run: go mod tidy
 
     - name: Run tests
-      run: go test ./...
+      run: go test ./...

Makefile

@@ -4,8 +4,8 @@ print-version:
 	@echo "Version: ${VERSION}"
 
 build:
-	@go build -v -ldflags "-X github.com/masa-finance/masa-oracle/pkg/config.Version=${VERSION}" -o ./bin/masa-node ./cmd/masa-node
-	@go build -v -ldflags "-X github.com/masa-finance/masa-oracle/pkg/config.Version=${VERSION}" -o ./bin/masa-node-cli ./cmd/masa-node-cli
+	@go build -v -ldflags "-X github.com/masa-finance/masa-oracle/internal/versioning.ApplicationVersion=${VERSION}" -o ./bin/masa-node ./cmd/masa-node
+	@go build -v -ldflags "-X github.com/masa-finance/masa-oracle/internal/versioning.ApplicationVersion=${VERSION}" -o ./bin/masa-node-cli ./cmd/masa-node-cli
 
 install:
 	@sh ./node_install.sh

cmd/masa-node-cli/components.go

@@ -5,7 +5,8 @@ import (
 	"strings"
 
 	"github.com/gdamore/tcell/v2"
-	"github.com/masa-finance/masa-oracle/pkg/config"
+	"github.com/masa-finance/masa-oracle/internal/versioning"
+
 	"github.com/rivo/tview"
 )
 
@@ -125,7 +126,7 @@ const (
 	navigation = `[yellow]use keys or mouse to navigate`
 )
 
-var version string = fmt.Sprintf("[green]%s", config.Version)
+var version string = fmt.Sprintf(`[green]Application version: %s\n[green]Protocol Version: %s`, versioning.ApplicationVersion, versioning.ProtocolVersion)
 
 // Splash shows the app info
 func Splash() (content tview.Primitive) {

cmd/masa-node/main.go

@@ -6,6 +6,7 @@ import (
 	"os/signal"
 	"syscall"
 
+	"github.com/masa-finance/masa-oracle/internal/versioning"
 	"github.com/masa-finance/masa-oracle/pkg/workers"
 
 	"github.com/sirupsen/logrus"
@@ -21,7 +22,7 @@ import (
 func main() {
 
 	if len(os.Args) > 1 && os.Args[1] == "--version" {
-		logrus.Infof("Masa Oracle Node Version: %s\n", config.Version)
+		logrus.Infof("Masa Oracle Node Version: %s\nMasa Oracle Protocol verison: %s", versioning.ApplicationVersion, versioning.ProtocolVersion)
 		os.Exit(0)
 	}
 
@@ -97,7 +98,7 @@ func main() {
 	// and other peers can do work we only need to check this here
 	// if this peer can or cannot scrape or write that is checked in other places
 	if node.IsStaked {
-		go workers.MonitorWorkers(ctx, node)
+		node.Host.SetStreamHandler(config.ProtocolWithVersion(config.WorkerProtocol), workers.GetWorkHandlerManager().HandleWorkerStream)
 		go masa.SubscribeToBlocks(ctx, node)
 		go node.NodeTracker.ClearExpiredWorkerTimeouts()
 	}
@@ -135,7 +136,7 @@ func main() {
 	multiAddr := node.GetMultiAddrs().String() // Get the multiaddress
 	ipAddr := node.Host.Addrs()[0].String()    // Get the IP address
 	// Display the welcome message with the multiaddress and IP address
-	config.DisplayWelcomeMessage(multiAddr, ipAddr, keyManager.EthAddress, isStaked, isValidator, cfg.TwitterScraper, cfg.TelegramScraper, cfg.DiscordScraper, cfg.WebScraper, config.Version)
+	config.DisplayWelcomeMessage(multiAddr, ipAddr, keyManager.EthAddress, isStaked, isValidator, cfg.TwitterScraper, cfg.TelegramScraper, cfg.DiscordScraper, cfg.WebScraper, versioning.ApplicationVersion, versioning.ProtocolVersion)
 
 	<-ctx.Done()
 }