merge changes from release/v0.27.0 (#4616)

Author: vgonkivs

api/client/client_test.go

@@ -17,9 +17,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"go.uber.org/fx"
 
-	"github.com/celestiaorg/celestia-app/v5/test/util/genesis"
-	"github.com/celestiaorg/celestia-app/v5/test/util/testnode"
-	libshare "github.com/celestiaorg/go-square/v2/share"
+	"github.com/celestiaorg/celestia-app/v6/test/util/testnode"
+	libshare "github.com/celestiaorg/go-square/v3/share"
 
 	"github.com/celestiaorg/celestia-node/api/rpc"
 	"github.com/celestiaorg/celestia-node/api/rpc/perms"
@@ -112,23 +111,11 @@ func TestSubmission(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
 	t.Cleanup(cancel)
 
-	accounts := []genesis.KeyringAccount{
-		{
-			Name:          "Elon",
-			InitialTokens: 342_000_000_000,
-		},
-		{
-			Name:          "Mark",
-			InitialTokens: 246_000_000_000,
-		},
-		{
-			Name:          "Jeff",
-			InitialTokens: 215_000_000_000,
-		},
-		{
-			Name:          "Warren",
-			InitialTokens: 154_000_000_000,
-		},
+	accounts := []string{
+		"Elon",
+		"Mark",
+		"Jeff",
+		"Warren",
 	}
 
 	start := time.Now()
@@ -146,7 +133,7 @@ func TestSubmission(t *testing.T) {
 		},
 
 		SubmitConfig: SubmitConfig{
-			DefaultKeyName: accounts[0].Name,
+			DefaultKeyName: accounts[0],
 			Network:        "private",
 			CoreGRPCConfig: CoreGRPCConfig{
 				Addr: cctx.GRPCClient.Target(),
@@ -192,16 +179,16 @@ func TestSubmission(t *testing.T) {
 		t.Cleanup(cancel)
 
 		submitCfg := state.NewTxConfig(
-			state.WithKeyName(acc.Name),
+			state.WithKeyName(acc),
 		)
 		height, err := client.Blob.Submit(submitCtx, submitBlobs, submitCfg)
 		require.NoError(t, err)
-		fmt.Println("submit", acc.Name, height, time.Since(now).String())
+		fmt.Println("submit", acc, height, time.Since(now).String())
 
 		received, err := client.Blob.Get(submitCtx, height, namespace, b.Commitment)
 		require.NoError(t, err)
 		require.Equal(t, b.Data(), received.Data())
-		fmt.Println("get", acc.Name, time.Since(now).String())
+		fmt.Println("get", acc, time.Since(now).String())
 	}
 }
 
@@ -284,25 +271,15 @@ func addAuth(t *testing.T) (fx.Option, string) {
 	}), string(adminToken)
 }
 
-func setupConsensus(t *testing.T, ctx context.Context, accounts ...genesis.KeyringAccount) testnode.Context {
+func setupConsensus(t *testing.T, ctx context.Context, accounts ...string) testnode.Context {
 	t.Helper()
 	chainID := "private"
-	tmCfg := testnode.DefaultTendermintConfig()
-	tmCfg.Consensus.TimeoutCommit = time.Millisecond * 1
-
-	appConf := testnode.DefaultAppConfig()
-	appConf.API.Enable = true
-
-	g := genesis.NewDefaultGenesis().
-		WithChainID(chainID).
-		WithValidators(genesis.NewDefaultValidator(testnode.DefaultValidatorAccountName)).
-		WithConsensusParams(testnode.DefaultConsensusParams()).WithKeyringAccounts(accounts...)
 
 	config := testnode.DefaultConfig().
 		WithChainID(chainID).
-		WithTendermintConfig(tmCfg).
-		WithAppConfig(appConf).
-		WithGenesis(g)
+		WithFundedAccounts(accounts...).
+		WithTimeoutCommit(1 * time.Millisecond).
+		WithDelayedPrecommitTimeout(50 * time.Millisecond)
 
 	cctx, _, _ := testnode.NewNetwork(t, config)
 

api/client/example/example.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
 
-	libshare "github.com/celestiaorg/go-square/v2/share"
+	libshare "github.com/celestiaorg/go-square/v3/share"
 
 	"github.com/celestiaorg/celestia-node/api/client"
 	"github.com/celestiaorg/celestia-node/blob"

api/client/keyring.go

@@ -10,8 +10,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
-	"github.com/celestiaorg/celestia-app/v5/app"
-	"github.com/celestiaorg/celestia-app/v5/app/encoding"
+	"github.com/celestiaorg/celestia-app/v6/app"
+	"github.com/celestiaorg/celestia-app/v6/app/encoding"
 )
 
 // KeyringConfig contains configuration parameters for constructing

api/docgen/examples.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/celestiaorg/go-fraud"
 	libhead "github.com/celestiaorg/go-header"
-	libshare "github.com/celestiaorg/go-square/v2/share"
+	libshare "github.com/celestiaorg/go-square/v3/share"
 	"github.com/celestiaorg/rsmt2d"
 
 	"github.com/celestiaorg/celestia-node/blob"

blob/blob.go

@@ -6,10 +6,10 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/celestiaorg/celestia-app/v5/pkg/appconsts"
+	"github.com/celestiaorg/celestia-app/v6/pkg/appconsts"
 	"github.com/celestiaorg/go-square/merkle"
-	"github.com/celestiaorg/go-square/v2/inclusion"
-	libshare "github.com/celestiaorg/go-square/v2/share"
+	"github.com/celestiaorg/go-square/v3/inclusion"
+	libshare "github.com/celestiaorg/go-square/v3/share"
 	"github.com/celestiaorg/nmt"
 )
 
@@ -115,7 +115,8 @@ func (b *Blob) Length() (int, error) {
 	if len(s) == 0 {
 		return 0, errors.New("blob with zero shares received")
 	}
-	return libshare.SparseSharesNeeded(s[0].SequenceLen()), nil
+	containsSigner := b.ShareVersion() == libshare.ShareVersionOne
+	return libshare.SparseSharesNeeded(s[0].SequenceLen(), containsSigner), nil
 }
 
 // Signer returns blob's author.

blob/blob_fuzz_test.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	libshare "github.com/celestiaorg/go-square/v2/share"
+	libshare "github.com/celestiaorg/go-square/v3/share"
 )
 
 func FuzzBlobUnmarshal(f *testing.F) {

blob/blob_test.go

@@ -8,8 +8,8 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/celestiaorg/go-square/merkle"
-	"github.com/celestiaorg/go-square/v2/inclusion"
-	libshare "github.com/celestiaorg/go-square/v2/share"
+	"github.com/celestiaorg/go-square/v3/inclusion"
+	libshare "github.com/celestiaorg/go-square/v3/share"
 )
 
 func TestBlob(t *testing.T) {

blob/commitment_proof.go

@@ -7,10 +7,10 @@ import (
 
 	tmjson "github.com/cometbft/cometbft/libs/json"
 
-	"github.com/celestiaorg/celestia-app/v5/pkg/appconsts"
-	"github.com/celestiaorg/celestia-app/v5/pkg/proof"
-	"github.com/celestiaorg/go-square/v2/inclusion"
-	libshare "github.com/celestiaorg/go-square/v2/share"
+	"github.com/celestiaorg/celestia-app/v6/pkg/appconsts"
+	"github.com/celestiaorg/celestia-app/v6/pkg/proof"
+	"github.com/celestiaorg/go-square/v3/inclusion"
+	libshare "github.com/celestiaorg/go-square/v3/share"
 	"github.com/celestiaorg/nmt"
 	"github.com/celestiaorg/nmt/namespace"
 )

blob/helper.go

@@ -4,8 +4,8 @@ import (
 	"sort"
 
 	"github.com/celestiaorg/go-square/merkle"
-	"github.com/celestiaorg/go-square/v2/inclusion"
-	libshare "github.com/celestiaorg/go-square/v2/share"
+	"github.com/celestiaorg/go-square/v3/inclusion"
+	libshare "github.com/celestiaorg/go-square/v3/share"
 )
 
 // BlobsToShares accepts blobs and convert them to the Shares.

blob/helper_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	libshare "github.com/celestiaorg/go-square/v2/share"
+	libshare "github.com/celestiaorg/go-square/v3/share"
 )
 
 func TestBlobsToShares(t *testing.T) {