Merge branch 'main' into fix-typo4ek

Alex | Interchain Labs · web-flow · commit fdee96c21188 · 2025-08-08T09:44:35.000-04:00
diff --git a/client/broadcast_test.go b/client/broadcast_test.go
@@ -20,7 +20,7 @@ func CreateContextWithErrorAndMode(err error, mode string) Context {
 	}
 }
 
-// Test the correct code is returned when
+// Test the correct code is returned when broadcasting transactions with specific mempool errors
 func TestBroadcastError(t *testing.T) {
 	errors := map[error]uint32{
 		mempool.ErrTxInCache:       sdkerrors.ErrTxInMempoolCache.ABCICode(),
diff --git a/client/query.go b/client/query.go
@@ -60,7 +60,7 @@ func (ctx Context) GetFromAddress() sdk.AccAddress {
 	return ctx.FromAddress
 }
 
-// GetFeePayerAddress returns the fee granter address from the context
+// GetFeePayerAddress returns the fee payer address from the context
 func (ctx Context) GetFeePayerAddress() sdk.AccAddress {
 	return ctx.FeePayer
 }
diff --git a/client/v2/CHANGELOG.md b/client/v2/CHANGELOG.md
@@ -38,7 +38,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Bug Fixes
 
-* [#24722](https://github.com/cosmos/cosmos-sdk/pull/24722) Fix msg parsing in when no pulsar file is present.
+* [#24722](https://github.com/cosmos/cosmos-sdk/pull/24722) Fix msg parsing when no pulsar file is present.
 
 ## [v2.0.0-beta.9](https://github.com/cosmos/cosmos-sdk/tree/client/v2.0.0-beta.9) - 2025-04-24
 
diff --git a/client/v2/README.md b/client/v2/README.md
@@ -92,7 +92,7 @@ The keyring is then converted to the `client/v2/autocli/keyring` interface.
 If no keyring is provided, the `autocli` generated command will not be able to sign transactions, but will still be able to query the chain.
 
 :::tip
-The Cosmos SDK keyring and Hubl keyring both implement the `client/v2/autocli/keyring` interface, thanks to the following wrapper:
+The Cosmos SDK keyring implements the `client/v2/autocli/keyring` interface, thanks to the following wrapper:
 
 ```go
 keyring.NewAutoCLIKeyring(kb)
@@ -255,8 +255,4 @@ https://github.com/cosmos/cosmos-sdk/blob/client/v2.0.0-beta.1/client/grpc/cmtse
 
 ## Summary
 
-`autocli` let you generate CLI to your Cosmos SDK-based applications without any cobra boilerplate. It allows you to easily generate CLI commands and flags from your protobuf messages, and provides many options for customising the behavior of your CLI application.
-
-To further enhance your CLI experience with Cosmos SDK-based blockchains, you can use `hubl`. `hubl` is a tool that allows you to query any Cosmos SDK-based blockchain using the new AutoCLI feature of the Cosmos SDK. With `hubl`, you can easily configure a new chain and query modules with just a few simple commands.
-
-For more information on `hubl`, including how to configure a new chain and query a module, see the [Hubl documentation](https://docs.cosmos.network/main/tooling/hubl).
+`autocli` lets you generate CLI for your Cosmos SDK-based applications without any cobra boilerplate. It allows you to easily generate CLI commands and flags from your protobuf messages, and provides many options for customising the behavior of your CLI application.
diff --git a/codec/codec.go b/codec/codec.go
@@ -12,7 +12,7 @@ type (
 	// Codec defines a functionality for serializing other objects.
 	// Users can define a custom Protobuf-based serialization.
 	// Note, Amino can still be used without any dependency on Protobuf.
-	// SDK provides to Codec implementations:
+	// SDK provides two Codec implementations:
 	//
 	// 1. AminoCodec: Provides full Amino serialization compatibility.
 	// 2. ProtoCodec: Provides full Protobuf serialization compatibility.
diff --git a/codec/types/any_test.go b/codec/types/any_test.go
@@ -28,7 +28,7 @@ var eom = &errOnMarshal{}
 // Ensure that returning an error doesn't suddenly allocate and waste bytes.
 // See https://github.com/cosmos/cosmos-sdk/issues/8537
 func TestNewAnyWithCustomTypeURLWithErrorNoAllocation(t *testing.T) {
-	// This tests continues to fail inconsistently.
+	// This test continues to fail inconsistently.
 	//
 	// Example: https://github.com/cosmos/cosmos-sdk/pull/9246/checks?check_run_id=2643313958#step:6:118
 	// Ref: https://github.com/cosmos/cosmos-sdk/issues/9010
diff --git a/docs/docs/learn/beginner/02-query-lifecycle.md b/docs/docs/learn/beginner/02-query-lifecycle.md
@@ -47,7 +47,7 @@ One such tool is [grpcurl](https://github.com/fullstorydev/grpcurl), and a gRPC
 
 ```bash
 grpcurl \
-    -plaintext                                           # We want results in plain test
+    -plaintext                                           # We want results in plain text
     -import-path ./proto \                               # Import these .proto files
     -proto ./proto/cosmos/staking/v1beta1/query.proto \  # Look into this .proto file for the Query protobuf service
     -d '{"address":"$MY_DELEGATOR"}' \                   # Query arguments
diff --git a/internal/conv/string_test.go b/internal/conv/string_test.go
@@ -25,7 +25,9 @@ func (s *StringSuite) TestUnsafeStrToBytes() {
 	for range 5 {
 		b := unsafeConvertStr()
 		runtime.GC()
-		<-time.NewTimer(2 * time.Millisecond).C
+		timer := time.NewTimer(2 * time.Millisecond)
+		<-timer.C
+		timer.Stop()
 		b2 := append(b, 'd')
 		s.Equal("abc", string(b))
 		s.Equal("abcd", string(b2))
@@ -42,7 +44,9 @@ func (s *StringSuite) TestUnsafeBytesToStr() {
 	for range 5 {
 		str := unsafeConvertBytes()
 		runtime.GC()
-		<-time.NewTimer(2 * time.Millisecond).C
+		timer := time.NewTimer(2 * time.Millisecond)
+		<-timer.C
+		timer.Stop()
 		s.Equal("abc", str)
 	}
 }
diff --git a/simapp/testutil_network_test.go b/simapp/testutil_network_test.go
@@ -25,7 +25,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
 	s.Require().NoError(err)
 
 	h, err := s.network.WaitForHeight(1)
-	s.Require().NoError(err, "stalled at height %d", h)
+	s.Require().NoError(err, "failed to reach height 1; got %d", h)
 }
 
 func (s *IntegrationTestSuite) TearDownSuite() {
diff --git a/store/cachekv/benchmark_test.go b/store/cachekv/benchmark_test.go
@@ -72,7 +72,7 @@ type CacheStack struct {
 	cacheStores []types.CacheKVStore
 }
 
-// CurrentContext returns the top context of cached stack,
+// CurrentStore returns the top context of cached stack,
 // if the stack is empty, returns the initial context.
 func (cs *CacheStack) CurrentStore() types.CacheKVStore {
 	l := len(cs.cacheStores)
diff --git a/store/iavl/store.go b/store/iavl/store.go
@@ -291,7 +291,7 @@ func (st *Store) Import(version int64) (*iavl.Importer, error) {
 	return tree.Import(version)
 }
 
-// Handle gatest the latest height, if height is 0
+// Handle gets the latest height, if height is 0
 func getHeight(tree Tree, req *types.RequestQuery) int64 {
 	height := req.Height
 	if height == 0 {
diff --git a/store/internal/conv/string_test.go b/store/internal/conv/string_test.go
@@ -25,7 +25,9 @@ func (s *StringSuite) TestUnsafeStrToBytes() {
 	for i := 0; i < 5; i++ {
 		b := unsafeConvertStr()
 		runtime.GC()
-		<-time.NewTimer(2 * time.Millisecond).C
+		timer := time.NewTimer(2 * time.Millisecond)
+		<-timer.C
+		timer.Stop()
 		b2 := append(b, 'd')
 		s.Equal("abc", string(b))
 		s.Equal("abcd", string(b2))
@@ -42,7 +44,9 @@ func (s *StringSuite) TestUnsafeBytesToStr() {
 	for i := 0; i < 5; i++ {
 		str := unsafeConvertBytes()
 		runtime.GC()
-		<-time.NewTimer(2 * time.Millisecond).C
+		timer := time.NewTimer(2 * time.Millisecond)
+		<-timer.C
+		timer.Stop()
 		s.Equal("abc", str)
 	}
 }
diff --git a/systemtests/system.go b/systemtests/system.go
@@ -314,11 +314,13 @@ func (s *SystemUnderTest) AwaitNodeUp(t *testing.T, rpcAddr string) {
 			started <- struct{}{}
 		}
 	}()
+	timer := time.NewTimer(timeout)
+	defer timer.Stop()
 	select {
 	case <-started:
 	case <-ctx.Done():
 		require.NoError(t, ctx.Err())
-	case <-time.NewTimer(timeout).C:
+	case <-timer.C:
 		t.Fatalf("timeout waiting for node start: %s", timeout)
 	}
 }
@@ -403,7 +405,9 @@ func (s *SystemUnderTest) AwaitBlockHeight(t *testing.T, targetHeight int64, tim
 	} else {
 		maxWaitTime = time.Duration(targetHeight-s.currentHeight.Load()+4) * s.blockTime
 	}
-	abort := time.NewTimer(maxWaitTime).C
+	timer := time.NewTimer(maxWaitTime)
+	defer timer.Stop()
+	abort := timer.C
 	for {
 		select {
 		case <-abort:
@@ -433,10 +437,12 @@ func (s *SystemUnderTest) AwaitNextBlock(t *testing.T, timeout ...time.Duration)
 		done <- s.currentHeight.Load()
 		close(done)
 	}()
+	timer := time.NewTimer(maxWaitTime)
+	defer timer.Stop()
 	select {
 	case v := <-done:
 		return v
-	case <-time.NewTimer(maxWaitTime).C:
+	case <-timer.C:
 		t.Fatalf("Timeout - no block within %s", maxWaitTime)
 		return -1
 	}
@@ -907,6 +913,7 @@ func TimeoutConsumer(t *testing.T, maxWaitTime time.Duration, next EventConsumer
 	ctx, done := context.WithCancel(context.Background())
 	t.Cleanup(done)
 	timeout := time.NewTimer(maxWaitTime)
+	t.Cleanup(func() { timeout.Stop() })
 	timedOut := make(chan struct{}, 1)
 	go func() {
 		select {
@@ -922,6 +929,13 @@ func TimeoutConsumer(t *testing.T, maxWaitTime time.Duration, next EventConsumer
 			t.Fatalf("Timeout waiting for new events %s", maxWaitTime)
 			return false
 		default:
+			if !timeout.Stop() {
+				// Drain the channel if the timer already fired
+				select {
+				case <-timeout.C:
+				default:
+				}
+			}
 			timeout.Reset(maxWaitTime)
 			result := next(e)
 			if !result {
diff --git a/testutil/ioutil.go b/testutil/ioutil.go
@@ -73,7 +73,7 @@ func TempFile(tb testing.TB) *os.File {
 	return fp
 }
 
-// GetTempDir returns a writable temporary director for the test to use.
+// GetTempDir returns a writable temporary directory for the test to use.
 func GetTempDir(tb testing.TB) string {
 	tb.Helper()
 	// os.MkDir() is used instead of testing.T.TempDir()
diff --git a/types/handler.go b/types/handler.go
@@ -18,7 +18,7 @@ type PostDecorator interface {
 	PostHandle(ctx Context, tx Tx, simulate, success bool, next PostHandler) (newCtx Context, err error)
 }
 
-// ChainAnteDecorators ChainDecorator chains AnteDecorators together with each AnteDecorator
+// ChainAnteDecorators chains AnteDecorators together with each AnteDecorator
 // wrapping over the decorators further along chain and returns a single AnteHandler.
 //
 // NOTE: The first element is outermost decorator, while the last element is innermost
diff --git a/x/auth/ante/validator_tx_fee.go b/x/auth/ante/validator_tx_fee.go
@@ -11,7 +11,7 @@ import (
 )
 
 // checkTxFeeWithValidatorMinGasPrices implements the default fee logic, where the minimum price per
-// unit of gas is fixed and set by each validator, can the tx priority is computed from the gas price.
+// unit of gas is fixed and set by each validator, and the tx priority is computed from the gas price.
 func checkTxFeeWithValidatorMinGasPrices(ctx sdk.Context, tx sdk.Tx) (sdk.Coins, int64, error) {
 	feeTx, ok := tx.(sdk.FeeTx)
 	if !ok {
diff --git a/x/auth/vesting/README.md b/x/auth/vesting/README.md
@@ -41,7 +41,7 @@ For all vesting accounts, the owner of the vesting account is able to delegate a
 
 ## Note
 
-Vesting accounts can be initialized with some vesting and non-vesting coins. The non-vesting coins would be immediately transferable. DelayedVesting ContinuousVesting, PeriodicVesting and PermenantVesting accounts can be created with normal messages after genesis. Other types of vesting accounts must be created at genesis, or as part of a manual network upgrade. The current specification only allows for _unconditional_ vesting (ie. there is no possibility of reaching `ET` and
+Vesting accounts can be initialized with some vesting and non-vesting coins. The non-vesting coins would be immediately transferable. DelayedVesting ContinuousVesting, PeriodicVesting and PermanentVesting accounts can be created with normal messages after genesis. Other types of vesting accounts must be created at genesis, or as part of a manual network upgrade. The current specification only allows for _unconditional_ vesting (ie. there is no possibility of reaching `ET` and
 having coins fail to vest).
 
 ## Vesting Account Types
diff --git a/x/authz/authorizations.go b/x/authz/authorizations.go
@@ -29,7 +29,7 @@ type Authorization interface {
 // AcceptResponse instruments the controller of an authz message if the request is accepted
 // and if it should be updated or deleted.
 type AcceptResponse struct {
-	// If Accept=true, the controller can accept and authorization and handle the update.
+	// If Accept=true, the controller can accept an authorization and handle the update.
 	Accept bool
 	// If Delete=true, the controller must delete the authorization object and release
 	// storage resources.
diff --git a/x/group/internal/orm/auto_uint64.go b/x/group/internal/orm/auto_uint64.go
@@ -82,7 +82,7 @@ func (a AutoUInt64Table) GetOne(store storetypes.KVStore, rowID uint64, dest pro
 }
 
 // PrefixScan returns an Iterator over a domain of keys in ascending order. End is exclusive.
-// Start is an MultiKeyIndex key or prefix. It must be less than end, or the Iterator is invalid and error is returned.
+// Start is a MultiKeyIndex key or prefix. It must be less than end, or the Iterator is invalid and error is returned.
 // Iterator must be closed by caller.
 // To iterate over entire domain, use PrefixScan(1, math.MaxUint64)
 //
@@ -103,7 +103,7 @@ func (a AutoUInt64Table) PrefixScan(store storetypes.KVStore, start, end uint64)
 }
 
 // ReversePrefixScan returns an Iterator over a domain of keys in descending order. End is exclusive.
-// Start is an MultiKeyIndex key or prefix. It must be less than end, or the Iterator is invalid  and error is returned.
+// Start is a MultiKeyIndex key or prefix. It must be less than end, or the Iterator is invalid  and error is returned.
 // Iterator must be closed by caller.
 // To iterate over entire domain, use PrefixScan(1, math.MaxUint64)
 //
diff --git a/x/group/internal/orm/index.go b/x/group/internal/orm/index.go
@@ -117,7 +117,7 @@ func (i MultiKeyIndex) GetPaginated(store types.KVStore, searchKey any, pageRequ
 }
 
 // PrefixScan returns an Iterator over a domain of keys in ascending order. End is exclusive.
-// Start is an MultiKeyIndex key or prefix. It must be less than end, or the Iterator is invalid and error is returned.
+// Start is a MultiKeyIndex key or prefix. It must be less than end, or the Iterator is invalid and error is returned.
 // Iterator must be closed by caller.
 // To iterate over entire domain, use PrefixScan(nil, nil)
 //
@@ -145,7 +145,7 @@ func (i MultiKeyIndex) PrefixScan(store types.KVStore, startI, endI any) (Iterat
 }
 
 // ReversePrefixScan returns an Iterator over a domain of keys in descending order. End is exclusive.
-// Start is an MultiKeyIndex key or prefix. It must be less than end, or the Iterator is invalid and error is returned.
+// Start is a MultiKeyIndex key or prefix. It must be less than end, or the Iterator is invalid and error is returned.
 // Iterator must be closed by caller.
 // To iterate over entire domain, use PrefixScan(nil, nil)
 //
diff --git a/x/nft/internal/conv/string_test.go b/x/nft/internal/conv/string_test.go
@@ -25,7 +25,9 @@ func (s *StringSuite) TestUnsafeStrToBytes() {
 	for i := 0; i < 5; i++ {
 		b := unsafeConvertStr()
 		runtime.GC()
-		<-time.NewTimer(2 * time.Millisecond).C
+		timer := time.NewTimer(2 * time.Millisecond)
+		<-timer.C
+		timer.Stop()
 		b2 := append(b, 'd')
 		s.Equal("abc", string(b))
 		s.Equal("abcd", string(b2))
@@ -42,7 +44,9 @@ func (s *StringSuite) TestUnsafeBytesToStr() {
 	for i := 0; i < 5; i++ {
 		str := unsafeConvertBytes()
 		runtime.GC()
-		<-time.NewTimer(2 * time.Millisecond).C
+		timer := time.NewTimer(2 * time.Millisecond)
+		<-timer.C
+		timer.Stop()
 		s.Equal("abc", str)
 	}
 }
diff --git a/x/upgrade/internal/conv/string_test.go b/x/upgrade/internal/conv/string_test.go
@@ -25,7 +25,9 @@ func (s *StringSuite) TestUnsafeStrToBytes() {
 	for i := 0; i < 5; i++ {
 		b := unsafeConvertStr()
 		runtime.GC()
-		<-time.NewTimer(2 * time.Millisecond).C
+		timer := time.NewTimer(2 * time.Millisecond)
+		<-timer.C
+		timer.Stop()
 		b2 := append(b, 'd')
 		s.Equal("abc", string(b))
 		s.Equal("abcd", string(b2))

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ func CreateContextWithErrorAndMode(err error, mode string) Context {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`-// Test the correct code is returned when`
	`23`	`+// Test the correct code is returned when broadcasting transactions with specific mempool errors`
`24`	`24`	`func TestBroadcastError(t *testing.T) {`
`25`	`25`	`errors := map[error]uint32{`
`26`	`26`	`mempool.ErrTxInCache: sdkerrors.ErrTxInMempoolCache.ABCICode(),`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func (ctx Context) GetFromAddress() sdk.AccAddress {`
`60`	`60`	`return ctx.FromAddress`
`61`	`61`	`}`
`62`	`62`
`63`		`-// GetFeePayerAddress returns the fee granter address from the context`
	`63`	`+// GetFeePayerAddress returns the fee payer address from the context`
`64`	`64`	`func (ctx Context) GetFeePayerAddress() sdk.AccAddress {`
`65`	`65`	`return ctx.FeePayer`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func (s *IntegrationTestSuite) SetupSuite() {`
`25`	`25`	`s.Require().NoError(err)`
`26`	`26`
`27`	`27`	`h, err := s.network.WaitForHeight(1)`
`28`		`- s.Require().NoError(err, "stalled at height %d", h)`
	`28`	`+ s.Require().NoError(err, "failed to reach height 1; got %d", h)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func (s *IntegrationTestSuite) TearDownSuite() {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ type CacheStack struct {`
`72`	`72`	`cacheStores []types.CacheKVStore`
`73`	`73`	`}`
`74`	`74`
`75`		`-// CurrentContext returns the top context of cached stack,`
	`75`	`+// CurrentStore returns the top context of cached stack,`
`76`	`76`	`// if the stack is empty, returns the initial context.`
`77`	`77`	`func (cs *CacheStack) CurrentStore() types.CacheKVStore {`
`78`	`78`	`l := len(cs.cacheStores)`