Restructure sei data folder for Giga

app/receipt_store_config.go

@@ -1,9 +1,9 @@
 package app
 
 import (
-	"path/filepath"
-
 	seidbconfig "github.com/sei-protocol/sei-chain/sei-db/config"
+
+	"github.com/sei-protocol/sei-chain/sei-db/common/utils"
 )
 
 const (
@@ -20,7 +20,7 @@ func readReceiptStoreConfig(homePath string, appOpts seidbconfig.AppOptions) (se
 		return receiptConfig, err
 	}
 	if receiptConfig.DBDirectory == "" {
-		receiptConfig.DBDirectory = filepath.Join(homePath, "data", "receipt.db")
+		receiptConfig.DBDirectory = utils.GetReceiptStorePath(homePath)
 	}
 	return receiptConfig, nil
 }

app/seidb_test.go

@@ -155,7 +155,8 @@ func TestReadReceiptStoreConfigUsesDefaultDirectoryWhenUnset(t *testing.T) {
 	homePath := t.TempDir()
 	receiptConfig, err := readReceiptStoreConfig(homePath, mapAppOpts{})
 	require.NoError(t, err)
-	assert.Equal(t, filepath.Join(homePath, "data", "receipt.db"), receiptConfig.DBDirectory)
+	// New nodes (no legacy data/receipt.db) get the new ledger/ layout
+	assert.Equal(t, filepath.Join(homePath, "data", "ledger", "receipt.db"), receiptConfig.DBDirectory)
 }
 
 // TestFullAppPathWithParquetReceiptStore exercises the full app.New path with rs-backend = "parquet"

sei-db/common/utils/path.go

@@ -1,13 +1,69 @@
 package utils
 
-import "path/filepath"
+import (
+	"os"
+	"path/filepath"
+)
 
+// PathExists returns true if the given path exists on disk.
+func PathExists(path string) bool {
+	_, err := os.Stat(path)
+	return err == nil
+}
+
+// GetCommitStorePath returns the path for the memiavl state commitment store.
+// New nodes use data/state_commit/memiavl; existing nodes with data/committer.db
+// continue using the legacy path for backward compatibility.
 func GetCommitStorePath(homePath string) string {
-	return filepath.Join(homePath, "data", "committer.db")
+	legacyPath := filepath.Join(homePath, "data", "committer.db")
+	if PathExists(legacyPath) {
+		return legacyPath
+	}
+	return filepath.Join(homePath, "data", "state_commit", "memiavl")
+}
+
+// GetFlatKVPath returns the path for the FlatKV EVM commit store.
+// New nodes use data/state_commit/flatkv; existing nodes with data/flatkv
+// continue using the legacy path for backward compatibility.
+func GetFlatKVPath(homePath string) string {
+	legacyPath := filepath.Join(homePath, "data", "flatkv")
+	if PathExists(legacyPath) {
+		return legacyPath
+	}
+	return filepath.Join(homePath, "data", "state_commit", "flatkv")
 }
 
+// GetStateStorePath returns the path for the Cosmos state store (SS).
+// New nodes use data/state_store/cosmos_ss/{backend}; existing nodes with
+// data/{backend} continue using the legacy path for backward compatibility.
 func GetStateStorePath(homePath string, backend string) string {
-	return filepath.Join(homePath, "data", backend)
+	legacyPath := filepath.Join(homePath, "data", backend)
+	if PathExists(legacyPath) {
+		return legacyPath
+	}
+	return filepath.Join(homePath, "data", "state_store", "cosmos_ss", backend)
+}
+
+// GetEVMStateStorePath returns the path for the EVM state store.
+// New nodes use data/state_store/evm_ss; existing nodes with data/evm_ss
+// continue using the legacy path for backward compatibility.
+func GetEVMStateStorePath(homePath string) string {
+	legacyPath := filepath.Join(homePath, "data", "evm_ss")
+	if PathExists(legacyPath) {
+		return legacyPath
+	}
+	return filepath.Join(homePath, "data", "state_store", "evm_ss")
+}
+
+// GetReceiptStorePath returns the path for the receipt store.
+// New nodes use data/ledger/receipt.db; existing nodes with data/receipt.db
+// continue using the legacy path for backward compatibility.
+func GetReceiptStorePath(homePath string) string {
+	legacyPath := filepath.Join(homePath, "data", "receipt.db")
+	if PathExists(legacyPath) {
+		return legacyPath
+	}
+	return filepath.Join(homePath, "data", "ledger", "receipt.db")
 }
 
 func GetChangelogPath(dbPath string) string {

sei-db/common/utils/path_test.go

@@ -0,0 +1,170 @@
+package utils
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestPathExists(t *testing.T) {
+	dir := t.TempDir()
+	assert.True(t, PathExists(dir))
+	assert.False(t, PathExists(filepath.Join(dir, "nonexistent")))
+
+	f := filepath.Join(dir, "file.txt")
+	require.NoError(t, os.WriteFile(f, []byte("hi"), 0644))
+	assert.True(t, PathExists(f))
+}
+
+// --- GetCommitStorePath ---
+
+func TestGetCommitStorePath_NewNode(t *testing.T) {
+	home := t.TempDir()
+	got := GetCommitStorePath(home)
+	assert.Equal(t, filepath.Join(home, "data", "state_commit", "memiavl"), got)
+}
+
+func TestGetCommitStorePath_LegacyExists(t *testing.T) {
+	home := t.TempDir()
+	legacy := filepath.Join(home, "data", "committer.db")
+	require.NoError(t, os.MkdirAll(legacy, 0755))
+
+	got := GetCommitStorePath(home)
+	assert.Equal(t, legacy, got)
+}
+
+// --- GetFlatKVPath ---
+
+func TestGetFlatKVPath_NewNode(t *testing.T) {
+	home := t.TempDir()
+	got := GetFlatKVPath(home)
+	assert.Equal(t, filepath.Join(home, "data", "state_commit", "flatkv"), got)
+}
+
+func TestGetFlatKVPath_LegacyExists(t *testing.T) {
+	home := t.TempDir()
+	legacy := filepath.Join(home, "data", "flatkv")
+	require.NoError(t, os.MkdirAll(legacy, 0755))
+
+	got := GetFlatKVPath(home)
+	assert.Equal(t, legacy, got)
+}
+
+// --- GetStateStorePath ---
+
+func TestGetStateStorePath_NewNode_Pebble(t *testing.T) {
+	home := t.TempDir()
+	got := GetStateStorePath(home, "pebbledb")
+	assert.Equal(t, filepath.Join(home, "data", "state_store", "cosmos_ss", "pebbledb"), got)
+}
+
+func TestGetStateStorePath_NewNode_RocksDB(t *testing.T) {
+	home := t.TempDir()
+	got := GetStateStorePath(home, "rocksdb")
+	assert.Equal(t, filepath.Join(home, "data", "state_store", "cosmos_ss", "rocksdb"), got)
+}
+
+func TestGetStateStorePath_LegacyExists(t *testing.T) {
+	home := t.TempDir()
+	legacy := filepath.Join(home, "data", "pebbledb")
+	require.NoError(t, os.MkdirAll(legacy, 0755))
+
+	got := GetStateStorePath(home, "pebbledb")
+	assert.Equal(t, legacy, got)
+}
+
+func TestGetStateStorePath_LegacyForDifferentBackend(t *testing.T) {
+	home := t.TempDir()
+	// Legacy rocksdb dir exists but we ask for pebbledb — no legacy match
+	require.NoError(t, os.MkdirAll(filepath.Join(home, "data", "rocksdb"), 0755))
+
+	got := GetStateStorePath(home, "pebbledb")
+	assert.Equal(t, filepath.Join(home, "data", "state_store", "cosmos_ss", "pebbledb"), got)
+}
+
+// --- GetEVMStateStorePath ---
+
+func TestGetEVMStateStorePath_NewNode(t *testing.T) {
+	home := t.TempDir()
+	got := GetEVMStateStorePath(home)
+	assert.Equal(t, filepath.Join(home, "data", "state_store", "evm_ss"), got)
+}
+
+func TestGetEVMStateStorePath_LegacyExists(t *testing.T) {
+	home := t.TempDir()
+	legacy := filepath.Join(home, "data", "evm_ss")
+	require.NoError(t, os.MkdirAll(legacy, 0755))
+
+	got := GetEVMStateStorePath(home)
+	assert.Equal(t, legacy, got)
+}
+
+// --- GetReceiptStorePath ---
+
+func TestGetReceiptStorePath_NewNode(t *testing.T) {
+	home := t.TempDir()
+	got := GetReceiptStorePath(home)
+	assert.Equal(t, filepath.Join(home, "data", "ledger", "receipt.db"), got)
+}
+
+func TestGetReceiptStorePath_LegacyExists(t *testing.T) {
+	home := t.TempDir()
+	legacy := filepath.Join(home, "data", "receipt.db")
+	require.NoError(t, os.MkdirAll(legacy, 0755))
+
+	got := GetReceiptStorePath(home)
+	assert.Equal(t, legacy, got)
+}
+
+// --- GetChangelogPath (unchanged, but verify) ---
+
+func TestGetChangelogPath(t *testing.T) {
+	assert.Equal(t, "/foo/bar/changelog", GetChangelogPath("/foo/bar"))
+}
+
+// --- Edge: new path already has data (second run of new node) ---
+
+func TestGetCommitStorePath_NewDataAlreadyExists(t *testing.T) {
+	home := t.TempDir()
+	newPath := filepath.Join(home, "data", "state_commit", "memiavl")
+	require.NoError(t, os.MkdirAll(newPath, 0755))
+
+	got := GetCommitStorePath(home)
+	assert.Equal(t, newPath, got, "should use new path when legacy is absent even if new path already exists")
+}
+
+func TestGetStateStorePath_NewDataAlreadyExists(t *testing.T) {
+	home := t.TempDir()
+	newPath := filepath.Join(home, "data", "state_store", "cosmos_ss", "pebbledb")
+	require.NoError(t, os.MkdirAll(newPath, 0755))
+
+	got := GetStateStorePath(home, "pebbledb")
+	assert.Equal(t, newPath, got, "should use new path when legacy is absent even if new path already exists")
+}
+
+// --- Edge: both legacy and new exist (legacy wins) ---
+
+func TestGetCommitStorePath_BothExist(t *testing.T) {
+	home := t.TempDir()
+	legacy := filepath.Join(home, "data", "committer.db")
+	require.NoError(t, os.MkdirAll(legacy, 0755))
+	newPath := filepath.Join(home, "data", "state_commit", "memiavl")
+	require.NoError(t, os.MkdirAll(newPath, 0755))
+
+	got := GetCommitStorePath(home)
+	assert.Equal(t, legacy, got, "legacy should take precedence when both exist")
+}
+
+func TestGetReceiptStorePath_BothExist(t *testing.T) {
+	home := t.TempDir()
+	legacy := filepath.Join(home, "data", "receipt.db")
+	require.NoError(t, os.MkdirAll(legacy, 0755))
+	newPath := filepath.Join(home, "data", "ledger", "receipt.db")
+	require.NoError(t, os.MkdirAll(newPath, 0755))
+
+	got := GetReceiptStorePath(home)
+	assert.Equal(t, legacy, got, "legacy should take precedence when both exist")
+}

sei-db/state_db/sc/composite/store.go

@@ -6,10 +6,10 @@ import (
 	"context"
 	"fmt"
 	"math"
-	"path/filepath"
 
 	commonerrors "github.com/sei-protocol/sei-chain/sei-db/common/errors"
 	commonevm "github.com/sei-protocol/sei-chain/sei-db/common/evm"
+	"github.com/sei-protocol/sei-chain/sei-db/common/utils"
 	"github.com/sei-protocol/sei-chain/sei-db/config"
 	"github.com/sei-protocol/sei-chain/sei-db/proto"
 	"github.com/sei-protocol/sei-chain/sei-db/state_db/sc/flatkv"
@@ -72,7 +72,7 @@ func NewCompositeCommitStore(
 	// Initialize FlatKV store struct if write mode requires it
 	// Note: DB is NOT opened here, will be opened in LoadVersion
 	if cfg.WriteMode == config.DualWrite || cfg.WriteMode == config.SplitWrite {
-		flatkvPath := filepath.Join(homeDir, "data", "flatkv")
+		flatkvPath := utils.GetFlatKVPath(homeDir)
 		store.evmCommitter = flatkv.NewCommitStore(ctx, flatkvPath, cfg.FlatKVConfig)
 	}
 

sei-db/state_db/sc/composite/store_test.go

@@ -10,6 +10,7 @@ import (
 	errorutils "github.com/sei-protocol/sei-chain/sei-db/common/errors"
 	"github.com/sei-protocol/sei-chain/sei-db/common/evm"
 	"github.com/sei-protocol/sei-chain/sei-db/common/metrics"
+	"github.com/sei-protocol/sei-chain/sei-db/common/utils"
 	"github.com/sei-protocol/sei-chain/sei-db/config"
 	"github.com/sei-protocol/sei-chain/sei-db/proto"
 	"github.com/sei-protocol/sei-chain/sei-db/state_db/sc/flatkv"
@@ -716,7 +717,7 @@ func TestReconcileVersionsAfterCrash(t *testing.T) {
 	// Simulate crash: rollback FlatKV to version 2 independently, leaving
 	// cosmos at version 3. This mirrors a crash after cosmos Commit but
 	// before FlatKV Commit completes.
-	flatkvPath := dir + "/data/flatkv"
+	flatkvPath := utils.GetFlatKVPath(dir)
 	evmStore := flatkv.NewCommitStore(t.Context(), flatkvPath, cfg.FlatKVConfig)
 	_, err = evmStore.LoadVersion(0, false)
 	require.NoError(t, err)
@@ -774,7 +775,7 @@ func TestReconcileVersionsThenContinueCommitting(t *testing.T) {
 	require.NoError(t, cs.Close())
 
 	// Simulate crash: roll FlatKV back to version 2.
-	flatkvPath := dir + "/data/flatkv"
+	flatkvPath := utils.GetFlatKVPath(dir)
 	evmStore := flatkv.NewCommitStore(t.Context(), flatkvPath, cfg.FlatKVConfig)
 	_, err = evmStore.LoadVersion(0, false)
 	require.NoError(t, err)
@@ -869,7 +870,7 @@ func TestReconcileVersionsCosmosAheadByMultiple(t *testing.T) {
 	require.NoError(t, cs.Close())
 
 	// Rollback FlatKV to version 3 (simulating 2 lost commits)
-	flatkvPath := dir + "/data/flatkv"
+	flatkvPath := utils.GetFlatKVPath(dir)
 	evmStore := flatkv.NewCommitStore(t.Context(), flatkvPath, cfg.FlatKVConfig)
 	_, err = evmStore.LoadVersion(0, false)
 	require.NoError(t, err)

sei-db/state_db/ss/composite/store.go

@@ -2,7 +2,6 @@ package composite
 
 import (
 	"fmt"
-	"path/filepath"
 	"sync"
 
 	commonevm "github.com/sei-protocol/sei-chain/sei-db/common/evm"
@@ -59,7 +58,7 @@ func NewCompositeStateStore(
 	if ssConfig.EVMEnabled() {
 		evmDir := ssConfig.EVMDBDirectory
 		if evmDir == "" {
-			evmDir = filepath.Join(homeDir, "data", "evm_ss")
+			evmDir = utils.GetEVMStateStorePath(homeDir)
 		}
 
 		evmStore, err := evm.NewEVMStateStore(evmDir, ssConfig)

sei-tendermint/cmd/tendermint/commands/reindex_event.go

@@ -149,23 +149,23 @@ func loadEventSinks(cfg *tmcfg.Config) ([]indexer.EventSink, error) {
 func loadStateAndBlockStore(cfg *tmcfg.Config) (*store.BlockStore, state.Store, error) {
 	dbType := dbm.BackendType(cfg.DBBackend)
 
-	if !os.FileExists(filepath.Join(cfg.DBDir(), "blockstore.db")) {
+	blockstoreDir := tmcfg.ResolveDBDir("blockstore", cfg.DBDir())
+	if !os.FileExists(filepath.Join(blockstoreDir, "blockstore.db")) {
 		return nil, nil, fmt.Errorf("no blockstore found in %v", cfg.DBDir())
 	}
 
-	// Get BlockStore
-	blockStoreDB, err := dbm.NewDB("blockstore", dbType, cfg.DBDir())
+	blockStoreDB, err := dbm.NewDB("blockstore", dbType, blockstoreDir)
 	if err != nil {
 		return nil, nil, err
 	}
 	blockStore := store.NewBlockStore(blockStoreDB)
 
-	if !os.FileExists(filepath.Join(cfg.DBDir(), "state.db")) {
-		return nil, nil, fmt.Errorf("no blockstore found in %v", cfg.DBDir())
+	stateDir := tmcfg.ResolveDBDir("state", cfg.DBDir())
+	if !os.FileExists(filepath.Join(stateDir, "state.db")) {
+		return nil, nil, fmt.Errorf("no state store found in %v", cfg.DBDir())
 	}
 
-	// Get StateStore
-	stateDB, err := dbm.NewDB("state", dbType, cfg.DBDir())
+	stateDB, err := dbm.NewDB("state", dbType, stateDir)
 	if err != nil {
 		return nil, nil, err
 	}