remove panic and store cmd

Author: tac0turtle

apps/evm/single/main.go

@@ -31,7 +31,6 @@ func main() {
 		rollcmd.VersionCmd,
 		rollcmd.NetInfoCmd,
 		rollcmd.StoreUnsafeCleanCmd,
-		rollcmd.StoreP2PInspectCmd,
 		rollcmd.KeysCmd(),
 	)
 

apps/grpc/single/main.go

@@ -30,7 +30,6 @@ the Evolve execution gRPC interface.`,
 		evcmd.VersionCmd,
 		evcmd.NetInfoCmd,
 		evcmd.StoreUnsafeCleanCmd,
-		evcmd.StoreP2PInspectCmd,
 		evcmd.KeysCmd(),
 	)
 

apps/testapp/main.go

@@ -19,7 +19,6 @@ func main() {
 		rollcmd.VersionCmd,
 		rollcmd.NetInfoCmd,
 		rollcmd.StoreUnsafeCleanCmd,
-		rollcmd.StoreP2PInspectCmd,
 		rollcmd.KeysCmd(),
 		cmds.NewRollbackCmd(),
 		initCmd,

pkg/cmd/store.go

@@ -1,23 +1,13 @@
 package cmd
 
 import (
-	"context"
-	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
-	"time"
 
-	goheader "github.com/celestiaorg/go-header"
-	goheaderstore "github.com/celestiaorg/go-header/store"
-	ds "github.com/ipfs/go-datastore"
-	kt "github.com/ipfs/go-datastore/keytransform"
 	"github.com/spf13/cobra"
 
-	"github.com/evstack/ev-node/node"
 	"github.com/evstack/ev-node/pkg/config"
-	"github.com/evstack/ev-node/pkg/store"
-	"github.com/evstack/ev-node/types"
 )
 
 // UnsafeCleanDataDir removes all contents of the specified data directory.
@@ -66,175 +56,6 @@ This operation is unsafe and cannot be undone. Use with caution!`,
 	},
 }
 
-// StoreP2PInspectCmd reports head/tail information for the go-header stores used by P2P sync.
-var StoreP2PInspectCmd = &cobra.Command{
-	Use:   "store-info",
-	Short: "Inspect the go-header (P2P) stores and display their tail/head entries",
-	Long: `Opens the datastore used by the node's go-header services and reports
-the current height, head, and tail information for both the header and data stores.`,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		nodeConfig, err := ParseConfig(cmd)
-		if err != nil {
-			return fmt.Errorf("error parsing config: %w", err)
-		}
-
-		ctx := cmd.Context()
-		if ctx == nil {
-			ctx = context.Background()
-		}
-
-		dbName := resolveDBName(cmd)
-
-		rawStore, err := store.NewDefaultKVStore(nodeConfig.RootDir, nodeConfig.DBPath, dbName)
-		if err != nil {
-			return fmt.Errorf("failed to open datastore: %w", err)
-		}
-		defer func() {
-			if closeErr := rawStore.Close(); closeErr != nil {
-				cmd.PrintErrf("warning: failed to close datastore: %v\n", closeErr)
-			}
-		}()
-
-		mainStore := kt.Wrap(rawStore, &kt.PrefixTransform{
-			Prefix: ds.NewKey(node.EvPrefix),
-		})
-
-		headerSnapshot, err := inspectP2PStore[*types.SignedHeader](ctx, mainStore, headerStorePrefix, "Header Store")
-		if err != nil {
-			return fmt.Errorf("failed to inspect header store: %w", err)
-		}
-
-		dataSnapshot, err := inspectP2PStore[*types.Data](ctx, mainStore, dataStorePrefix, "Data Store")
-		if err != nil {
-			return fmt.Errorf("failed to inspect data store: %w", err)
-		}
-
-		storePath := resolveStorePath(nodeConfig.RootDir, nodeConfig.DBPath, dbName)
-
-		out := cmd.OutOrStdout()
-		fmt.Fprintf(out, "Inspecting go-header stores at %s\n", storePath)
-		printP2PStoreSnapshot(cmd, headerSnapshot)
-		printP2PStoreSnapshot(cmd, dataSnapshot)
-
-		return nil
-	},
-}
-
-const (
-	headerStorePrefix = "headerSync"
-	dataStorePrefix   = "dataSync"
-)
-
-type p2pStoreSnapshot struct {
-	Label       string
-	Prefix      string
-	Height      uint64
-	HeadHeight  uint64
-	HeadHash    string
-	HeadTime    time.Time
-	TailHeight  uint64
-	TailHash    string
-	TailTime    time.Time
-	HeadPresent bool
-	TailPresent bool
-	Empty       bool
-}
-
-func inspectP2PStore[H goheader.Header[H]](
-	ctx context.Context,
-	datastore ds.Batching,
-	prefix string,
-	label string,
-) (p2pStoreSnapshot, error) {
-	storeImpl, err := goheaderstore.NewStore[H](
-		datastore,
-		goheaderstore.WithStorePrefix(prefix),
-		goheaderstore.WithMetrics(),
-	)
-	if err != nil {
-		return p2pStoreSnapshot{}, fmt.Errorf("failed to open %s: %w", label, err)
-	}
-
-	if err := storeImpl.Start(ctx); err != nil {
-		return p2pStoreSnapshot{}, fmt.Errorf("failed to start %s: %w", label, err)
-	}
-	defer func() {
-		_ = storeImpl.Stop(context.Background())
-	}()
-
-	snapshot := p2pStoreSnapshot{
-		Label:  label,
-		Prefix: prefix,
-		Height: storeImpl.Height(),
-	}
-
-	if err := populateSnapshot(ctx, storeImpl, &snapshot); err != nil {
-		return p2pStoreSnapshot{}, err
-	}
-
-	return snapshot, nil
-}
-
-func populateSnapshot[H goheader.Header[H]](
-	ctx context.Context,
-	storeImpl *goheaderstore.Store[H],
-	snapshot *p2pStoreSnapshot,
-) error {
-	head, err := storeImpl.Head(ctx)
-	switch {
-	case err == nil:
-		snapshot.HeadPresent = true
-		snapshot.HeadHeight = head.Height()
-		snapshot.HeadHash = head.Hash().String()
-		snapshot.HeadTime = head.Time()
-	case errors.Is(err, goheader.ErrEmptyStore), errors.Is(err, goheader.ErrNotFound):
-		// store not initialized yet
-	default:
-		return fmt.Errorf("failed to read %s head: %w", snapshot.Label, err)
-	}
-
-	tail, err := storeImpl.Tail(ctx)
-	switch {
-	case err == nil:
-		snapshot.TailPresent = true
-		snapshot.TailHeight = tail.Height()
-		snapshot.TailHash = tail.Hash().String()
-		snapshot.TailTime = tail.Time()
-	case errors.Is(err, goheader.ErrEmptyStore), errors.Is(err, goheader.ErrNotFound):
-	default:
-		return fmt.Errorf("failed to read %s tail: %w", snapshot.Label, err)
-	}
-
-	snapshot.Empty = !snapshot.HeadPresent && !snapshot.TailPresent
-
-	return nil
-}
-
-func printP2PStoreSnapshot(cmd *cobra.Command, snapshot p2pStoreSnapshot) {
-	out := cmd.OutOrStdout()
-	fmt.Fprintf(out, "\n[%s]\n", snapshot.Label)
-	fmt.Fprintf(out, "prefix: %s\n", snapshot.Prefix)
-	fmt.Fprintf(out, "height: %d\n", snapshot.Height)
-	if snapshot.Empty {
-		fmt.Fprintln(out, "status: empty (no entries found)")
-		return
-	}
-
-	if snapshot.TailPresent {
-		fmt.Fprintf(out, "tail:  height=%d hash=%s%s\n", snapshot.TailHeight, snapshot.TailHash, formatTime(snapshot.TailTime))
-	}
-	if snapshot.HeadPresent {
-		fmt.Fprintf(out, "head:  height=%d hash=%s%s\n", snapshot.HeadHeight, snapshot.HeadHash, formatTime(snapshot.HeadTime))
-	}
-}
-
-func formatTime(t time.Time) string {
-	if t.IsZero() {
-		return ""
-	}
-	return fmt.Sprintf(" time=%s", t.UTC().Format(time.RFC3339))
-}
-
 func resolveDBName(cmd *cobra.Command) string {
 	if cmd == nil {
 		return config.ConfigFileName

pkg/cmd/store_test.go

@@ -2,25 +2,13 @@ package cmd
 
 import (
 	"bytes"
-	"context"
-	cryptoRand "crypto/rand"
 	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
 
-	goheaderstore "github.com/celestiaorg/go-header/store"
-	ds "github.com/ipfs/go-datastore"
-	kt "github.com/ipfs/go-datastore/keytransform"
-	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
-
-	"github.com/evstack/ev-node/node"
-	"github.com/evstack/ev-node/pkg/config"
-	"github.com/evstack/ev-node/pkg/signer/noop"
-	"github.com/evstack/ev-node/pkg/store"
-	"github.com/evstack/ev-node/types"
 )
 
 func TestUnsafeCleanDataDir(t *testing.T) {
@@ -97,87 +85,3 @@ func TestStoreUnsafeCleanCmd(t *testing.T) {
 	// Check output message (optional)
 	require.Contains(t, buf.String(), fmt.Sprintf("All contents of the data directory at %s have been removed.", dataDir))
 }
-
-func TestStoreP2PInspectCmd(t *testing.T) {
-	tempDir := t.TempDir()
-	const appName = "testapp"
-
-	// Seed the header store with a couple of entries.
-	seedHeaderStore(t, tempDir, appName)
-
-	rootCmd := &cobra.Command{Use: appName}
-	rootCmd.PersistentFlags().String(config.FlagRootDir, tempDir, "root directory")
-	rootCmd.AddCommand(StoreP2PInspectCmd)
-
-	buf := new(bytes.Buffer)
-	rootCmd.SetOut(buf)
-	rootCmd.SetErr(buf)
-	rootCmd.SetArgs([]string{"store-info"})
-
-	err := rootCmd.Execute()
-	require.NoError(t, err)
-
-	output := buf.String()
-	require.Contains(t, output, "Inspecting go-header stores")
-	require.Contains(t, output, "[Header Store]")
-	require.Contains(t, output, "tail:  height=1")
-	require.Contains(t, output, "head:  height=2")
-	require.Contains(t, output, "[Data Store]")
-	require.Contains(t, output, "status: empty")
-}
-
-func seedHeaderStore(t *testing.T, rootDir, dbName string) {
-	t.Helper()
-
-	rawStore, err := store.NewDefaultKVStore(rootDir, "data", dbName)
-	require.NoError(t, err)
-
-	mainStore := kt.Wrap(rawStore, &kt.PrefixTransform{
-		Prefix: ds.NewKey(node.EvPrefix),
-	})
-
-	headerStore, err := goheaderstore.NewStore[*types.SignedHeader](
-		mainStore,
-		goheaderstore.WithStorePrefix(headerStorePrefix),
-		goheaderstore.WithMetrics(),
-	)
-	require.NoError(t, err)
-
-	ctx := context.Background()
-	require.NoError(t, headerStore.Start(ctx))
-
-	defer func() {
-		require.NoError(t, headerStore.Stop(ctx))
-		require.NoError(t, rawStore.Close())
-	}()
-
-	pk, _, err := crypto.GenerateEd25519Key(cryptoRand.Reader)
-	require.NoError(t, err)
-	noopSigner, err := noop.NewNoopSigner(pk)
-	require.NoError(t, err)
-
-	chainID := "test-chain"
-	headerCfg := types.HeaderConfig{
-		Height:   1,
-		DataHash: types.GetRandomBytes(32),
-		AppHash:  types.GetRandomBytes(32),
-		Signer:   noopSigner,
-	}
-
-	first, err := types.GetRandomSignedHeaderCustom(&headerCfg, chainID)
-	require.NoError(t, err)
-	require.NoError(t, headerStore.Append(ctx, first))
-
-	next := &types.SignedHeader{
-		Header: types.GetRandomNextHeader(first.Header, chainID),
-		Signer: first.Signer,
-	}
-	payload, err := next.Header.MarshalBinary()
-	require.NoError(t, err)
-	signature, err := noopSigner.Sign(payload)
-	require.NoError(t, err)
-	next.Signature = signature
-
-	require.NoError(t, headerStore.Append(ctx, next))
-	require.NoError(t, headerStore.Sync(ctx))
-}

pkg/sync/sync_service.go

@@ -154,18 +154,6 @@ func (syncService *SyncService[H]) WriteToStoreAndBroadcast(ctx context.Context,
 		}
 	}
 
-	hh, err := syncService.store.Head(ctx)
-	if err != nil {
-		return fmt.Errorf("failed to get head from store: %w", err)
-	}
-	syncService.logger.Info().Uint64("height", hh.Height()).
-		Uint64("header_or_data", headerOrData.Height()).
-		Msg("writing to store and broadcasting")
-
-	if err := hh.Verify(headerOrData); err != nil {
-		panic(fmt.Errorf("header verification failed: %w", err))
-	}
-
 	// Broadcast for subscribers
 	if err := syncService.sub.Broadcast(ctx, headerOrData, opts...); err != nil {
 		// for the first block when starting the app, broadcast error is expected
@@ -181,7 +169,6 @@ func (syncService *SyncService[H]) WriteToStoreAndBroadcast(ctx context.Context,
 		}
 
 		syncService.logger.Error().Err(err).Msg("failed to broadcast")
-		panic(err)
 	}
 
 	return nil