Merge branch 'main' into marko/systemtests2

client/v2/internal/testpb/msg.proto

@@ -21,7 +21,7 @@ service Msg {
 }
 
 message MsgRequest {
-  // u32 is an uint32
+  // u32 is a uint32
   uint32                                u32        = 1;
   uint64                                u64        = 2;
   string                                str        = 3;

client/v2/tx/types.go

@@ -181,15 +181,15 @@ func txParamsFromFlagSet(flags *pflag.FlagSet, keybase keyring2.Keyring, ac addr
 
 	fees, _ := flags.GetString(FlagFees)
 	feePayer, _ := flags.GetString(FlagFeePayer)
-	feeGrater, _ := flags.GetString(FlagFeeGranter)
+	feeGranter, _ := flags.GetString(FlagFeeGranter)
 
 	unordered, _ := flags.GetBool(FlagUnordered)
 
 	gasConfig, err := NewGasConfig(gasValue, gasAdjustment, gasPrices)
 	if err != nil {
 		return params, err
 	}
-	feeConfig, err := NewFeeConfig(fees, feePayer, feeGrater)
+	feeConfig, err := NewFeeConfig(fees, feePayer, feeGranter)
 	if err != nil {
 		return params, err
 	}

collections/README.md

@@ -819,7 +819,7 @@ type BaseAccount struct {
 ```
 
 First of all, when we save our accounts in state we map them using a primary key `sdk.AccAddress`.
-If it were to be a `collections.Map` it would be `collections.Map[sdk.AccAddres, authtypes.BaseAccount]`.
+If it were to be a `collections.Map` it would be `collections.Map[sdk.AccAddress, authtypes.BaseAccount]`.
 
 Then we also want to be able to get an account not only by its `sdk.AccAddress`, but also by its `AccountNumber`.
 

core/server/doc.go

@@ -1,4 +1,4 @@
-// Server Defines types and interfaces which are shared between Consensus, Appmanager and Stf
+// Server Defines types and interfaces which are shared between Consensus, App Manager and Stf
 // This package is not meant to be used directly by modules instead if an advanced user would like
 // to create a custom server or replace a component in the server they will need to use the app package.
 package server

crypto/keyring/types.go

@@ -6,7 +6,7 @@ import (
 )
 
 // Language is a language to create the BIP 39 mnemonic in.
-// Currently, only english is supported though.
+// Currently, only English is supported though.
 // Find a list of all supported languages in the BIP 39 spec (word lists).
 type Language int
 

runtime/v2/manager.go

@@ -413,7 +413,7 @@ func (m *MM[T]) TxValidators() func(ctx context.Context, tx T) error {
 // As an app developer, if you wish to skip running InitGenesis for your new
 // module "foo", you need to manually pass a `fromVM` argument to this function
 // foo's module version set to its latest ConsensusVersion. That way, the diff
-// between the function's `fromVM` and `udpatedVM` will be empty, hence not
+// between the function's `fromVM` and `updatedVM` will be empty, hence not
 // running anything for foo.
 //
 // Example:

server/v2/cometbft/grpc.go

@@ -526,12 +526,20 @@ func (c *consensus[T]) maybeHandleExternalServices(ctx context.Context, req *abc
 	if strings.HasPrefix(req.Path, "/cosmos.tx.v1beta1.Service") {
 		rpcClient, _ := client.NewClientFromNode(c.cfg.AppTomlConfig.Address)
 
+		txConfig := authtx.NewTxConfig(
+			c.appCodecs.AppCodec,
+			c.appCodecs.AppCodec.InterfaceRegistry().SigningContext().AddressCodec(),
+			c.appCodecs.AppCodec.InterfaceRegistry().SigningContext().ValidatorAddressCodec(),
+			authtx.DefaultSignModes,
+		)
+
 		// init simple client context
 		clientCtx := client.Context{}.
 			WithLegacyAmino(c.appCodecs.LegacyAmino.(*codec.LegacyAmino)).
 			WithCodec(c.appCodecs.AppCodec).
 			WithNodeURI(c.cfg.AppTomlConfig.Address).
-			WithClient(rpcClient)
+			WithClient(rpcClient).
+			WithTxConfig(txConfig)
 
 		txService := txServer[T]{
 			clientCtx: clientCtx,

server/v2/stf/README.md

@@ -31,4 +31,4 @@ type (
 )
 ```
 
-THe wrappGasMeter is used in order to consume gas. Application developers can seamlsessly replace the gas meter with their own implementation in order to customize consumption of gas.
+THe wrapGasMeter is used in order to consume gas. Application developers can seamlsessly replace the gas meter with their own implementation in order to customize consumption of gas.

tests/systemtests/tx_test.go

@@ -947,7 +947,7 @@ func TestTxDecodeAmino_GRPC(t *testing.T) {
 	}{
 		{"nil request", nil, true, "request cannot be nil"},
 		{"empty request", &tx.TxDecodeAminoRequest{}, true, "invalid empty tx bytes"},
-		{"invalid tx bytes", &tx.TxDecodeAminoRequest{AminoBinary: invalidTxBytes}, true, "invalid request"},
+		{"invalid tx bytes", &tx.TxDecodeAminoRequest{AminoBinary: invalidTxBytes}, true, "unmarshal to legacytx.StdTx failed"},
 		{"valid request with tx bytes", &tx.TxDecodeAminoRequest{AminoBinary: encodedTx}, false, ""},
 	}
 

testutil/sims/app_helpers.go

@@ -273,7 +273,7 @@ func GenesisStateWithValSet(
 	// add bonded amount to bonded pool module account
 	balances = append(balances, banktypes.Balance{
 		Address: authtypes.NewModuleAddress(stakingtypes.BondedPoolName).String(),
-		Coins:   sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, bondAmt)},
+		Coins:   sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, bondAmt.MulRaw(int64(len(delegations))))},
 	})
 
 	// update total supply

types/module/module.go

@@ -628,7 +628,7 @@ func (m *Manager) assertNoForgottenModules(setOrderFnName string, moduleNames []
 //
 // Internally, RunMigrations will perform the following steps:
 // - create an `updatedVM` VersionMap of module with their latest ConsensusVersion
-// - make a diff of `fromVM` and `udpatedVM`, and for each module:
+// - make a diff of `fromVM` and `updatedVM`, and for each module:
 //   - if the module's `fromVM` version is less than its `updatedVM` version,
 //     then run in-place store migrations for that module between those versions.
 //   - if the module does not exist in the `fromVM` (which means that it's a new module,
@@ -643,7 +643,7 @@ func (m *Manager) assertNoForgottenModules(setOrderFnName string, moduleNames []
 // As an app developer, if you wish to skip running InitGenesis for your new
 // module "foo", you need to manually pass a `fromVM` argument to this function
 // foo's module version set to its latest ConsensusVersion. That way, the diff
-// between the function's `fromVM` and `udpatedVM` will be empty, hence not
+// between the function's `fromVM` and `updatedVM` will be empty, hence not
 // running anything for foo.
 //
 // Example:

x/slashing/README.md

@@ -331,7 +331,7 @@ onValidatorBonded(address sdk.ValAddress)
       IndexOffset         : 0,
       JailedUntil         : time.Unix(0, 0),
       Tombstone           : false,
-      MissedBloskCounter  : 0
+      MissedBlocksCounter  : 0
     } else {
       signingInfo.StartHeight = CurrentHeight
     }