Merge branch 'main' into carlos/08-wasm-docs-improvements

.github/CODEOWNERS

@@ -11,40 +11,40 @@
 
 # CODEOWNERS for the CODEOWNER file
 
-/.github/CODEOWNERS @colin-axner @AdityaSripal @crodriguezvega @damiannolan
+/.github/CODEOWNERS @colin-axner @AdityaSripal @crodriguezvega @damiannolan @chatton
 
 # CODEOWNERS for the core IBC module
 
-/modules/core/ @colin-axner @AdityaSripal @damiannolan
-/proto/ibc/core/ @colin-axner @AdityaSripal @damiannolan
+/modules/core/ @colin-axner @AdityaSripal @damiannolan @chatton
+/proto/ibc/core/ @colin-axner @AdityaSripal @damiannolan @chatton
 
 # CODEOWNERS for the light-clients
 
-/modules/light-clients/ @colin-axner @AdityaSripal @damiannolan
-/proto/ibc/lightclients/ @colin-axner @AdityaSripal @damiannolan
+/modules/light-clients/ @colin-axner @AdityaSripal @damiannolan @chatton
+/proto/ibc/lightclients/ @colin-axner @AdityaSripal @damiannolan @chatton
 
 # CODEOWNERS for 08-wasm light client module
 
 /modules/light-clients/08-wasm/ @colin-axner @AdityaSripal @damiannolan @charleenfei @chatton @DimitrisJim @srdtrk @crodriguezvega
 
 # CODEOWNERS for ICS 20
 
-/modules/apps/transfer/ @colin-axner @AdityaSripal @damiannolan
-/proto/ibc/applications/transfer/ @colin-axner @AdityaSripal @damiannolan
+/modules/apps/transfer/ @colin-axner @AdityaSripal @damiannolan @chatton
+/proto/ibc/applications/transfer/ @colin-axner @AdityaSripal @damiannolan @chatton
 
 # CODEOWNERS for interchain-accounts module
 
-/modules/apps/27-interchain-accounts/ @colin-axner @AdityaSripal @damiannolan
-/proto/ibc/applications/interchain_accounts/ @colin-axner @AdityaSripal @damiannolan
+/modules/apps/27-interchain-accounts/ @colin-axner @AdityaSripal @damiannolan @chatton
+/proto/ibc/applications/interchain_accounts/ @colin-axner @AdityaSripal @damiannolan @chatton
 
 # CODEOWNERS for fee module
 
-/modules/apps/29-fee/ @AdityaSripal @charleenfei @colin-axner @damiannolan 
-/proto/ibc/applications/fee/ @AdityaSripal @charleenfei @colin-axner @damiannolan
+/modules/apps/29-fee/ @AdityaSripal @charleenfei @colin-axner @damiannolan @chatton
+/proto/ibc/applications/fee/ @AdityaSripal @charleenfei @colin-axner @damiannolan @chatton
 
 # CODEOWNERS for callbacks middleware
 
-/modules/apps/callbacks/ @colin-axner @AdityaSripal @damiannolan @srdtrk
+/modules/apps/callbacks/ @colin-axner @AdityaSripal @damiannolan @srdtrk @chatton
 
 # CODEOWNERS for docs
 

modules/core/keeper/msg_server.go

@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"context"
+	"errors"
 
 	metrics "github.com/hashicorp/go-metrics"
 
@@ -815,10 +816,14 @@ func (k Keeper) ChannelUpgradeTry(goCtx context.Context, msg *channeltypes.MsgCh
 	if err != nil {
 		ctx.Logger().Error("channel upgrade try failed", "error", errorsmod.Wrap(err, "channel upgrade try failed"))
 		if channeltypes.IsUpgradeError(err) {
-			k.ChannelKeeper.WriteErrorReceipt(ctx, msg.PortId, msg.ChannelId, err.(*channeltypes.UpgradeError))
-			// NOTE: a FAILURE result is returned to the client and an error receipt is written to state.
-			// This signals to the relayer to begin the cancel upgrade handshake subprotocol.
-			return &channeltypes.MsgChannelUpgradeTryResponse{Result: channeltypes.FAILURE}, nil
+			// In case the error is a wrapped upgrade error, we need to extract the inner error else process as normal
+			var upgradeErr *channeltypes.UpgradeError
+			if errors.As(err, &upgradeErr) {
+				k.ChannelKeeper.WriteErrorReceipt(ctx, msg.PortId, msg.ChannelId, upgradeErr)
+				// NOTE: a FAILURE result is returned to the client and an error receipt is written to state.
+				// This signals to the relayer to begin the cancel upgrade handshake subprotocol.
+				return &channeltypes.MsgChannelUpgradeTryResponse{Result: channeltypes.FAILURE}, nil
+			}
 		}
 
 		// NOTE: an error is returned to baseapp and transaction state is not committed.