Merge branch 'main' of github.com:cosmos/cosmos-sdk into kocu/runtime-v2

.golangci.yml

@@ -24,6 +24,7 @@ linters:
   enable:
     - dogsled
     - errcheck
+    - errorlint
     - exportloopref
     - gci
     - goconst

CHANGELOG.md

@@ -61,6 +61,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i
 * (client) [#19870](https://github.com/cosmos/cosmos-sdk/pull/19870) Add new query command `wait-tx`. Alias `event-query-tx-for` to `wait-tx` for backward compatibility.
 * (crypto/keyring) [#20212](https://github.com/cosmos/cosmos-sdk/pull/20212) Expose the db keyring used in the keystore.
 * (genutil) [#19971](https://github.com/cosmos/cosmos-sdk/pull/19971) Allow manually setting the consensus key type in genesis
+* (debug) [#20328](https://github.com/cosmos/cosmos-sdk/pull/20328) Add consensus address for debug cmd.
 
 ### Improvements
 

baseapp/baseapp.go

@@ -722,7 +722,7 @@ func (app *BaseApp) preBlock(req *abci.FinalizeBlockRequest) error {
 	return nil
 }
 
-func (app *BaseApp) beginBlock(req *abci.FinalizeBlockRequest) (sdk.BeginBlock, error) {
+func (app *BaseApp) beginBlock(_ *abci.FinalizeBlockRequest) (sdk.BeginBlock, error) {
 	var (
 		resp sdk.BeginBlock
 		err  error

baseapp/params.go

@@ -15,12 +15,3 @@ type ParamStore interface {
 	Has(ctx context.Context) (bool, error)
 	Set(ctx context.Context, cp cmtproto.ConsensusParams) error
 }
-
-// AppVersionModifier defines the interface fulfilled by BaseApp
-// which allows getting and setting it's appVersion field. This
-// in turn updates the consensus params that are sent to the
-// consensus engine in EndBlock
-type AppVersionModifier interface {
-	SetAppVersion(context.Context, uint64) error
-	AppVersion(context.Context) (uint64, error)
-}

client/debug/main.go

@@ -260,26 +260,42 @@ func AddrCmd() *cobra.Command {
 				addr []byte
 				err  error
 			)
-			addr, err = hex.DecodeString(addrString)
-			if err != nil {
-				var err2 error
-				addr, err2 = clientCtx.AddressCodec.StringToBytes(addrString)
-				if err2 != nil {
-					var err3 error
-					addr, err3 = clientCtx.ValidatorAddressCodec.StringToBytes(addrString)
-					if err3 != nil {
-						return fmt.Errorf("expected hex or bech32. Got errors: hex: %w, bech32 acc: %w, bech32 val: %w", err, err2, err3)
+			decodeFns := []func(text string) ([]byte, error){
+				hex.DecodeString,
+				clientCtx.AddressCodec.StringToBytes,
+				clientCtx.ValidatorAddressCodec.StringToBytes,
+				clientCtx.ConsensusAddressCodec.StringToBytes,
+			}
+			errs := make([]any, 0, len(decodeFns))
+			for _, fn := range decodeFns {
+				if addr, err = fn(addrString); err == nil {
+					break
+				}
+				errs = append(errs, err)
+			}
+			if len(errs) == len(decodeFns) {
+				errTags := []string{
+					"hex", "bech32 acc", "bech32 val", "bech32 con",
+				}
+				format := ""
+				for i := range errs {
+					if format != "" {
+						format += ", "
 					}
+					format += errTags[i] + ": %w"
 				}
+				return fmt.Errorf("expected hex or bech32. Got errors: "+format, errs...)
 			}
 
 			acc, _ := clientCtx.AddressCodec.BytesToString(addr)
 			val, _ := clientCtx.ValidatorAddressCodec.BytesToString(addr)
+			con, _ := clientCtx.ConsensusAddressCodec.BytesToString(addr)
 
 			cmd.Println("Address:", addr)
 			cmd.Printf("Address (hex): %X\n", addr)
 			cmd.Printf("Bech32 Acc: %s\n", acc)
 			cmd.Printf("Bech32 Val: %s\n", val)
+			cmd.Printf("Bech32 Con: %s\n", con)
 			return nil
 		},
 	}

core/app/app.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"context"
 	"time"
 
 	appmodulev2 "cosmossdk.io/core/appmodule/v2"
@@ -64,3 +65,12 @@ type TxResult struct {
 	GasUsed   uint64
 	Codespace string
 }
+
+// VersionModifier defines the interface fulfilled by BaseApp
+// which allows getting and setting it's appVersion field. This
+// in turn updates the consensus params that are sent to the
+// consensus engine in EndBlock
+type VersionModifier interface {
+	SetAppVersion(context.Context, uint64) error
+	AppVersion(context.Context) (uint64, error)
+}

core/store/store.go

@@ -30,6 +30,56 @@ type KVStore interface {
 	ReverseIterator(start, end []byte) (Iterator, error)
 }
 
+// Batch represents a group of writes. They may or may not be written atomically depending on the
+// backend. Callers must call Close on the batch when done.
+//
+// As with KVStore, given keys and values should be considered read-only, and must not be modified after
+// passing them to the batch.
+type Batch interface {
+	// Set sets a key/value pair.
+	// CONTRACT: key, value readonly []byte
+	Set(key, value []byte) error
+
+	// Delete deletes a key/value pair.
+	// CONTRACT: key readonly []byte
+	Delete(key []byte) error
+
+	// Write writes the batch, possibly without flushing to disk. Only Close() can be called after,
+	// other methods will error.
+	Write() error
+
+	// WriteSync writes the batch and flushes it to disk. Only Close() can be called after, other
+	// methods will error.
+	WriteSync() error
+
+	// Close closes the batch. It is idempotent, but calls to other methods afterwards will error.
+	Close() error
+
+	// GetByteSize that returns the current size of the batch in bytes. Depending on the implementation,
+	// this may return the size of the underlying LSM batch, including the size of additional metadata
+	// on top of the expected key and value total byte count.
+	GetByteSize() (int, error)
+}
+
+// BatchCreator defines an interface for creating a new batch.
+type BatchCreator interface {
+	// NewBatch creates a new batch for atomic updates. The caller must call Batch.Close.
+	NewBatch() Batch
+
+	// NewBatchWithSize create a new batch for atomic updates, but with pre-allocated size.
+	// This will does the same thing as NewBatch if the batch implementation doesn't support pre-allocation.
+	NewBatchWithSize(int) Batch
+}
+
+// KVStoreWithBatch is an extension of KVStore that allows for batch writes.
+type KVStoreWithBatch interface {
+	KVStore
+	BatchCreator
+
+	// Close closes the KVStoreWithBatch, releasing any resources held.
+	Close() error
+}
+
 // Iterator represents an iterator over a domain of keys. Callers must call
 // Close when done. No writes can happen to a domain while there exists an
 // iterator over it. Some backends may take out database locks to ensure this

crypto/armor.go

@@ -262,15 +262,15 @@ func EncodeArmor(blockType string, headers map[string]string, data []byte) strin
 	buf := new(bytes.Buffer)
 	w, err := armor.Encode(buf, blockType, headers)
 	if err != nil {
-		panic(fmt.Errorf("could not encode ascii armor: %v", err))
+		panic(fmt.Errorf("could not encode ascii armor: %w", err))
 	}
 	_, err = w.Write(data)
 	if err != nil {
-		panic(fmt.Errorf("could not encode ascii armor: %v", err))
+		panic(fmt.Errorf("could not encode ascii armor: %w", err))
 	}
 	err = w.Close()
 	if err != nil {
-		panic(fmt.Errorf("could not encode ascii armor: %v", err))
+		panic(fmt.Errorf("could not encode ascii armor: %w", err))
 	}
 	return buf.String()
 }

math/uint.go

@@ -39,7 +39,7 @@ func (u Uint) IsNil() bool {
 func NewUintFromBigInt(i *big.Int) Uint {
 	u, err := checkNewUint(i)
 	if err != nil {
-		panic(fmt.Errorf("overflow: %s", err))
+		panic(fmt.Errorf("overflow: %w", err))
 	}
 	return u
 }

runtime/module.go

@@ -15,6 +15,7 @@ import (
 	reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
 	stakingmodulev1 "cosmossdk.io/api/cosmos/staking/module/v1"
 	"cosmossdk.io/core/address"
+	"cosmossdk.io/core/app"
 	"cosmossdk.io/core/appmodule"
 	"cosmossdk.io/core/comet"
 	"cosmossdk.io/core/genesis"
@@ -281,7 +282,7 @@ func ProvideTransientStoreService(key depinject.ModuleKey, app *AppBuilder) stor
 	return transientStoreService{key: storeKey}
 }
 
-func ProvideAppVersionModifier(app *AppBuilder) baseapp.AppVersionModifier {
+func ProvideAppVersionModifier(app *AppBuilder) app.VersionModifier {
 	return app.app
 }
 

server/start.go

@@ -823,11 +823,11 @@ func testnetify[T types.Application](ctx *Context, testnetAppCreator types.AppCr
 	_, _, _, _, _, proxyMetrics, _, _ := metrics(genDoc.ChainID) // nolint: dogsled // function from comet
 	proxyApp := proxy.NewAppConns(clientCreator, proxyMetrics)
 	if err := proxyApp.Start(); err != nil {
-		return nil, fmt.Errorf("error starting proxy app connections: %v", err)
+		return nil, fmt.Errorf("error starting proxy app connections: %w", err)
 	}
 	res, err := proxyApp.Query().Info(context, proxy.InfoRequest)
 	if err != nil {
-		return nil, fmt.Errorf("error calling Info: %v", err)
+		return nil, fmt.Errorf("error calling Info: %w", err)
 	}
 	err = proxyApp.Stop()
 	if err != nil {

simapp/app.go

@@ -553,7 +553,7 @@ func NewSimApp(
 			unorderedtx.NewSnapshotter(app.UnorderedTxManager),
 		)
 		if err != nil {
-			panic(fmt.Errorf("failed to register snapshot extension: %s", err))
+			panic(fmt.Errorf("failed to register snapshot extension: %w", err))
 		}
 	}
 

simapp/app_di.go

@@ -292,7 +292,7 @@ func NewSimApp(
 			unorderedtx.NewSnapshotter(app.UnorderedTxManager),
 		)
 		if err != nil {
-			panic(fmt.Errorf("failed to register snapshot extension: %s", err))
+			panic(fmt.Errorf("failed to register snapshot extension: %w", err))
 		}
 	}
 

store/v2/batch.go

@@ -3,7 +3,15 @@ package store
 // Batch is a write-only database that commits changes to the underlying database
 // when Write is called. A batch cannot be used concurrently.
 type Batch interface {
-	Writer
+	// Set inserts the given value into the key-value data store.
+	//
+	// Note: <key, value> are safe to modify and read after calling Set.
+	Set(storeKey, key, value []byte) error
+
+	// Delete removes the key from the backing key-value data store.
+	//
+	// Note: <key> is safe to modify and read after calling Delete.
+	Delete(storeKey, key []byte) error
 
 	// Size retrieves the amount of data queued up for writing, this includes
 	// the keys, values, and deleted keys.
@@ -15,34 +23,3 @@ type Batch interface {
 	// Reset resets the batch.
 	Reset() error
 }
-
-// RawBatch represents a group of writes. They may or may not be written atomically depending on the
-// backend. Callers must call Close on the batch when done.
-//
-// As with RawDB, given keys and values should be considered read-only, and must not be modified after
-// passing them to the batch.
-type RawBatch interface {
-	// Set sets a key/value pair.
-	// CONTRACT: key, value readonly []byte
-	Set(key, value []byte) error
-
-	// Delete deletes a key/value pair.
-	// CONTRACT: key readonly []byte
-	Delete(key []byte) error
-
-	// Write writes the batch, possibly without flushing to disk. Only Close() can be called after,
-	// other methods will error.
-	Write() error
-
-	// WriteSync writes the batch and flushes it to disk. Only Close() can be called after, other
-	// methods will error.
-	WriteSync() error
-
-	// Close closes the batch. It is idempotent, but calls to other methods afterwards will error.
-	Close() error
-
-	// GetByteSize that returns the current size of the batch in bytes. Depending on the implementation,
-	// this may return the size of the underlying LSM batch, including the size of additional metadata
-	// on top of the expected key and value total byte count.
-	GetByteSize() (int, error)
-}

store/v2/commitment/README.md

@@ -8,10 +8,10 @@ into store/v2, specifically the `RootStore` type.
 A foremost design goal is that SC backends should be easily swappable, i.e. not
 necessarily IAVL. To this end, the scope of SC has been reduced, it must only:
 
-* Provide a stateful root app hash for height h resulting from applying a batch
+- Provide a stateful root app hash for height h resulting from applying a batch
   of key-value set/deletes to height h-1.
-* Fulfill (though not necessarily provide) historical proofs for all heights < `h`.
-* Provide an API for snapshot create/restore to fulfill state sync requests.
+- Fulfill (though not necessarily provide) historical proofs for all heights < `h`.
+- Provide an API for snapshot create/restore to fulfill state sync requests.
 
 Notably, SC is not required to provide key iteration or value retrieval for either
 queries or state machine execution, this now being the responsibility of state
@@ -42,6 +42,6 @@ and `Restore` methods.
 
 Similar to the `storage` package, the `commitment` package is designed to be used
 in a broader store implementation, i.e. it fulfills the role of the SC backend.
-Specifically, it provides a `CommitStore` type which accepts a `store.RawDB` and
-a mapping from store key, a string meant to represent a single module, to a `Tree`,
-which reflects the commitment structure.
+Specifically, it provides a `CommitStore` type which accepts a `corestore.KVStore` 
+and a mapping from store key, a string meant to represent a single module, to a 
+`Tree`, which reflects the commitment structure.

store/v2/commitment/iavl/tree.go

@@ -6,8 +6,8 @@ import (
 	"github.com/cosmos/iavl"
 	ics23 "github.com/cosmos/ics23/go"
 
+	corestore "cosmossdk.io/core/store"
 	"cosmossdk.io/log"
-	"cosmossdk.io/store/v2"
 	"cosmossdk.io/store/v2/commitment"
 	dbm "cosmossdk.io/store/v2/db"
 )
@@ -20,7 +20,7 @@ type IavlTree struct {
 }
 
 // NewIavlTree creates a new IavlTree instance.
-func NewIavlTree(db store.RawDB, logger log.Logger, cfg *Config) *IavlTree {
+func NewIavlTree(db corestore.KVStoreWithBatch, logger log.Logger, cfg *Config) *IavlTree {
 	tree := iavl.NewMutableTree(dbm.NewWrapper(db), cfg.CacheSize, cfg.SkipFastStorageUpgrade, logger)
 	return &IavlTree{
 		tree: tree,

store/v2/commitment/iavl/tree_test.go

@@ -6,6 +6,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
+	corestore "cosmossdk.io/core/store"
 	"cosmossdk.io/log"
 	"cosmossdk.io/store/v2"
 	"cosmossdk.io/store/v2/commitment"
@@ -14,7 +15,7 @@ import (
 
 func TestCommitterSuite(t *testing.T) {
 	s := &commitment.CommitStoreTestSuite{
-		NewStore: func(db store.RawDB, storeKeys []string, pruneOpts *store.PruneOptions, logger log.Logger) (*commitment.CommitStore, error) {
+		NewStore: func(db corestore.KVStoreWithBatch, storeKeys []string, pruneOpts *store.PruneOptions, logger log.Logger) (*commitment.CommitStore, error) {
 			multiTrees := make(map[string]commitment.Tree)
 			cfg := DefaultConfig()
 			for _, storeKey := range storeKeys {

store/v2/commitment/store.go

@@ -37,20 +37,15 @@ var (
 // and trees.
 type CommitStore struct {
 	logger     log.Logger
-	db         store.RawDB
+	db         corestore.KVStoreWithBatch
 	multiTrees map[string]Tree
 
 	// pruneOptions is the pruning configuration.
 	pruneOptions *store.PruneOptions // TODO are there no default prune options?
 }
 
 // NewCommitStore creates a new CommitStore instance.
-func NewCommitStore(
-	trees map[string]Tree,
-	db store.RawDB,
-	pruneOpts *store.PruneOptions,
-	logger log.Logger,
-) (*CommitStore, error) {
+func NewCommitStore(trees map[string]Tree, db corestore.KVStoreWithBatch, pruneOpts *store.PruneOptions, logger log.Logger) (*CommitStore, error) {
 	if pruneOpts == nil {
 		pruneOpts = store.DefaultPruneOptions()
 	}

store/v2/commitment/store_test_suite.go

@@ -25,7 +25,7 @@ const (
 type CommitStoreTestSuite struct {
 	suite.Suite
 
-	NewStore func(db store.RawDB, storeKeys []string, pruneOpts *store.PruneOptions, logger log.Logger) (*CommitStore, error)
+	NewStore func(db corestore.KVStoreWithBatch, storeKeys []string, pruneOpts *store.PruneOptions, logger log.Logger) (*CommitStore, error)
 }
 
 func (s *CommitStoreTestSuite) TestStore_Snapshotter() {