Merge branch 'main' into jim/5736-new-error-ack

cosmos · Feb 14, 2024 · 9a5c6dd · 9a5c6dd
2 parents 07f446f + 41e7bf1
commit 9a5c6dd
Show file tree

Hide file tree

Showing 17 changed files with 27 additions and 19 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -98,3 +98,11 @@ pull_request_rules:
       backport:
         branches:
           - release/v8.1.x
+  - name: backport patches to v8.2.x branch
+    conditions:
+      - base=main
+      - label=backport-to-v8.2.x
+    actions:
+      backport:
+        branches:
+          - release/v8.2.x
diff --git a/.github/workflows/callbacks.yml b/.github/workflows/callbacks.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           go-version: '1.21'
       - uses: actions/checkout@v4
-      - uses: golangci/golangci-lint-action@v3.7.1
+      - uses: golangci/golangci-lint-action@v4.0.0
         with:
           version: v1.54.2
           args: --timeout 5m

diff --git a/.github/workflows/golangci-feature.yml b/.github/workflows/golangci-feature.yml
@@ -25,7 +25,7 @@ jobs:
           go-version: '1.21'
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3.7.1
+        uses: golangci/golangci-lint-action@v4.0.0
         with:
           version: v1.54.2
           args: --timeout 10m
diff --git a/.github/workflows/golangci.yml b/.github/workflows/golangci.yml
@@ -20,7 +20,7 @@ jobs:
           go-version: '1.21'
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3.7.1
+        uses: golangci/golangci-lint-action@v4.0.0
         with:
           version: v1.54.2
           args: --timeout 10m
diff --git a/.github/workflows/spell-checker.yml b/.github/workflows/spell-checker.yml
@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: sobolevn/misspell-fixer-action@8842a5615f83fed75e8a87015e9300a54d049961
+      - uses: sobolevn/misspell-fixer-action@26173e641ba08255d0c9826b8a873f8b96f76932
       - uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/wasm-client.yml b/.github/workflows/wasm-client.yml
@@ -17,7 +17,7 @@ jobs:
         with:
           go-version: '1.21'
       - uses: actions/checkout@v4
-      - uses: golangci/golangci-lint-action@v3.7.1
+      - uses: golangci/golangci-lint-action@v4.0.0
         with:
           version: v1.54.2
           args: --timeout 10m

diff --git a/RELEASES.md b/RELEASES.md
@@ -19,7 +19,7 @@ When bumping the dependencies of [Cosmos SDK](https://github.com/cosmos/cosmos-s
 
 To summarize: **All our ibc-go releases allow chains to communicate successfully with any chain running any version of our code**. That is to say, we are still using IBC protocol specification v1.0.
 
-We ensure all major releases are supported by relayers ([hermes](https://github.com/informalsystems/ibc-rs), [rly](https://github.com/strangelove-ventures/relayer) and [ts-relayer](https://github.com/confio/ts-relayer) at the moment) which can relay between the new major release and older releases. We have no plans of upgrading to an IBC protocol specification v2.0, as this would be very disruptive to the ecosystem.
+We ensure all major releases are supported by relayers ([hermes](https://github.com/informalsystems/ibc-rs), [rly](https://github.com/cosmos/relayer) and [ts-relayer](https://github.com/confio/ts-relayer) at the moment) which can relay between the new major release and older releases. We have no plans of upgrading to an IBC protocol specification v2.0, as this would be very disruptive to the ecosystem.
 
 ## Release cycle
 

diff --git a/e2e/testsuite/grpc_query.go b/e2e/testsuite/grpc_query.go
@@ -412,7 +412,7 @@ func (s *E2ETestSuite) QueryGranterGrants(ctx context.Context, chain ibc.Chain,
 	return grants.Grants, nil
 }
 
-// QueryBalances returns all the balances on the given chain for the provided address.
+// QueryAllBalances returns all the balances on the given chain for the provided address.
 func (s *E2ETestSuite) QueryAllBalances(ctx context.Context, chain ibc.Chain, address string, resolveDenom bool) (sdk.Coins, error) {
 	queryClient := s.GetChainGRCPClients(chain).BankQueryClient
 	res, err := queryClient.AllBalances(ctx, &banktypes.QueryAllBalancesRequest{

diff --git a/modules/apps/27-interchain-accounts/host/ibc_module.go b/modules/apps/27-interchain-accounts/host/ibc_module.go
@@ -78,7 +78,7 @@ func (IBCModule) OnChanOpenAck(
 	return errorsmod.Wrap(icatypes.ErrInvalidChannelFlow, "channel handshake must be initiated by controller chain")
 }
 
-// OnChanOpenAck implements the IBCModule interface
+// OnChanOpenConfirm implements the IBCModule interface
 func (im IBCModule) OnChanOpenConfirm(
 	ctx sdk.Context,
 	portID,

diff --git a/modules/apps/29-fee/keeper/escrow.go b/modules/apps/29-fee/keeper/escrow.go
@@ -102,7 +102,7 @@ func (k Keeper) distributePacketFeeOnAcknowledgement(ctx sdk.Context, refundAddr
 	k.distributeFee(ctx, refundAddr, refundAddr, refundCoins)
 }
 
-// DistributePacketsFeesOnTimeout pays all the timeout fees for a given packetID while refunding the acknowledgement & receive fees to the refund account.
+// DistributePacketFeesOnTimeout pays all the timeout fees for a given packetID while refunding the acknowledgement & receive fees to the refund account.
 func (k Keeper) DistributePacketFeesOnTimeout(ctx sdk.Context, timeoutRelayer sdk.AccAddress, packetFees []types.PacketFee, packetID channeltypes.PacketId) {
 	// cache context before trying to distribute fees
 	// if the escrow account has insufficient balance then we want to avoid partially distributing fees

diff --git a/modules/apps/29-fee/types/keys.go b/modules/apps/29-fee/types/keys.go
@@ -26,7 +26,7 @@ const (
 
 	Version = "ics29-1"
 
-	// FeeEnabledPrefix is the key prefix for storing fee enabled flag
+	// FeeEnabledKeyPrefix is the key prefix for storing fee enabled flag
 	FeeEnabledKeyPrefix = "feeEnabled"
 
 	// PayeeKeyPrefix is the key prefix for the fee payee address stored in state

diff --git a/modules/apps/29-fee/types/msgs.go b/modules/apps/29-fee/types/msgs.go
@@ -131,7 +131,7 @@ func (msg MsgPayPacketFee) ValidateBasic() error {
 	return msg.Fee.Validate()
 }
 
-// NewMsgPayPacketAsync creates a new instance of MsgPayPacketFee
+// NewMsgPayPacketFeeAsync creates a new instance of MsgPayPacketFeeAsync
 func NewMsgPayPacketFeeAsync(packetID channeltypes.PacketId, packetFee PacketFee) *MsgPayPacketFeeAsync {
 	return &MsgPayPacketFeeAsync{
 		PacketId:  packetID,

diff --git a/modules/core/02-client/keeper/keeper.go b/modules/core/02-client/keeper/keeper.go
@@ -365,12 +365,12 @@ func (k Keeper) SetUpgradedConsensusState(ctx sdk.Context, planHeight int64, bz
 	return k.upgradeKeeper.SetUpgradedConsensusState(ctx, planHeight, bz)
 }
 
-// IterateClientStates provides an iterator over all stored light client State
-// objects. For each State object, cb will be called. If the cb returns true,
+// IterateClientStates provides an iterator over all stored ibc ClientState
+// objects using the provided store prefix. For each ClientState object, cb will be called. If the cb returns true,
 // the iterator will close and stop.
-func (k Keeper) IterateClientStates(ctx sdk.Context, storeprefix []byte, cb func(clientID string, cs exported.ClientState) bool) {
+func (k Keeper) IterateClientStates(ctx sdk.Context, storePrefix []byte, cb func(clientID string, cs exported.ClientState) bool) {
 	store := ctx.KVStore(k.storeKey)
-	iterator := storetypes.KVStorePrefixIterator(store, host.PrefixedClientStoreKey(storeprefix))
+	iterator := storetypes.KVStorePrefixIterator(store, host.PrefixedClientStoreKey(storePrefix))
 
 	defer sdk.LogDeferred(ctx.Logger(), func() error { return iterator.Close() })
 	for ; iterator.Valid(); iterator.Next() {

diff --git a/modules/light-clients/08-wasm/testing/mock_engine.go b/modules/light-clients/08-wasm/testing/mock_engine.go
@@ -140,7 +140,7 @@ func (m *MockWasmEngine) StoreCode(code wasmvm.WasmCode) (wasmvm.Checksum, error
 	return m.StoreCodeFn(code)
 }
 
-// StoreCode implements the WasmEngine interface.
+// StoreCodeUnchecked implements the WasmEngine interface.
 func (m *MockWasmEngine) StoreCodeUnchecked(code wasmvm.WasmCode) (wasmvm.Checksum, error) {
 	if m.StoreCodeUncheckedFn == nil {
 		panic(errors.New("mock engine is not properly initialized: StoreCodeUncheckedFn is nil"))

diff --git a/modules/light-clients/08-wasm/types/contract_api.go b/modules/light-clients/08-wasm/types/contract_api.go
@@ -95,7 +95,7 @@ type VerifyUpgradeAndUpdateStateMsg struct {
 	ProofUpgradeConsensusState []byte `json:"proof_upgrade_consensus_state"`
 }
 
-// MigrateClientStore is a sudoMsg sent to the contract to verify a given substitute client and update to its state.
+// MigrateClientStoreMsg is a sudoMsg sent to the contract to verify a given substitute client and update to its state.
 type MigrateClientStoreMsg struct{}
 
 // ContractResult is a type constraint that defines the expected results that can be returned by a contract call/query.

diff --git a/modules/light-clients/08-wasm/types/msgs.go b/modules/light-clients/08-wasm/types/msgs.go
@@ -17,7 +17,7 @@ var (
 	_ sdk.HasValidateBasic = (*MsgRemoveChecksum)(nil)
 )
 
-// MsgStoreCode creates a new MsgStoreCode instance
+// NewMsgStoreCode creates a new MsgStoreCode instance
 func NewMsgStoreCode(signer string, code []byte) *MsgStoreCode {
 	return &MsgStoreCode{
 		Signer:       signer,

diff --git a/testing/solomachine.go b/testing/solomachine.go
@@ -439,7 +439,7 @@ func (solo *Solomachine) TimeoutPacket(chain *TestChain, packet channeltypes.Pac
 	require.NotNil(solo.t, res)
 }
 
-// TimeoutPacket creates a channel closed and unreceived packet proof and broadcasts a MsgTimeoutOnClose.
+// TimeoutPacketOnClose creates a channel closed and unreceived packet proof and broadcasts a MsgTimeoutOnClose.
 func (solo *Solomachine) TimeoutPacketOnClose(chain *TestChain, packet channeltypes.Packet, channelID string) {
 	closedProof := solo.GenerateChanClosedProof(transfertypes.PortID, transfertypes.Version, channelID)
 	unreceivedProof := solo.GenerateReceiptAbsenceProof(packet)