Replace opendb package from kava with generic opendb repo (#1959)

* Upgrade ethermint

* Remove opendb package from kava and add custom dbOpener function

* Open metadata.db with custom opendb function

.github/workflows/ci-rocksdb-build.yml

@@ -19,25 +19,3 @@ jobs:
         run: bash ${GITHUB_WORKSPACE}/.github/scripts/install-rocksdb.sh
       - name: build application
         run: make build COSMOS_BUILD_OPTIONS=rocksdb
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: install RocksDB dependencies
-        run: sudo apt-get update
-          && sudo apt-get install -y git make gcc libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev
-      - name: install RocksDB as shared library
-        run: git clone https://github.com/facebook/rocksdb.git
-          && cd rocksdb
-          && git checkout $ROCKSDB_VERSION
-          && sudo make -j$(nproc) install-shared
-          && sudo ldconfig
-      - name: checkout repo from current commit
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with:
-          go-version-file: go.mod
-      - name: run unit tests
-        run: make test-rocksdb

Makefile

@@ -314,9 +314,6 @@ test-ibc: docker-build
 test:
 	@$(GO_BIN) test $$($(GO_BIN) list ./... | grep -v 'contrib' | grep -v 'tests/e2e')
 
-test-rocksdb:
-	@go test -tags=rocksdb ./cmd/kava/opendb
-
 # Run cli integration tests
 # `-p 4` to use 4 cores, `-tags cli_test` to tell $(GO_BIN) not to ignore the cli package
 # These tests use the `kvd` or `kvcli` binaries in the build dir, or in `$BUILDDIR` if that env var is set.

app/app.go

@@ -94,12 +94,12 @@ import (
 	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
 	solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine"
 	ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
+	"github.com/ethereum/go-ethereum/core/vm"
 	evmante "github.com/evmos/ethermint/app/ante"
 	ethermintconfig "github.com/evmos/ethermint/server/config"
 	"github.com/evmos/ethermint/x/evm"
 	evmkeeper "github.com/evmos/ethermint/x/evm/keeper"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
-	"github.com/evmos/ethermint/x/evm/vm/geth"
 	"github.com/evmos/ethermint/x/feemarket"
 	feemarketkeeper "github.com/evmos/ethermint/x/feemarket/keeper"
 	feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
@@ -564,8 +564,7 @@ func NewApp(
 		app.precisebankKeeper, // x/precisebank in place of x/bank
 		app.stakingKeeper,
 		app.feeMarketKeeper,
-		nil, // precompiled contracts
-		geth.NewEVM,
+		vm.NewEVM,
 		options.EVMTrace,
 		evmSubspace,
 	)

cmd/kava/cmd/app.go

@@ -23,6 +23,7 @@ import (
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 
+	"github.com/Kava-Labs/opendb"
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/app/params"
 	metricstypes "github.com/kava-labs/kava/x/metrics/types"
@@ -64,7 +65,7 @@ func (ac appCreator) newApp(
 
 	homeDir := cast.ToString(appOpts.Get(flags.FlagHome))
 	snapshotDir := filepath.Join(homeDir, "data", "snapshots") // TODO can these directory names be imported from somewhere?
-	snapshotDB, err := cometbftdb.NewDB("metadata", server.GetAppDBBackend(appOpts), snapshotDir)
+	snapshotDB, err := opendb.OpenDB(appOpts, snapshotDir, "metadata", server.GetAppDBBackend(appOpts))
 	if err != nil {
 		panic(err)
 	}

cmd/kava/cmd/rocksdb/compact.go

@@ -14,14 +14,14 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/cometbft/cometbft/libs/log"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/server"
-	"github.com/kava-labs/kava/cmd/kava/opendb"
 	"github.com/linxGnu/grocksdb"
 	"github.com/spf13/cobra"
 	"golang.org/x/exp/slices"
 
-	"github.com/cometbft/cometbft/libs/log"
+	"github.com/Kava-Labs/opendb"
 )
 
 const (

cmd/kava/cmd/root.go

@@ -3,15 +3,17 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 
+	dbm "github.com/cometbft/cometbft-db"
+	tmcfg "github.com/cometbft/cometbft/config"
+	tmcli "github.com/cometbft/cometbft/libs/cli"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/config"
 	"github.com/cosmos/cosmos-sdk/client/debug"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/server"
-
-	tmcfg "github.com/cometbft/cometbft/config"
-	tmcli "github.com/cometbft/cometbft/libs/cli"
+	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
@@ -23,11 +25,11 @@ import (
 	servercfg "github.com/evmos/ethermint/server/config"
 	"github.com/spf13/cobra"
 
+	"github.com/Kava-Labs/opendb"
 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/app/params"
 	"github.com/kava-labs/kava/cmd/kava/cmd/iavlviewer"
 	"github.com/kava-labs/kava/cmd/kava/cmd/rocksdb"
-	"github.com/kava-labs/kava/cmd/kava/opendb"
 )
 
 // EnvPrefix is the prefix environment variables must have to configure the app.
@@ -88,6 +90,13 @@ func NewRootCmd() *cobra.Command {
 	return rootCmd
 }
 
+// dbOpener is a function to open `application.db`, potentially with customized options.
+// dbOpener sets dataDir to "data", dbName to "application" and calls generic OpenDB function.
+func dbOpener(opts servertypes.AppOptions, rootDir string, backend dbm.BackendType) (dbm.DB, error) {
+	dataDir := filepath.Join(rootDir, "data")
+	return opendb.OpenDB(opts, dataDir, "application", backend)
+}
+
 // addSubCmds registers all the sub commands used by kava.
 func addSubCmds(rootCmd *cobra.Command, encodingConfig params.EncodingConfig, defaultNodeHome string) {
 	gentxModule, ok := app.ModuleBasics[genutiltypes.ModuleName].(genutil.AppModuleBasic)
@@ -118,7 +127,7 @@ func addSubCmds(rootCmd *cobra.Command, encodingConfig params.EncodingConfig, de
 	opts := ethermintserver.StartOptions{
 		AppCreator:      ac.newApp,
 		DefaultNodeHome: app.DefaultNodeHome,
-		DBOpener:        opendb.OpenDB,
+		DBOpener:        dbOpener,
 	}
 	// ethermintserver adds additional flags to start the JSON-RPC server for evm support
 	ethermintserver.AddCommands(