diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml index 378deadc0c..7c36c83587 100644 --- a/.github/workflows/ci-lint.yml +++ b/.github/workflows/ci-lint.yml @@ -8,9 +8,10 @@ jobs: golangci-lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v4 - name: golangci-lint uses: reviewdog/action-golangci-lint@v2 with: github_token: ${{ secrets.github_token }} reporter: github-pr-review + golangci_lint_flags: --timeout 10m diff --git a/CHANGELOG.md b/CHANGELOG.md index 97ae653bad..f9a4eb04cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ - (metrics) [#1668] Adds non-state breaking x/metrics module for custom telemetry. - (metrics) [#1669] Add performance timing metrics to all Begin/EndBlockers +- (rocksdb) [#1767] Fix resolution of rocksdb database path ## [v0.21.1](https://github.com/Kava-Labs/kava/releases/tag/v0.21.1) @@ -210,6 +211,7 @@ Bump tendermint version to 0.32.10 to address [cosmos security advisory Lavender [\#257](https://github.com/Kava-Labs/kava/pulls/257) Include scripts to run large-scale simulations remotely using aws-batch +[#1767]: https://github.com/Kava-Labs/kava/pull/1767 [#1669]: https://github.com/Kava-Labs/kava/pull/1669 [#1668]: https://github.com/Kava-Labs/kava/pull/1668 [#1503]: https://github.com/Kava-Labs/kava/pull/1503 diff --git a/cmd/kava/opendb/opendb_rocksdb.go b/cmd/kava/opendb/opendb_rocksdb.go index 6bd3563602..c445933ea3 100644 --- a/cmd/kava/opendb/opendb_rocksdb.go +++ b/cmd/kava/opendb/opendb_rocksdb.go @@ -81,7 +81,7 @@ const ( func OpenDB(appOpts types.AppOptions, home string, backendType dbm.BackendType) (dbm.DB, error) { dataDir := filepath.Join(home, "data") if backendType == dbm.RocksDBBackend { - return openRocksdb(filepath.Join(dataDir, "application.db"), appOpts) + return openRocksdb(dataDir, appOpts) } return dbm.NewDB("application", backendType, dataDir) @@ -90,7 +90,8 @@ func OpenDB(appOpts types.AppOptions, home string, backendType dbm.BackendType) // openRocksdb loads existing options, overrides some of them with appOpts and opens database // option will be overridden only in case if it explicitly specified in appOpts func openRocksdb(dir string, appOpts types.AppOptions) (dbm.DB, error) { - dbOpts, cfOpts, err := loadLatestOptions(dir) + optionsPath := filepath.Join(dir, "application.db") + dbOpts, cfOpts, err := loadLatestOptions(optionsPath) if err != nil { return nil, err }