Merge branch 'main' into adr/bootstrap-from-previous-peers

.github/workflows/ci_release.yml

@@ -24,15 +24,15 @@ on:
 jobs:
   # Dockerfile Linting
   hadolint:
-    uses: celestiaorg/.github/.github/workflows/reusable_dockerfile_lint.yml@main # yamllint disable-line rule:line-length
+    uses: celestiaorg/.github/.github/workflows/reusable_dockerfile_lint.yml@v0.1.0 # yamllint disable-line rule:line-length
     with:
       dockerfile: Dockerfile
 
   yamllint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: celestiaorg/.github/.github/actions/yamllint@main
+      - uses: celestiaorg/.github/.github/actions/yamllint@v0.1.0
 
   markdown-lint:
     name: Markdown Lint
@@ -58,7 +58,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Version Release
-        uses: celestiaorg/.github/.github/actions/version-release@main
+        uses: celestiaorg/.github/.github/actions/version-release@v0.1.0
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           version-bump: ${{inputs.version}}

.github/workflows/docker-build-publish.yml

@@ -17,6 +17,6 @@ jobs:
     permissions:
       contents: write
       packages: write
-    uses: celestiaorg/.github/.github/workflows/reusable_dockerfile_pipeline.yml@main # yamllint disable-line rule:line-length
+    uses: celestiaorg/.github/.github/workflows/reusable_dockerfile_pipeline.yml@v0.1.0 # yamllint disable-line rule:line-length
     with:
       dockerfile: Dockerfile

.github/workflows/go-ci.yml

@@ -4,7 +4,7 @@ on:
   workflow_call:
 
 env:
-  GO_VERSION: 1.19
+  GO_VERSION: '1.20'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -34,7 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: set up go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -69,7 +69,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: set up go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -84,7 +84,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: set up go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/golang:1.19.7-alpine3.17 as builder
+FROM docker.io/golang:1.20-alpine3.17 as builder
 
 # hadolint ignore=DL3018
 RUN apk update && apk add --no-cache \

README.md

@@ -31,8 +31,8 @@ Continue reading [here](https://blog.celestia.org/celestia-mvp-release-data-avai
 ## Minimum requirements
 
 | Requirement | Notes          |
-| ----------- | -------------- |
-| Go version  | 1.19 or higher |
+| ----------- |----------------|
+| Go version  | 1.20 or higher |
 
 ## System Requirements
 

cmd/celestia/cmd_test.go

@@ -4,11 +4,39 @@ import (
 	"bytes"
 	"context"
 	"os"
+	"reflect"
 	"testing"
 
 	"github.com/stretchr/testify/require"
+
+	"github.com/celestiaorg/celestia-node/header"
 )
 
+func TestCompletionHelpString(t *testing.T) {
+	type TestFields struct {
+		NoInputOneOutput        func(context.Context) (*header.ExtendedHeader, error)
+		TwoInputsOneOutputArray func(
+			context.Context,
+			*header.ExtendedHeader,
+			uint64,
+		) ([]*header.ExtendedHeader, error)
+		OneInputOneOutput  func(context.Context, uint64) (*header.ExtendedHeader, error)
+		NoInputsNoOutputs  func(ctx context.Context) error
+		NoInputsChanOutput func(ctx context.Context) (<-chan *header.ExtendedHeader, error)
+	}
+	testOutputs := []string{
+		"() -> (*header.ExtendedHeader)",
+		"(*header.ExtendedHeader, uint64) -> ([]*header.ExtendedHeader)",
+		"(uint64) -> (*header.ExtendedHeader)",
+		"() -> ()",
+		"() -> (<-chan *header.ExtendedHeader)",
+	}
+	methods := reflect.VisibleFields(reflect.TypeOf(TestFields{}))
+	for i, method := range methods {
+		require.Equal(t, testOutputs[i], parseSignatureForHelpstring(method))
+	}
+}
+
 func TestLight(t *testing.T) {
 	// Run the tests in a temporary directory
 	tmpDir := t.TempDir()

cmd/celestia/main.go

@@ -2,9 +2,7 @@ package main
 
 import (
 	"context"
-	"math/rand"
 	"os"
-	"time"
 
 	"github.com/spf13/cobra"
 )
@@ -27,8 +25,6 @@ func main() {
 }
 
 func run() error {
-	rand.Seed(time.Now().Unix())
-
 	return rootCmd.ExecuteContext(context.Background())
 }
 

cmd/celestia/rpc.go

@@ -71,7 +71,7 @@ var rpcCmd = &cobra.Command{
 			methods := reflect.VisibleFields(reflect.TypeOf(module).Elem())
 			var methodNames []string
 			for _, m := range methods {
-				methodNames = append(methodNames, m.Name)
+				methodNames = append(methodNames, m.Name+"\t"+parseSignatureForHelpstring(m))
 			}
 			return methodNames, cobra.ShellCompDirectiveNoFileComp
 		}
@@ -90,6 +90,21 @@ func parseParams(method string, params []string) []interface{} {
 	parsedParams := make([]interface{}, len(params))
 
 	switch method {
+	case "GetSharesByNamespace":
+		// 1. Share Root
+		parsedParams[0] = params[0]
+		// 2. NamespaceID
+		if strings.HasPrefix(params[1], "0x") {
+			decoded, err := hex.DecodeString(params[1][2:])
+			if err != nil {
+				panic("Error decoding namespace ID: hex string could not be decoded.")
+			}
+			parsedParams[1] = decoded
+		} else {
+			// otherwise, it's just a base64 string
+			parsedParams[1] = params[1]
+		}
+		return parsedParams
 	case "SubmitPayForBlob":
 		// 1. NamespaceID
 		if strings.HasPrefix(params[0], "0x") {
@@ -282,3 +297,23 @@ func parseAddressFromString(addrStr string) (state.Address, error) {
 
 	return addr, nil
 }
+
+func parseSignatureForHelpstring(methodSig reflect.StructField) string {
+	simplifiedSignature := "("
+	in, out := methodSig.Type.NumIn(), methodSig.Type.NumOut()
+	for i := 1; i < in; i++ {
+		simplifiedSignature += methodSig.Type.In(i).String()
+		if i != in-1 {
+			simplifiedSignature += ", "
+		}
+	}
+	simplifiedSignature += ") -> ("
+	for i := 0; i < out-1; i++ {
+		simplifiedSignature += methodSig.Type.Out(i).String()
+		if i != out-2 {
+			simplifiedSignature += ", "
+		}
+	}
+	simplifiedSignature += ")"
+	return simplifiedSignature
+}

cmd/flags_misc.go

@@ -235,7 +235,7 @@ func ParseMiscFlags(ctx context.Context, cmd *cobra.Command) (context.Context, e
 				tp,
 				otelpyroscope.WithAppName("celestia.da-node"),
 				otelpyroscope.WithPyroscopeURL(cmd.Flag(pyroscopeEndpoint).Value.String()),
-				otelpyroscope.WithRootSpanOnly(false),
+				otelpyroscope.WithRootSpanOnly(true),
 				otelpyroscope.WithAddSpanName(true),
 				otelpyroscope.WithProfileURL(true),
 				otelpyroscope.WithProfileBaselineURL(true),

cmd/start.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"errors"
 	"os"
 	"os/signal"
 	"path/filepath"
@@ -9,7 +10,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
-	"go.uber.org/multierr"
 
 	"github.com/celestiaorg/celestia-app/app"
 	"github.com/celestiaorg/celestia-app/app/encoding"
@@ -48,8 +48,9 @@ Options passed on start override configuration options only on start and are not
 			if err != nil {
 				return err
 			}
-			// TODO(@Wondertan): Use join errors instead in go1.21
-			defer multierr.AppendInvoke(&err, multierr.Invoke(store.Close))
+			defer func() {
+				err = errors.Join(err, store.Close())
+			}()
 
 			nd, err := nodebuilder.NewWithConfig(NodeType(ctx), Network(ctx), store, &cfg, NodeOptions(ctx)...)
 			if err != nil {

das/daser_test.go

@@ -21,6 +21,8 @@ import (
 	"github.com/celestiaorg/celestia-node/header"
 	"github.com/celestiaorg/celestia-node/header/headertest"
 	"github.com/celestiaorg/celestia-node/libs/fraud"
+	"github.com/celestiaorg/celestia-node/libs/fraud/fraudserv"
+	"github.com/celestiaorg/celestia-node/libs/fraud/fraudtest"
 	"github.com/celestiaorg/celestia-node/share"
 	"github.com/celestiaorg/celestia-node/share/availability/full"
 	"github.com/celestiaorg/celestia-node/share/availability/light"
@@ -160,7 +162,7 @@ func TestDASer_stopsAfter_BEFP(t *testing.T) {
 	getter := func(ctx context.Context, height uint64) (libhead.Header, error) {
 		return mockGet.GetByHeight(ctx, height)
 	}
-	f := fraud.NewProofService(ps, net.Hosts()[0], getter, ds, false, "private")
+	f := fraudserv.NewProofService(ps, net.Hosts()[0], getter, ds, false, "private")
 	require.NoError(t, f.Start(ctx))
 	mockGet.headers[1], _ = headertest.CreateFraudExtHeader(t, mockGet.headers[1], bServ)
 	newCtx := context.Background()
@@ -205,8 +207,8 @@ func TestDASerSampleTimeout(t *testing.T) {
 		})
 
 	ds := ds_sync.MutexWrap(datastore.NewMapDatastore())
-	sub := new(headertest.DummySubscriber)
-	f := new(fraud.DummyService)
+	sub := new(headertest.Subscriber)
+	f := new(fraudtest.DummyService)
 
 	// create and start DASer
 	daser, err := NewDASer(avail, sub, getter, ds, f, newBroadcastMock(1), WithSampleTimeout(1))
@@ -231,9 +233,9 @@ func createDASerSubcomponents(
 	bServ blockservice.BlockService,
 	numGetter,
 	numSub int,
-) (*mockGetter, *headertest.DummySubscriber, *fraud.DummyService) {
+) (*mockGetter, *headertest.Subscriber, *fraudtest.DummyService) {
 	mockGet, sub := createMockGetterAndSub(t, bServ, numGetter, numSub)
-	fraud := new(fraud.DummyService)
+	fraud := new(fraudtest.DummyService)
 	return mockGet, sub, fraud
 }
 
@@ -242,7 +244,7 @@ func createMockGetterAndSub(
 	bServ blockservice.BlockService,
 	numGetter,
 	numSub int,
-) (*mockGetter, *headertest.DummySubscriber) {
+) (*mockGetter, *headertest.Subscriber) {
 	mockGet := &mockGetter{
 		headers:        make(map[int64]*header.ExtendedHeader),
 		doneCh:         make(chan struct{}),
@@ -251,16 +253,15 @@ func createMockGetterAndSub(
 
 	mockGet.generateHeaders(t, bServ, 0, numGetter)
 
-	sub := new(headertest.DummySubscriber)
+	sub := new(headertest.Subscriber)
 	mockGet.fillSubWithHeaders(t, sub, bServ, numGetter, numGetter+numSub)
-
 	return mockGet, sub
 }
 
 // fillSubWithHeaders generates `num` headers from the future for p2pSub to pipe through to DASer.
 func (m *mockGetter) fillSubWithHeaders(
 	t *testing.T,
-	sub *headertest.DummySubscriber,
+	sub *headertest.Subscriber,
 	bServ blockservice.BlockService,
 	startHeight,
 	endHeight int,

das/state_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"go.uber.org/multierr"
 )
 
 func Test_coordinatorStats(t *testing.T) {
@@ -38,7 +37,7 @@ func Test_coordinatorStats(t *testing.T) {
 							},
 							Curr:   15,
 							failed: []uint64{12, 13},
-							Err:    multierr.Append(errors.New("12: failed"), errors.New("13: failed")),
+							Err:    errors.Join(errors.New("12: failed"), errors.New("13: failed")),
 						}
 					},
 				},
@@ -63,7 +62,7 @@ func Test_coordinatorStats(t *testing.T) {
 						Curr:   15,
 						From:   11,
 						To:     20,
-						ErrMsg: "12: failed; 13: failed",
+						ErrMsg: "12: failed\n13: failed",
 					},
 				},
 				Concurrency: 2,

das/worker.go

@@ -7,8 +7,6 @@ import (
 	"sync"
 	"time"
 
-	"go.uber.org/multierr"
-
 	libhead "github.com/celestiaorg/go-header"
 
 	"github.com/celestiaorg/celestia-node/header"
@@ -114,7 +112,7 @@ func (w *worker) sample(ctx context.Context, timeout time.Duration, height uint6
 				"height", h.Height(),
 				"hash", h.Hash(),
 				"square width", len(h.DAH.RowsRoots),
-				"data root", h.DAH.Hash(),
+				"data root", h.DAH.String(),
 				"err", err,
 				"finished (s)", time.Since(start),
 			)
@@ -127,7 +125,7 @@ func (w *worker) sample(ctx context.Context, timeout time.Duration, height uint6
 		"height", h.Height(),
 		"hash", h.Hash(),
 		"square width", len(h.DAH.RowsRoots),
-		"data root", h.DAH.Hash(),
+		"data root", h.DAH.String(),
 		"finished (s)", time.Since(start),
 	)
 
@@ -168,7 +166,7 @@ func (w *worker) getHeader(ctx context.Context, height uint64) (*header.Extended
 		"height", h.Height(),
 		"hash", h.Hash(),
 		"square width", len(h.DAH.RowsRoots),
-		"data root", h.DAH.Hash(),
+		"data root", h.DAH.String(),
 		"finished (s)", time.Since(start),
 	)
 	return h, nil
@@ -179,7 +177,7 @@ func (w *worker) setResult(curr uint64, err error) {
 	defer w.lock.Unlock()
 	if err != nil {
 		w.state.failed = append(w.state.failed, curr)
-		w.state.Err = multierr.Append(w.state.Err, fmt.Errorf("height: %v, err: %w", curr, err))
+		w.state.Err = errors.Join(w.state.Err, fmt.Errorf("height: %v, err: %w", curr, err))
 	}
 	w.state.Curr = curr
 }