Problem: v1.0.x changes are not merged into main

CHANGELOG.md

@@ -3,13 +3,118 @@
 ## Unreleased
 
 ### State Machine Breaking
+
 - [cronos#695](https://github.com/crypto-org-chain/cronos/pull/695) Implement ADR-007, generic events format with indexed params.
 - [cronos#728](https://github.com/crypto-org-chain/cronos/pull/728) Upgrade gravity bridge latest bugfix, including multi attestation processing and double spend check. 
 - [cronos#742](https://github.com/crypto-org-chain/cronos/pull/742) Add upgrade handler for v0.8.0-gravity-alpha2.
 - [cronos#750](https://github.com/crypto-org-chain/cronos/pull/750) Add upgrade handler for v0.8.0-gravity-alpha3.
 - [cronos#769](https://github.com/crypto-org-chain/cronos/pull/769) Prevent cancellation function to be called outside the scope of the contract that manage it.
 - [cronos#775](https://github.com/crypto-org-chain/cronos/pull/775) Support turnbridge transaction.
 
+### Bug Fixes
+
+- [#814](https://github.com/crypto-org-chain/cronos/pull/814) Fix prometheus metrics.
+
+### Improvements
+
+- [#813](https://github.com/crypto-org-chain/cronos/pull/813) Tune up rocksdb options.
+
+*Jan 04, 2023*
+
+## v1.0.2
+
+### State Machine Breaking
+
+- [#802](https://github.com/crypto-org-chain/cronos/pull/802) Update ibc-go to `v5.2.0`.
+
+*December 14, 2022*
+
+## v1.0.1
+
+### Improvements
+
+- [#781](https://github.com/crypto-org-chain/cronos/pull/781) Add prune command.
+- [#790](https://github.com/crypto-org-chain/cronos/pull/790) Update cosmos-sdk to `v0.46.7`, it fix a migration issue which affects pending proposals's votes during upgrade,
+  it also adds the config entries for file streamer.
+
+*Nov 22, 2022*
+
+## v1.0.0
+
+### Improvements
+
+- [#772](https://github.com/crypto-org-chain/cronos/pull/772) Update cosmos-sdk to `v0.46.6`, it's non-breaking for cronos.
+
+*Nov 17, 2022*
+
+## v1.0.0-rc4
+
+### Bug Fixes
+
+- [#771](https://github.com/crypto-org-chain/cronos/pull/771) Fix london hardfork number in testnet3 parameters.
+
+*Nov 13, 2022*
+
+## v1.0.0-rc3
+
+### State Machine Breaking
+
+- [#765](https://github.com/crypto-org-chain/cronos/pull/765) Upgrade ibc-go to [v5.1.0](https://github.com/cosmos/ibc-go/releases/tag/v5.1.0) and related dependencies.
+
+*Nov 10, 2022*
+
+## v1.0.0-rc2
+
+### Bug Fixes
+
+- [#761](https://github.com/crypto-org-chain/cronos/pull/761) Fix non-deterministic evm execution result when there are concurrent grpc queries.
+- [#762](https://github.com/crypto-org-chain/cronos/pull/762) Add `v1.0.0` upgrade plan for dry-run and mainnet upgrade, which clears the `extra_eips` parameter.
+- [#763](https://github.com/crypto-org-chain/cronos/pull/763) Add error log for iavl set error.
+- [#764](https://github.com/crypto-org-chain/cronos/pull/764) Make `eth_getProof` result compatible with ethereum.
+
+*Nov 4, 2022*
+
+## v1.0.0-rc1
+
+### Bug Fixes
+
+- [#760](https://github.com/crypto-org-chain/cronos/pull/760) Revert breaking changes on gas used in Ethermint.
+
+*Nov 1, 2022*
+
+## v1.0.0-rc0
+
+### Bug Fixes
+
+- [#748](https://github.com/crypto-org-chain/cronos/pull/748) Fix inconsistent state if upgrade migration commit is interrupted.
+- [#752](https://github.com/crypto-org-chain/cronos/pull/752) Update iavl to `v0.19.4`.
+
+*Oct 15, 2022*
+
+## v0.9.0-beta4
+
+### Bug Fixes
+
+- [cronos#719](https://github.com/crypto-org-chain/cronos/pull/719) Fix `eth_call` for legacy blocks (backport #713).
+
+### Improvements
+
+- [cronos#720](https://github.com/crypto-org-chain/cronos/pull/720) Add option `iavl-disable-fastnode` to disable iavl fastnode indexing migration (backport #714).
+- [cronos#721](https://github.com/crypto-org-chain/cronos/pull/721) Integrate the file state streamer (backport #702).
+- [cronos#730](https://github.com/crypto-org-chain/cronos/pull/730) Update dependencies to recent versions (backport #729).
+
+*Sep 20, 2022*
+
+## v0.9.0-beta3
+
+### Bug Fixes
+
+- [cronos#696](https://github.com/crypto-org-chain/cronos/pull/696) Fix json-rpc apis for legacy blocks.
+
+*Aug 29, 2022*
+
+## v0.9.0-beta2
+
 ### Improvements
 
 - [cronos#702](https://github.com/crypto-org-chain/cronos/pull/702) Integrate the file state streamer.

Makefile

@@ -6,9 +6,6 @@ GOPATH ?= $(shell $(GO) env GOPATH)
 BINDIR ?= ~/go/bin
 NETWORK ?= mainnet
 LEDGER_ENABLED ?= true
-# RocksDB is a native dependency, so we don't assume the library is installed.
-# Instead, it must be explicitly enabled and we warn when it is not.
-ENABLE_ROCKSDB ?= false
 PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
 
 TESTNET_FLAGS ?=
@@ -47,13 +44,6 @@ ifeq ($(LEDGER_ENABLED),true)
     endif
 endif
 
-ifeq ($(ENABLE_ROCKSDB),true)
-  BUILD_TAGS += rocksdb_build
-  test_tags += rocksdb_build
-else
-  $(warning RocksDB support is disabled; to build and test with RocksDB support, set ENABLE_ROCKSDB=true)
-endif
-
 # DB backend selection
 ifeq (cleveldb,$(findstring cleveldb,$(COSMOS_BUILD_OPTIONS)))
   BUILD_TAGS += gcc
@@ -63,11 +53,8 @@ ifeq (badgerdb,$(findstring badgerdb,$(COSMOS_BUILD_OPTIONS)))
 endif
 # handle rocksdb
 ifeq (rocksdb,$(findstring rocksdb,$(COSMOS_BUILD_OPTIONS)))
-  ifneq ($(ENABLE_ROCKSDB),true)
-    $(error Cannot use RocksDB backend unless ENABLE_ROCKSDB=true)
-  endif
   CGO_ENABLED=1
-  BUILD_TAGS += rocksdb
+  BUILD_TAGS += rocksdb grocksdb_clean_link
 endif
 # handle boltdb
 ifeq (boltdb,$(findstring boltdb,$(COSMOS_BUILD_OPTIONS)))

app/app.go

@@ -1,11 +1,11 @@
 package app
 
 import (
+	"fmt"
 	"io"
 	"net/http"
 	"os"
 	"path/filepath"
-	"sync"
 
 	"github.com/crypto-org-chain/cronos/x/cronos/middleware"
 
@@ -20,13 +20,12 @@ import (
 	dbm "github.com/tendermint/tm-db"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
-	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/server/api"
 	"github.com/cosmos/cosmos-sdk/server/config"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
-	"github.com/cosmos/cosmos-sdk/store/streaming/file"
+	"github.com/cosmos/cosmos-sdk/store/streaming"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -121,7 +120,7 @@ import (
 	gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types"
 
 	// this line is used by starport scaffolding # stargate/app/moduleImport
-	cronosappclient "github.com/crypto-org-chain/cronos/client"
+
 	"github.com/crypto-org-chain/cronos/x/cronos"
 	cronosclient "github.com/crypto-org-chain/cronos/x/cronos/client"
 	cronoskeeper "github.com/crypto-org-chain/cronos/x/cronos/keeper"
@@ -347,30 +346,10 @@ func New(
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey, evmtypes.TransientKey, feemarkettypes.TransientKey)
 	memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
 
-	// configure state listening capabilities using AppOptions
-	// we are doing nothing with the returned streamingServices and waitGroup in this case
-	// Only support file streamer right now.
-	if cast.ToString(appOpts.Get(cronosappclient.FlagStreamers)) == "file" {
-		streamingDir := filepath.Join(cast.ToString(appOpts.Get(flags.FlagHome)), "data", FileStreamerDirectory)
-		if err := os.MkdirAll(streamingDir, os.ModePerm); err != nil {
-			panic(err)
-		}
-
-		// default to exposing all
-		exposeStoreKeys := make([]storetypes.StoreKey, 0, len(keys))
-		for _, storeKey := range keys {
-			exposeStoreKeys = append(exposeStoreKeys, storeKey)
-		}
-		service, err := file.NewStreamingService(streamingDir, "", exposeStoreKeys, appCodec)
-		if err != nil {
-			panic(err)
-		}
-		bApp.SetStreamingService(service)
-
-		wg := new(sync.WaitGroup)
-		if err := service.Stream(wg); err != nil {
-			panic(err)
-		}
+	// load state streaming if enabled
+	if _, _, err := streaming.LoadStreamingServices(bApp, appOpts, appCodec, keys); err != nil {
+		fmt.Printf("failed to load state streaming: %s", err)
+		os.Exit(1)
 	}
 
 	app := &App{

app/upgrades.go

@@ -3,6 +3,7 @@ package app
 import (
 	"fmt"
 
+	sdkmath "cosmossdk.io/math"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
@@ -11,8 +12,29 @@ import (
 )
 
 func (app *App) RegisterUpgradeHandlers(experimental bool) {
-	planName := "v0.9.0"
-	app.UpgradeKeeper.SetUpgradeHandler(planName, func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+	upgradeHandlerV1 := func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		m, err := app.mm.RunMigrations(ctx, app.configurator, fromVM)
+		if err != nil {
+			return m, err
+		}
+		// clear extra_eips from evm parameters
+		// Ref: https://github.com/crypto-org-chain/cronos/issues/755
+		params := app.EvmKeeper.GetParams(ctx)
+		params.ExtraEIPs = []int64{}
+
+		// fix the incorrect value on testnet parameters
+		zero := sdkmath.ZeroInt()
+		params.ChainConfig.LondonBlock = &zero
+
+		app.EvmKeeper.SetParams(ctx, params)
+		return m, nil
+	}
+	// `v1.0.0` upgrade plan will clear the `extra_eips` parameters, and upgrade ibc-go to v5.2.0.
+	planName := "v1.0.0"
+	app.UpgradeKeeper.SetUpgradeHandler(planName, upgradeHandlerV1)
+	// "v1.0.0-testnet3-2" is another coordinated upgrade on testnet3 to upgrade ibc-go to "v5.2.0".
+	planNameTestnet3 := "v1.0.0-testnet3-2"
+	app.UpgradeKeeper.SetUpgradeHandler(planNameTestnet3, func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
 		return app.mm.RunMigrations(ctx, app.configurator, fromVM)
 	})
 

cmd/cronosd/cmd/open_db.go

@@ -0,0 +1,15 @@
+//go:build !rocksdb
+// +build !rocksdb
+
+package cmd
+
+import (
+	"path/filepath"
+
+	dbm "github.com/tendermint/tm-db"
+)
+
+func openDB(rootDir string, backendType dbm.BackendType) (dbm.DB, error) {
+	dataDir := filepath.Join(rootDir, "data")
+	return dbm.NewDB("application", backendType, dataDir)
+}

cmd/cronosd/cmd/open_db_rocksdb.go

@@ -0,0 +1,74 @@
+//go:build rocksdb
+// +build rocksdb
+
+package cmd
+
+import (
+	"path/filepath"
+	"runtime"
+
+	"github.com/linxGnu/grocksdb"
+	dbm "github.com/tendermint/tm-db"
+)
+
+func openDB(rootDir string, backendType dbm.BackendType) (dbm.DB, error) {
+	dataDir := filepath.Join(rootDir, "data")
+	if backendType == dbm.RocksDBBackend {
+		// customize rocksdb options
+		db, err := grocksdb.OpenDb(newRocksdbOptions(), filepath.Join(dataDir, "application.db"))
+		if err != nil {
+			return nil, err
+		}
+		ro := grocksdb.NewDefaultReadOptions()
+		wo := grocksdb.NewDefaultWriteOptions()
+		woSync := grocksdb.NewDefaultWriteOptions()
+		woSync.SetSync(true)
+		return dbm.NewRocksDBWithRawDB(db, ro, wo, woSync), nil
+	} else {
+		return dbm.NewDB("application", backendType, dataDir)
+	}
+}
+
+func newRocksdbOptions() *grocksdb.Options {
+	opts := grocksdb.NewDefaultOptions()
+	opts.SetCreateIfMissing(true)
+	opts.IncreaseParallelism(runtime.NumCPU())
+	opts.OptimizeLevelStyleCompaction(512 * 1024 * 1024)
+	opts.SetTargetFileSizeMultiplier(2)
+
+	// block based table options
+	bbto := grocksdb.NewDefaultBlockBasedTableOptions()
+
+	// 1G block cache
+	bbto.SetBlockCache(grocksdb.NewLRUCache(1 << 30))
+
+	// larger block means smaller index and better compression ratio.
+	bbto.SetBlockSize(32 * 1024)
+
+	// http://rocksdb.org/blog/2021/12/29/ribbon-filter.html
+	bbto.SetFilterPolicy(grocksdb.NewRibbonHybridFilterPolicy(9.9, 1))
+
+	// partition index
+	// http://rocksdb.org/blog/2017/05/12/partitioned-index-filter.html
+	bbto.SetIndexType(grocksdb.KTwoLevelIndexSearchIndexType)
+	bbto.SetPartitionFilters(true)
+
+	// hash index is better for iavl tree which mostly do point lookup.
+	bbto.SetDataBlockIndexType(grocksdb.KDataBlockIndexTypeBinarySearchAndHash)
+
+	opts.SetBlockBasedTableFactory(bbto)
+
+	// in iavl tree, we almost always query existing keys
+	opts.SetOptimizeFiltersForHits(true)
+
+	// heavier compression option at bottommost level,
+	// 110k dict bytes is default in zstd library,
+	// train bytes is recommended to be set at 100x dict bytes.
+	opts.SetBottommostCompression(grocksdb.ZSTDCompression)
+	compressOpts := grocksdb.NewDefaultCompressionOptions()
+	compressOpts.MaxDictBytes = 110 * 1024
+	compressOpts.Level = 12
+	opts.SetBottommostCompressionOptions(compressOpts, true)
+	opts.SetBottommostCompressionOptionsZstdMaxTrainBytes(compressOpts.MaxDictBytes*100, true)
+	return opts
+}

cmd/cronosd/cmd/root.go

@@ -132,7 +132,12 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 		// this line is used by starport scaffolding # stargate/root/commands
 	)
 
-	ethermintserver.AddCommands(rootCmd, app.DefaultNodeHome, a.newApp, a.appExport, addModuleInitFlags)
+	opts := ethermintserver.StartOptions{
+		AppCreator:      a.newApp,
+		DefaultNodeHome: app.DefaultNodeHome,
+		DBOpener:        openDB,
+	}
+	ethermintserver.AddCommands(rootCmd, opts, a.appExport, addModuleInitFlags)
 	experimental.AddCommands(rootCmd)
 
 	// add keybase, auxiliary RPC, query, and tx child commands
@@ -271,7 +276,7 @@ func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, a
 		baseapp.SetIndexEvents(cast.ToStringSlice(appOpts.Get(server.FlagIndexEvents))),
 		baseapp.SetSnapshot(snapshotStore, snapshotOptions),
 		baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(server.FlagIAVLCacheSize))),
-		baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(server.FlagIAVLFastNode))),
+		baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(server.FlagDisableIAVLFastNode))),
 	)
 }
 

default.nix

@@ -6,10 +6,10 @@
 , rev ? "dirty"
 }:
 let
-  version = "v0.9.0";
+  version = "v1.0.3";
   pname = "cronosd";
   tags = [ "ledger" "netgo" network ]
-    ++ lib.lists.optionals (rocksdb != null) [ "rocksdb" "rocksdb_build" ];
+    ++ lib.lists.optionals (rocksdb != null) [ "rocksdb" "grocksdb_clean_link" ];
   ldflags = lib.concatStringsSep "\n" ([
     "-X github.com/cosmos/cosmos-sdk/version.Name=cronos"
     "-X github.com/cosmos/cosmos-sdk/version.AppName=${pname}"