Merge branch 'main' into marko/spinout_slashing

README.md

@@ -40,7 +40,7 @@ The Cosmos SDK is a framework for building blockchain applications. [CometBFT (B
 
 ## Quick Start
 
-To learn how the Cosmos SDK works from a high-level perspective, see the Cosmos SDK [High-Level Intro](https://docs.cosmos.network/main/intro/overview.html).
+To learn how the Cosmos SDK works from a high-level perspective, see the Cosmos SDK [High-Level Intro](https://docs.cosmos.network/main/learn/intro/overview).
 
 If you want to get started quickly and learn how to build on top of Cosmos SDK, visit [Cosmos SDK Tutorials](https://tutorials.cosmos.network). You can also fork the tutorial's repository to get started building your own Cosmos SDK application.
 

UPGRADING.md

@@ -78,10 +78,24 @@ Most of Cosmos SDK modules have migrated to [collections](https://docs.cosmos.ne
 Many functions have been removed due to this changes as the API can be smaller thanks to collections.
 For modules that have migrated, verify you are checking against `collections.ErrNotFound` when applicable.
 
+#### `x/group`
+
+Group was spun out into its own `go.mod`. To import it use `cosmossdk.io/x/group`
+
+#### `x/gov`
+
+Gov was spun out into its own `go.mod`. To import it use `cosmossdk.io/x/gov`
+
 #### `x/distribution`
 
+Distribution was spun out into its own `go.mod`. To import it use `cosmossdk.io/x/distribution`
+
 The existing chains using x/distribution module needs to add the new x/protocolpool module.
 
+#### `x/params`
+
+A standalone Go module was created and it is accessible at "cosmossdk.io/x/params".
+
 #### `x/protocolpool`
 
 Introducing a new `x/protocolpool` module to handle community pool funds. Its store must be added while upgrading to v0.51.x
@@ -424,7 +438,7 @@ This sign mode does not allow offline signing
 
 When using (legacy) application wiring, the following must be added to `app.go` after setting the app's bank keeper:
 
-```golang
+```go
  enabledSignModes := append(tx.DefaultSignModes, sigtypes.SignMode_SIGN_MODE_TEXTUAL)
  txConfigOpts := tx.ConfigOptions{
  EnabledSignModes: enabledSignModes,
@@ -440,9 +454,11 @@ When using (legacy) application wiring, the following must be added to `app.go`
  app.txConfig = txConfig
 ```
 
+When using `depinject` / `app v2`, **it's enabled by default** if there's a bank keeper present.
+
 And in the application client (usually `root.go`):
 
-```golang
+```go
  if !clientCtx.Offline {
  txConfigOpts.EnabledSignModes = append(txConfigOpts.EnabledSignModes, signing.SignMode_SIGN_MODE_TEXTUAL)
  txConfigOpts.TextualCoinMetadataQueryFn = txmodule.NewGRPCCoinMetadataQueryFn(clientCtx)
@@ -457,7 +473,7 @@ And in the application client (usually `root.go`):
  }
 ```
 
-When using `depinject` / `app v2`, **it's enabled by default** if there's a bank keeper present.
+When using `depinject` / `app v2`, the a tx config should be recreated from the `txConfigOpts` to use `NewGRPCCoinMetadataQueryFn` instead of depending on the bank keeper (that is used in the server).
 
 To learn more see the [docs](https://docs.cosmos.network/main/learn/advanced/transactions#sign_mode_textual) and the [ADR-050](https://docs.cosmos.network/main/build/architecture/adr-050-sign-mode-textual).
 

client/cmd.go

@@ -8,6 +8,7 @@ import (
  "github.com/cockroachdb/errors"
  "github.com/spf13/cobra"
  "github.com/spf13/pflag"
+ "golang.org/x/exp/slices"
  "google.golang.org/grpc"
  "google.golang.org/grpc/credentials"
  "google.golang.org/grpc/credentials/insecure"
@@ -283,14 +284,7 @@ func readTxCommandFlags(clientCtx Context, flagSet *pflag.FlagSet) (Context, err
  clientCtx = clientCtx.WithFrom(from).WithFromAddress(fromAddr).WithFromName(fromName)
 
  if keyType == keyring.TypeLedger && clientCtx.SignModeStr == flags.SignModeTextual {
- textualEnabled := false
- for _, v := range clientCtx.TxConfig.SignModeHandler().SupportedModes() {
- if v == signingv1beta1.SignMode_SIGN_MODE_TEXTUAL {
- textualEnabled = true
- break
- }
- }
- if !textualEnabled {
+ if !slices.Contains(clientCtx.TxConfig.SignModeHandler().SupportedModes(), signingv1beta1.SignMode_SIGN_MODE_TEXTUAL) {
  return clientCtx, fmt.Errorf("SIGN_MODE_TEXTUAL is not available")
  }
  }
@@ -311,14 +305,12 @@ func readTxCommandFlags(clientCtx Context, flagSet *pflag.FlagSet) (Context, err
  isAux, _ := flagSet.GetBool(flags.FlagAux)
  clientCtx = clientCtx.WithAux(isAux)
  if isAux {
- // If the user didn't explicitly set an --output flag, use JSON by
- // default.
+ // If the user didn't explicitly set an --output flag, use JSON by default.
  if clientCtx.OutputFormat == "" || !flagSet.Changed(flags.FlagOutput) {
  clientCtx = clientCtx.WithOutputFormat(flags.OutputFormatJSON)
  }
 
- // If the user didn't explicitly set a --sign-mode flag, use
- // DIRECT_AUX by default.
+ // If the user didn't explicitly set a --sign-mode flag, use DIRECT_AUX by default.
  if clientCtx.SignModeStr == "" || !flagSet.Changed(flags.FlagSignMode) {
  clientCtx = clientCtx.WithSignModeStr(flags.SignModeDirectAux)
  }

client/tx/factory.go

@@ -57,10 +57,8 @@ func NewFactoryCLI(clientCtx client.Context, flagSet *pflag.FlagSet) (Factory, e
  return Factory{}, fmt.Errorf("failed to bind flags to viper: %w", err)
  }
 
- signModeStr := clientCtx.SignModeStr
-
  signMode := signing.SignMode_SIGN_MODE_UNSPECIFIED
- switch signModeStr {
+ switch clientCtx.SignModeStr {
  case flags.SignModeDirect:
  signMode = signing.SignMode_SIGN_MODE_DIRECT
  case flags.SignModeLegacyAminoJSON:

client/tx/tx.go

@@ -126,8 +126,7 @@ func BroadcastTx(clientCtx client.Context, txf Factory, msgs ...sdk.Msg) error {
  }
  }
 
- err = Sign(clientCtx.CmdContext, txf, clientCtx.FromName, tx, true)
- if err != nil {
+ if err = Sign(clientCtx.CmdContext, txf, clientCtx.FromName, tx, true); err != nil {
  return err
  }
 
@@ -323,9 +322,7 @@ func Sign(ctx context.Context, txf Factory, name string, txBuilder client.TxBuil
  return err
  }
 
- bytesToSign, err := authsigning.GetSignBytesAdapter(
- ctx, txf.txConfig.SignModeHandler(),
- signMode, signerData, txBuilder.GetTx())
+ bytesToSign, err := authsigning.GetSignBytesAdapter(ctx, txf.txConfig.SignModeHandler(), signMode, signerData, txBuilder.GetTx())
  if err != nil {
  return err
  }

client/v2/autocli/msg.go

@@ -6,7 +6,6 @@ import (
 
  "github.com/cockroachdb/errors"
  "github.com/spf13/cobra"
- "golang.org/x/exp/slices"
  "google.golang.org/protobuf/proto"
  "google.golang.org/protobuf/reflect/protoreflect"
  "google.golang.org/protobuf/types/dynamicpb"
@@ -115,21 +114,26 @@ func (b *Builder) BuildMsgMethodCommand(descriptor protoreflect.MethodDescriptor
  return err
  }
 
- // enable sign mode textual and config tx options
- if !clientCtx.Offline && !slices.Contains(b.TxConfigOpts.EnabledSignModes, signing.SignMode_SIGN_MODE_TEXTUAL) {
+ clientCtx = clientCtx.WithCmdContext(cmd.Context())
+ clientCtx = clientCtx.WithOutput(cmd.OutOrStdout())
+
+ // enable sign mode textual
+ // the config is always overwritten as we need to have set the flags to the client context
+ // this ensures that the context has the correct client.
+ if !clientCtx.Offline {
  b.TxConfigOpts.EnabledSignModes = append(b.TxConfigOpts.EnabledSignModes, signing.SignMode_SIGN_MODE_TEXTUAL)
  b.TxConfigOpts.TextualCoinMetadataQueryFn = authtxconfig.NewGRPCCoinMetadataQueryFn(clientCtx)
- }
 
- txConfig, err := authtx.NewTxConfigWithOptions(
- codec.NewProtoCodec(clientCtx.InterfaceRegistry),
- b.TxConfigOpts,
- )
- if err != nil {
- return err
+ txConfig, err := authtx.NewTxConfigWithOptions(
+ codec.NewProtoCodec(clientCtx.InterfaceRegistry),
+ b.TxConfigOpts,
+ )
+ if err != nil {
+ return err
+ }
+
+ clientCtx = clientCtx.WithTxConfig(txConfig)
  }
- clientCtx = clientCtx.WithTxConfig(txConfig)
- clientCtx.Output = cmd.OutOrStdout()
 
  // set signer to signer field if empty
  fd := input.Descriptor().Fields().ByName(protoreflect.Name(flag.GetSignerFieldName(input.Descriptor())))

client/v2/go.mod

@@ -13,7 +13,6 @@ require (
  github.com/cosmos/gogoproto v1.4.11
  github.com/spf13/cobra v1.7.0
  github.com/spf13/pflag v1.0.5
- golang.org/x/exp v0.0.0-20231006140011-7918f672742d
  google.golang.org/grpc v1.59.0
  google.golang.org/protobuf v1.31.0
  gotest.tools/v3 v3.5.1
@@ -140,6 +139,7 @@ require (
  go.etcd.io/bbolt v1.3.7 // indirect
  go.uber.org/multierr v1.11.0 // indirect
  golang.org/x/crypto v0.14.0 // indirect
+ golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
  golang.org/x/net v0.17.0 // indirect
  golang.org/x/sync v0.4.0 // indirect
  golang.org/x/sys v0.13.0 // indirect

math/CHANGELOG.md

@@ -42,6 +42,7 @@ Ref: https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.j
 
 ### Bug Fixes
 
+* [#18228](https://github.com/cosmos/cosmos-sdk/pull/18228) Fix panic when calling `BigInt()` on an uninitialized `Uint`.
 * [#18214](https://github.com/cosmos/cosmos-sdk/pull/18214) Ensure that modifying the argument to `NewUIntFromBigInt` doesn't mutate the returned value.
 * [#18211](https://github.com/cosmos/cosmos-sdk/pull/18211) RelativePow now returns 1 when 0^0, before it was returning the scale factor.
 * [#17725](https://github.com/cosmos/cosmos-sdk/pull/17725) Fix state break in ApproxRoot. This has been present since math/v1.0.1. It changed the rounding behavior at precision end in an intermediary division from banker's to truncation. The truncation occurs from binary right shift in the case of square roots. The change is now reverted back to banker's rounding universally for any root.

math/uint.go

@@ -15,6 +15,9 @@ type Uint struct {
 
 // BigInt converts Uint to big.Int
 func (u Uint) BigInt() *big.Int {
+ if u.IsNil() {
+ return nil
+ }
  return new(big.Int).Set(u.i)
 }
 

math/uint_test.go

@@ -69,6 +69,8 @@ func (s *uintTestSuite) TestUintPanics() {
  s.Require().Panics(func() { uintmin.Sub(sdkmath.OneUint()) })
  s.Require().Panics(func() { uintmin.Decr() })
 
+ s.Require().NotPanics(func() { sdkmath.Uint{}.BigInt() })
+
  s.Require().Equal(uint64(0), sdkmath.MinUint(sdkmath.ZeroUint(), sdkmath.OneUint()).Uint64())
  s.Require().Equal(uint64(1), sdkmath.MaxUint(sdkmath.ZeroUint(), sdkmath.OneUint()).Uint64())
 

scripts/mockgen.sh

@@ -3,7 +3,6 @@
 mockgen_cmd="mockgen"
 $mockgen_cmd -source=baseapp/abci_utils.go -package mock -destination baseapp/testutil/mock/mocks.go
 $mockgen_cmd -source=client/account_retriever.go -package mock -destination testutil/mock/account_retriever.go
-$mockgen_cmd -package mock -destination store/mock/cosmos_cosmos_db_DB.go github.com/cosmos/cosmos-db DB
 $mockgen_cmd -source=types/module/module.go -package mock -destination testutil/mock/types_module_module.go
 $mockgen_cmd -source=types/module/mock_appmodule_test.go -package mock -destination testutil/mock/types_mock_appmodule.go
 $mockgen_cmd -source=types/invariant.go -package mock -destination testutil/mock/types_invariant.go