Merge branch 'main' into chore/ramin/jwt-newline

.github/workflows/ci_release.yml

@@ -9,7 +9,6 @@ on:
       - "v*"
   pull_request:
   workflow_dispatch:
-    # Inputs the workflow accepts.
     inputs:
       version:
         # Friendly description to be shown in the UI instead of 'name'
@@ -23,6 +22,27 @@ on:
           - major
 
 jobs:
+  # set up go version for use through pipelines, setting
+  # variable one time and setting outputs to access passing it
+  # to other jobs
+  setup:
+    runs-on: ubuntu-latest
+    env:
+      # upgrade go version throughout pipeline here
+      GO_VERSION: "1.21"
+    outputs:
+      go-version: ${{ steps.set-vars.outputs.go-version }}
+      branch: ${{ steps.trim_ref.outputs.branch }}
+    steps:
+      - name: Set go version
+        id: set-vars
+        run: echo "go-version=${{env.GO_VERSION}}" >> "$GITHUB_OUTPUT"
+
+      - name: Trim branch name
+        id: trim_ref
+        run: |
+          echo "branch=$(${${{ github.ref }}:11})" >> $GITHUB_OUTPUT
+
   # Dockerfile Linting
   hadolint:
     uses: celestiaorg/.github/.github/workflows/[email protected] # yamllint disable-line rule:line-length
@@ -48,7 +68,10 @@ jobs:
           markdownlint --config .markdownlint.yaml '**/*.md'
 
   go-ci:
+    needs: setup
     uses: ./.github/workflows/go-ci.yml
+    with:
+      go-version: ${{ needs.setup.outputs.go-version }}
 
   # If this was a workflow dispatch event, we need to generate and push a tag
   # for goreleaser to grab
@@ -58,6 +81,7 @@ jobs:
     permissions: "write-all"
     steps:
       - uses: actions/checkout@v4
+
       - name: Bump version and push tag
         # Placing the if condition here is a workaround for needing to block
         # on this step during workflow dispatch events but the step not
@@ -66,12 +90,10 @@ jobs:
         # in goreleaser not running either.
         if: ${{ github.event_name == 'workflow_dispatch' }}
         uses: mathieudutour/[email protected]
-
-      - name: Version Release
-        uses: celestiaorg/.github/.github/actions/[email protected]
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           default_bump: ${{ inputs.version }}
+          release_branches: ${{ needs.setup.outputs.branch }}
 
   # Generate the release with goreleaser to include pre-built binaries
   goreleaser:
@@ -83,16 +105,20 @@ jobs:
     permissions: "write-all"
     steps:
       - uses: actions/checkout@v4
+
       - run: git fetch --force --tags
+
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: ${{ needs.setup.outputs.go-version }}
+
       - name: Import GPG key
         id: import_gpg
         uses: crazy-max/ghaction-import-gpg@v4
         with:
           gpg_private_key: ${{ secrets.GPG_SIGNING_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
+
       # Generate the binaries and release
       - uses: goreleaser/goreleaser-action@v5
         with:

.github/workflows/go-ci.yml

@@ -2,9 +2,11 @@ name: Go CI
 
 on:
   workflow_call:
-
-env:
-  GO_VERSION: '1.21'
+    inputs:
+      go-version:
+        description: 'Go version'
+        required: true
+        type: string
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -20,7 +22,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version: ${{ inputs.go-version }}
 
       - name: golangci-lint
         uses: golangci/[email protected]
@@ -38,7 +40,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version: ${{ inputs.go-version }}
 
       - run: go mod tidy
 
@@ -61,7 +63,7 @@ jobs:
       - name: set up go
         uses: actions/setup-go@v4
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version: ${{ inputs.go-version }}
 
       - name: run unit tests
         run: make test-unit
@@ -85,10 +87,11 @@ jobs:
       - name: set up go
         uses: actions/setup-go@v4
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version: ${{ inputs.go-version }}
 
       - name: execute test run
         run: make test-unit-race
+        continue-on-error: true
 
   integration_test:
     needs: [lint, go_mod_tidy_check]
@@ -101,10 +104,12 @@ jobs:
       - name: set up go
         uses: actions/setup-go@v4
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version: ${{ inputs.go-version }}
 
       - name: Swamp Tests
         run: make test-swamp
+        continue-on-error: true
 
       - name: Swamp Tests with Race Detector
         run: make test-swamp-race
+        continue-on-error: true

nodebuilder/settings.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"time"
 
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/pyroscope-io/client/pyroscope"
 	otelpyroscope "github.com/pyroscope-io/otel-profiling-go"
@@ -208,5 +209,14 @@ func initializeMetrics(
 		},
 	})
 	otel.SetMeterProvider(provider)
+	otel.SetErrorHandler(&loggingErrorHandler{})
 	return nil
 }
+
+var metricsLogger = logging.Logger("otlp")
+
+type loggingErrorHandler struct{}
+
+func (loggingErrorHandler) Handle(err error) {
+	metricsLogger.Error(err)
+}

nodebuilder/share/cmd/share.go

@@ -1,12 +1,14 @@
 package cmd
 
 import (
+	"context"
 	"encoding/hex"
-	"encoding/json"
+	"fmt"
 	"strconv"
 
 	"github.com/spf13/cobra"
 
+	rpc "github.com/celestiaorg/celestia-node/api/rpc/client"
 	cmdnode "github.com/celestiaorg/celestia-node/cmd"
 	"github.com/celestiaorg/celestia-node/header"
 	"github.com/celestiaorg/celestia-node/share"
@@ -39,13 +41,8 @@ var sharesAvailableCmd = &cobra.Command{
 		}
 		defer client.Close()
 
-		raw, err := parseJSON(args[0])
-		if err != nil {
-			return err
-		}
+		eh, err := getExtendedHeaderFromCmdArg(cmd.Context(), client, args[0])
 
-		var eh *header.ExtendedHeader
-		err = json.Unmarshal(raw, &eh)
 		if err != nil {
 			return err
 		}
@@ -72,7 +69,7 @@ var sharesAvailableCmd = &cobra.Command{
 }
 
 var getSharesByNamespaceCmd = &cobra.Command{
-	Use:   "get-by-namespace [extended header, namespace]",
+	Use:   "get-by-namespace (height | hash) namespace",
 	Short: "Gets all shares from an EDS within the given namespace.",
 	Args:  cobra.ExactArgs(2),
 	RunE: func(cmd *cobra.Command, args []string) error {
@@ -82,13 +79,8 @@ var getSharesByNamespaceCmd = &cobra.Command{
 		}
 		defer client.Close()
 
-		raw, err := parseJSON(args[0])
-		if err != nil {
-			return err
-		}
+		eh, err := getExtendedHeaderFromCmdArg(cmd.Context(), client, args[0])
 
-		var eh *header.ExtendedHeader
-		err = json.Unmarshal(raw, &eh)
 		if err != nil {
 			return err
 		}
@@ -104,7 +96,7 @@ var getSharesByNamespaceCmd = &cobra.Command{
 }
 
 var getShare = &cobra.Command{
-	Use:   "get-share [extended header, row, col]",
+	Use:   "get-share (height | hash) row col",
 	Short: "Gets a Share by coordinates in EDS.",
 	Args:  cobra.ExactArgs(3),
 	RunE: func(cmd *cobra.Command, args []string) error {
@@ -114,13 +106,8 @@ var getShare = &cobra.Command{
 		}
 		defer client.Close()
 
-		raw, err := parseJSON(args[0])
-		if err != nil {
-			return err
-		}
+		eh, err := getExtendedHeaderFromCmdArg(cmd.Context(), client, args[0])
 
-		var eh *header.ExtendedHeader
-		err = json.Unmarshal(raw, &eh)
 		if err != nil {
 			return err
 		}
@@ -158,8 +145,8 @@ var getShare = &cobra.Command{
 }
 
 var getEDS = &cobra.Command{
-	Use:   "get-eds [extended header]",
-	Short: "Gets the full EDS identified by the given extended header",
+	Use:   "get-eds (height | hash)",
+	Short: "Gets the full EDS identified by the given block height",
 	Args:  cobra.ExactArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
 		client, err := cmdnode.ParseClientFromCtx(cmd.Context())
@@ -168,13 +155,8 @@ var getEDS = &cobra.Command{
 		}
 		defer client.Close()
 
-		raw, err := parseJSON(args[0])
-		if err != nil {
-			return err
-		}
+		eh, err := getExtendedHeaderFromCmdArg(cmd.Context(), client, args[0])
 
-		var eh *header.ExtendedHeader
-		err = json.Unmarshal(raw, &eh)
 		if err != nil {
 			return err
 		}
@@ -184,8 +166,14 @@ var getEDS = &cobra.Command{
 	},
 }
 
-func parseJSON(param string) (json.RawMessage, error) {
-	var raw json.RawMessage
-	err := json.Unmarshal([]byte(param), &raw)
-	return raw, err
+func getExtendedHeaderFromCmdArg(ctx context.Context, client *rpc.Client, arg string) (*header.ExtendedHeader, error) {
+	hash, err := hex.DecodeString(arg)
+	if err == nil {
+		return client.Header.GetByHash(ctx, hash)
+	}
+	height, err := strconv.ParseUint(arg, 10, 64)
+	if err != nil {
+		return nil, fmt.Errorf("can't parse the height/hash argument: %w", err)
+	}
+	return client.Header.GetByHeight(ctx, height)
 }