Merge branch 'main' into marko/spinout_dist

.github/workflows/lint.yml

@@ -32,6 +32,8 @@ jobs:
         id: lint_long
         run: |
           nix develop -c make lint
+        env:
+          NIX: 1
       - uses: technote-space/[email protected]
         if: steps.lint_long.outcome == 'skipped'
         id: git_diff_all
@@ -49,3 +51,4 @@ jobs:
         env:
           GIT_DIFF: ${{ env.GIT_DIFF }}
           LINT_DIFF: 1
+          NIX: 1

.golangci.yml

@@ -6,14 +6,17 @@ run:
   exclude-dir: testutil/testdata
   skip-files:
     - server/grpc/gogoreflection/fix_registration.go
-    - tests/e2e/client/grpc/cmtservice/service_test.go
     - "fix_registration.go"
     - ".*\\.pb\\.go$"
     - ".*\\.pb\\.gw\\.go$"
     - ".*\\.pulsar\\.go$"
+    - crypto/keys/secp256k1/internal/*
 
 build-tags:
-  - rocksdb
+  - e2e
+  - ledger
+  - test_ledger_mock
+
 
 linters:
   disable-all: true

client/debug/main.go

@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"fmt"
+	"slices"
 	"strconv"
 	"strings"
 
@@ -61,12 +62,15 @@ func CodecCmd() *cobra.Command {
 // getCodecInterfaces creates and returns a new cmd used for listing all registered interfaces on the application codec.
 func getCodecInterfaces() *cobra.Command {
 	return &cobra.Command{
-		Use:   "list-interfaces",
-		Short: "List all registered interface type URLs",
-		Long:  "List all registered interface type URLs using the application codec",
+		Use:     "list-interfaces",
+		Short:   "List all registered interface type URLs",
+		Long:    "List all registered interface type URLs using the application codec",
+		Example: fmt.Sprintf("%s debug codec list-interfaces", version.AppName),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
 			iFaces := clientCtx.Codec.InterfaceRegistry().ListAllInterfaces()
+
+			slices.Sort(iFaces)
 			for _, iFace := range iFaces {
 				cmd.Println(iFace)
 			}
@@ -78,12 +82,15 @@ func getCodecInterfaces() *cobra.Command {
 // getCodecInterfaceImpls creates and returns a new cmd used for listing all registered implemenations of a given interface on the application codec.
 func getCodecInterfaceImpls() *cobra.Command {
 	return &cobra.Command{
-		Use:   "list-implementations [interface]",
-		Short: "List the registered type URLs for the provided interface",
-		Long:  "List the registered type URLs that can be used for the provided interface name using the application codec",
+		Use:     "list-implementations [interface]",
+		Short:   "List the registered type URLs for the provided interface",
+		Long:    "List the registered type URLs that can be used for the provided interface name using the application codec",
+		Example: fmt.Sprintf("%s debug codec list-implementations cosmos.crypto.PubKey", version.AppName),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
 			impls := clientCtx.Codec.InterfaceRegistry().ListImplementations(args[0])
+
+			slices.Sort(impls)
 			for _, imp := range impls {
 				cmd.Println(imp)
 			}
@@ -101,14 +108,11 @@ func getPubKeyFromString(ctx client.Context, pkstr string) (cryptotypes.PubKey,
 
 func PubkeyCmd() *cobra.Command {
 	return &cobra.Command{
-		Use:   "pubkey [pubkey]",
-		Short: "Decode a pubkey from proto JSON",
-		Long: fmt.Sprintf(`Decode a pubkey from proto JSON and display it's address.
-
-Example:
-$ %s debug pubkey '{"@type":"/cosmos.crypto.secp256k1.PubKey","key":"AurroA7jvfPd1AadmmOvWM2rJSwipXfRf8yD6pLbA2DJ"}'
-			`, version.AppName),
-		Args: cobra.ExactArgs(1),
+		Use:     "pubkey [pubkey]",
+		Short:   "Decode a pubkey from proto JSON",
+		Long:    "Decode a pubkey from proto JSON and display it's address.",
+		Example: fmt.Sprintf(`%s debug pubkey '{"@type":"/cosmos.crypto.secp256k1.PubKey","key":"AurroA7jvfPd1AadmmOvWM2rJSwipXfRf8yD6pLbA2DJ"}'`, version.AppName),
+		Args:    cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
 			pk, err := getPubKeyFromString(clientCtx, args[0])
@@ -178,10 +182,10 @@ func PubkeyRawCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "pubkey-raw [pubkey] -t [{ed25519, secp256k1}]",
 		Short: "Decode a ED25519 or secp256k1 pubkey from hex, base64, or bech32",
-		Long: fmt.Sprintf(`Decode a pubkey from hex, base64, or bech32.
-Example:
-$ %s debug pubkey-raw TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlz
-$ %s debug pubkey-raw cosmos1e0jnq2sun3dzjh8p2xq95kk0expwmd7shwjpfg
+		Long:  "Decode a pubkey from hex, base64, or bech32.",
+		Example: fmt.Sprintf(`
+%s debug pubkey-raw TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlz
+%s debug pubkey-raw cosmos1e0jnq2sun3dzjh8p2xq95kk0expwmd7shwjpfg
 			`, version.AppName, version.AppName),
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -282,14 +286,11 @@ func AddrCmd() *cobra.Command {
 
 func RawBytesCmd() *cobra.Command {
 	return &cobra.Command{
-		Use:   "raw-bytes [raw-bytes]",
-		Short: "Convert raw bytes output (eg. [10 21 13 255]) to hex",
-		Long: fmt.Sprintf(`Convert raw-bytes to hex.
-
-Example:
-$ %s debug raw-bytes [72 101 108 108 111 44 32 112 108 97 121 103 114 111 117 110 100]
-			`, version.AppName),
-		Args: cobra.ExactArgs(1),
+		Use:     "raw-bytes [raw-bytes]",
+		Short:   "Convert raw bytes output (eg. [10 21 13 255]) to hex",
+		Long:    "Convert raw-bytes to hex.",
+		Example: fmt.Sprintf("%s debug raw-bytes [72 101 108 108 111 44 32 112 108 97 121 103 114 111 117 110 100]", version.AppName),
+		Args:    cobra.ExactArgs(1),
 		RunE: func(_ *cobra.Command, args []string) error {
 			stringBytes := args[0]
 			stringBytes = strings.Trim(stringBytes, "[")

crypto/ledger/ledger_test.go

@@ -32,6 +32,7 @@ func TestPublicKeyUnsafe(t *testing.T) {
 }
 
 func checkDefaultPubKey(t *testing.T, priv types.LedgerPrivKey) {
+	t.Helper()
 	require.NotNil(t, priv)
 	expectedPkStr := "PubKeySecp256k1{034FEF9CD7C4C63588D3B03FEB5281B9D232CBA34D6F3D71AEE59211FFBFE1FE87}"
 	require.Equal(t, "eb5ae98721034fef9cd7c4c63588d3b03feb5281b9d232cba34d6f3d71aee59211ffbfe1fe87",

docs/build/building-modules/14-simulator.md

@@ -17,7 +17,6 @@ integrated with the application `SimulationManager`.
 * [Simulation package](#simulation-package)
     * [Store decoders](#store-decoders)
     * [Randomized genesis](#randomized-genesis)
-    * [Randomized parameter changes](#randomized-parameter-changes)
     * [Random weighted operations](#random-weighted-operations)
     * [Random proposal contents](#random-proposal-contents)
 * [Registering simulation functions](#registering-simulation-functions)
@@ -62,15 +61,15 @@ Operations on the simulation are simulated using the full [transaction cycle](..
 Shown below is how weights are set:
 
 ```go reference
-https://github.com/cosmos/cosmos-sdk/blob/v/x/staking/simulation/operations.go#L19-L86
+https://github.com/cosmos/cosmos-sdk/blob/release/v0.50.x/x/staking/simulation/operations.go#L19-L86
 ```
 
 As you can see, the weights are predefined in this case. Options exist to override this behavior with different weights. One option is to use `*rand.Rand` to define a random weight for the operation, or you can inject your own predefined weights.
 
 Here is how one can override the above package `simappparams`.
 
 ```go reference
-https://github.com/cosmos/cosmos-sdk/blob/v/Makefile#L293-L299
+https://github.com/cosmos/cosmos-sdk/blob/release/v0.50.x/Makefile#L293-L299
 ```
 
 For the last test a tool called [runsim](https://github.com/cosmos/tools/tree/master/cmd/runsim) is used, this is used to parallelize go test instances, provide info to Github and slack integrations to provide information to your team on how the simulations are running.  
@@ -86,7 +85,7 @@ them to be used on the parameters.
 Now that all the required functions are defined, we need to integrate them into the module pattern within the `module.go`:
 
 ```go reference
-https://github.com/cosmos/cosmos-sdk/blob/v/x/distribution/module.go#L180-L203
+https://github.com/cosmos/cosmos-sdk/blob/release/v0.50.x/x/distribution/module.go#L180-L203
 ```
 
 ## App Simulator manager

scripts/go-lint-all.bash

@@ -9,8 +9,15 @@ lint_module() {
   local root="$1"
   shift
   cd "$(dirname "$root")" &&
-    echo "linting $(grep "^module" go.mod) [$(date -Iseconds -u)]" &&
-    golangci-lint run ./... -c "${REPO_ROOT}/.golangci.yml" "$@"
+  echo "linting $(grep "^module" go.mod) [$(date -Iseconds -u)]" &&
+  if [[ -z "${NIX:-}" ]]; then 
+    golangci-lint run ./... -c "${REPO_ROOT}/.golangci.yml" "$@" --build-tags=e2e,ledger,test_ledger_mock
+  else
+    golangci-lint run ./... -c "${REPO_ROOT}/.golangci.yml" "$@" --build-tags=rocksdb,e2e,ledger,test_ledger_mock
+  fi
+  if [[ "$(grep "^module" go.mod)" == "module cosmossdk.io/simapp" ]]; then
+    golangci-lint run ./... -c "${REPO_ROOT}/.golangci.yml" "$@" --build-tags=app_v1
+  fi
 }
 export -f lint_module
 
@@ -31,7 +38,14 @@ else
   for f in $(dirname $(echo "$GIT_DIFF" | tr -d "'") | uniq); do
     echo "linting $f [$(date -Iseconds -u)]" &&
     cd $f &&
-    golangci-lint run ./... -c "${REPO_ROOT}/.golangci.yml" "$@" &&
+     if [[ -z "${NIX:-}" ]]; then 
+    golangci-lint run ./... -c "${REPO_ROOT}/.golangci.yml" "$@" --build-tags=e2e,ledger,test_ledger_mock
+  else
+    golangci-lint run ./... -c "${REPO_ROOT}/.golangci.yml" "$@" --build-tags=rocksdb,e2e,ledger,test_ledger_mock
+  fi
+    if [[ $f == simapp || $f == simapp/simd/cmd ]]; then
+      golangci-lint run ./... -c "${REPO_ROOT}/.golangci.yml" "$@" --build-tags=app_v1
+    fi
     cd $REPO_ROOT
   done
-fi
+fi

simapp/app.go

@@ -9,6 +9,11 @@ import (
 	"os"
 	"path/filepath"
 
+	abci "github.com/cometbft/cometbft/abci/types"
+	dbm "github.com/cosmos/cosmos-db"
+	"github.com/cosmos/gogoproto/proto"
+	"github.com/spf13/cast"
+
 	autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
 	reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
 	"cosmossdk.io/client/v2/autocli"
@@ -18,12 +23,20 @@ import (
 	"cosmossdk.io/x/circuit"
 	circuitkeeper "cosmossdk.io/x/circuit/keeper"
 	circuittypes "cosmossdk.io/x/circuit/types"
+	distr "cosmossdk.io/x/distribution"
+	distrkeeper "cosmossdk.io/x/distribution/keeper"
+	distrtypes "cosmossdk.io/x/distribution/types"
 	"cosmossdk.io/x/evidence"
 	evidencekeeper "cosmossdk.io/x/evidence/keeper"
 	evidencetypes "cosmossdk.io/x/evidence/types"
 	"cosmossdk.io/x/feegrant"
 	feegrantkeeper "cosmossdk.io/x/feegrant/keeper"
 	feegrantmodule "cosmossdk.io/x/feegrant/module"
+	"cosmossdk.io/x/gov"
+	govclient "cosmossdk.io/x/gov/client"
+	govkeeper "cosmossdk.io/x/gov/keeper"
+	govtypes "cosmossdk.io/x/gov/types"
+	govv1beta1 "cosmossdk.io/x/gov/types/v1beta1"
 	"cosmossdk.io/x/group"
 	groupkeeper "cosmossdk.io/x/group/keeper"
 	groupmodule "cosmossdk.io/x/group/module"
@@ -37,19 +50,6 @@ import (
 	"cosmossdk.io/x/upgrade"
 	upgradekeeper "cosmossdk.io/x/upgrade/keeper"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
-	abci "github.com/cometbft/cometbft/abci/types"
-	dbm "github.com/cosmos/cosmos-db"
-	"github.com/cosmos/gogoproto/proto"
-	"github.com/spf13/cast"
-
-	distr "cosmossdk.io/x/distribution"
-	distrkeeper "cosmossdk.io/x/distribution/keeper"
-	distrtypes "cosmossdk.io/x/distribution/types"
-	"cosmossdk.io/x/gov"
-	govclient "cosmossdk.io/x/gov/client"
-	govkeeper "cosmossdk.io/x/gov/keeper"
-	govtypes "cosmossdk.io/x/gov/types"
-	govv1beta1 "cosmossdk.io/x/gov/types/v1beta1"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
@@ -78,7 +78,6 @@ import (
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	"github.com/cosmos/cosmos-sdk/x/auth/posthandler"
 	authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation"
-	"github.com/cosmos/cosmos-sdk/x/auth/tx"
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
 	txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
@@ -144,8 +143,7 @@ type SimApp struct {
 	interfaceRegistry types.InterfaceRegistry
 
 	// keys to access the substores
-	keys  map[string]*storetypes.KVStoreKey
-	tkeys map[string]*storetypes.TransientStoreKey
+	keys map[string]*storetypes.KVStoreKey
 
 	// keepers
 	AccountKeeper         authkeeper.AccountKeeper
@@ -208,7 +206,7 @@ func NewSimApp(
 	})
 	appCodec := codec.NewProtoCodec(interfaceRegistry)
 	legacyAmino := codec.NewLegacyAmino()
-	txConfig := tx.NewTxConfig(appCodec, tx.DefaultSignModes)
+	txConfig := authtx.NewTxConfig(appCodec, authtx.DefaultSignModes)
 
 	std.RegisterLegacyAminoCodec(legacyAmino)
 	std.RegisterInterfaces(interfaceRegistry)
@@ -291,12 +289,12 @@ func NewSimApp(
 	)
 
 	// optional: enable sign mode textual by overwriting the default tx config (after setting the bank keeper)
-	enabledSignModes := append(tx.DefaultSignModes, sigtypes.SignMode_SIGN_MODE_TEXTUAL)
-	txConfigOpts := tx.ConfigOptions{
+	enabledSignModes := append(authtx.DefaultSignModes, sigtypes.SignMode_SIGN_MODE_TEXTUAL)
+	txConfigOpts := authtx.ConfigOptions{
 		EnabledSignModes:           enabledSignModes,
 		TextualCoinMetadataQueryFn: txmodule.NewBankKeeperCoinMetadataQueryFn(app.BankKeeper),
 	}
-	txConfig, err := tx.NewTxConfigWithOptions(
+	txConfig, err := authtx.NewTxConfigWithOptions(
 		appCodec,
 		txConfigOpts,
 	)
@@ -614,7 +612,9 @@ func (app *SimApp) InitChainer(ctx sdk.Context, req *abci.RequestInitChain) (*ab
 	if err := json.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
 		panic(err)
 	}
-	app.UpgradeKeeper.SetModuleVersionMap(ctx, app.ModuleManager.GetVersionMap())
+	if err := app.UpgradeKeeper.SetModuleVersionMap(ctx, app.ModuleManager.GetVersionMap()); err != nil {
+		panic(err)
+	}
 	return app.ModuleManager.InitGenesis(ctx, app.appCodec, genesisState)
 }
 

simapp/simd/cmd/root.go

@@ -5,11 +5,12 @@ package cmd
 import (
 	"os"
 
+	dbm "github.com/cosmos/cosmos-db"
+	"github.com/spf13/cobra"
+
 	"cosmossdk.io/log"
 	"cosmossdk.io/simapp"
 	"cosmossdk.io/simapp/params"
-	dbm "github.com/cosmos/cosmos-db"
-	"github.com/spf13/cobra"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/config"

store/storage/pebbledb/batch.go

@@ -16,9 +16,10 @@ type Batch struct {
 	storage *pebble.DB
 	batch   *pebble.Batch
 	version uint64
+	sync    bool
 }
 
-func NewBatch(storage *pebble.DB, version uint64) (*Batch, error) {
+func NewBatch(storage *pebble.DB, version uint64, sync bool) (*Batch, error) {
 	var versionBz [VersionSize]byte
 	binary.LittleEndian.PutUint64(versionBz[:], version)
 
@@ -32,6 +33,7 @@ func NewBatch(storage *pebble.DB, version uint64) (*Batch, error) {
 		storage: storage,
 		batch:   batch,
 		version: version,
+		sync:    sync,
 	}, nil
 }
 
@@ -67,5 +69,5 @@ func (b *Batch) Write() (err error) {
 		err = errors.Join(err, b.batch.Close())
 	}()
 
-	return b.batch.Commit(defaultWriteOpts)
+	return b.batch.Commit(&pebble.WriteOptions{Sync: b.sync})
 }