chore(statemachine)!: write channel state before invoking app callbac…

…ks in ack and confirm channel handshake steps (#2973)

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
(cherry picked from commit a6d251e)

# Conflicts:
#	modules/core/keeper/msg_server.go

modules/core/keeper/msg_server.go

@@ -266,13 +266,20 @@ func (k Keeper) ChannelOpenAck(goCtx context.Context, msg *channeltypes.MsgChann
 		return nil, sdkerrors.Wrap(err, "channel handshake open ack failed")
 	}
 
+	// Write channel into state
+	k.ChannelKeeper.WriteOpenAckChannel(ctx, msg.PortId, msg.ChannelId, msg.CounterpartyVersion, msg.CounterpartyChannelId)
+
 	// Perform application logic callback
 	if err = cbs.OnChanOpenAck(ctx, msg.PortId, msg.ChannelId, msg.CounterpartyChannelId, msg.CounterpartyVersion); err != nil {
 		return nil, sdkerrors.Wrap(err, "channel open ack callback failed")
 	}
 
+<<<<<<< HEAD
 	// Write channel into state
 	k.ChannelKeeper.WriteOpenAckChannel(ctx, msg.PortId, msg.ChannelId, msg.CounterpartyVersion, msg.CounterpartyChannelId)
+=======
+	ctx.Logger().Info("channel open ack callback succeeded", "channel-id", msg.ChannelId, "port-id", msg.PortId)
+>>>>>>> a6d251e (chore(statemachine)!: write channel state before invoking app callbacks in ack and confirm channel handshake steps (#2973))
 
 	return &channeltypes.MsgChannelOpenAckResponse{}, nil
 }
@@ -300,13 +307,20 @@ func (k Keeper) ChannelOpenConfirm(goCtx context.Context, msg *channeltypes.MsgC
 		return nil, sdkerrors.Wrap(err, "channel handshake open confirm failed")
 	}
 
+	// Write channel into state
+	k.ChannelKeeper.WriteOpenConfirmChannel(ctx, msg.PortId, msg.ChannelId)
+
 	// Perform application logic callback
 	if err = cbs.OnChanOpenConfirm(ctx, msg.PortId, msg.ChannelId); err != nil {
 		return nil, sdkerrors.Wrap(err, "channel open confirm callback failed")
 	}
 
+<<<<<<< HEAD
 	// Write channel into state
 	k.ChannelKeeper.WriteOpenConfirmChannel(ctx, msg.PortId, msg.ChannelId)
+=======
+	ctx.Logger().Info("channel open confirm callback succeeded", "channel-id", msg.ChannelId, "port-id", msg.PortId)
+>>>>>>> a6d251e (chore(statemachine)!: write channel state before invoking app callbacks in ack and confirm channel handshake steps (#2973))
 
 	return &channeltypes.MsgChannelOpenConfirmResponse{}, nil
 }