fix: Use gmp module account as relayer address in handler (#344)

app/gmpmiddleware/handler.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	"github.com/ojo-network/ojo/x/gmp/types"
 )
 
@@ -19,6 +20,8 @@ type GmpHandler struct {
 	gmp GmpKeeper
 }
 
+var relayer = authtypes.NewModuleAddress(types.ModuleName).String()
+
 func NewGmpHandler(k GmpKeeper) *GmpHandler {
 	return &GmpHandler{
 		gmp: k,
@@ -52,8 +55,9 @@ func (h GmpHandler) HandleGeneralMessage(
 	if err != nil {
 		return err
 	}
+	ctx.Logger().Info("HandleGeneralMessage GMP Decoder", "msg", msg)
 	tx := &types.MsgRelayPrice{
-		Relayer:               srcAddress,
+		Relayer:               relayer,
 		DestinationChain:      srcChain,
 		ClientContractAddress: msg.ContractAddress.Hex(),
 		OjoContractAddress:    srcAddress,
@@ -66,7 +70,7 @@ func (h GmpHandler) HandleGeneralMessage(
 	if err != nil {
 		return err
 	}
-
+	ctx.Logger().Info("HandleGeneralMessage GMP Decoder", "tx", tx)
 	_, err = h.gmp.RelayPrice(ctx, tx)
 	return err
 }
@@ -99,8 +103,9 @@ func (h GmpHandler) HandleGeneralMessageWithToken(
 	if err != nil {
 		return err
 	}
+	ctx.Logger().Info("HandleGeneralMessageWithToken GMP Decoder", "msg", msg)
 	tx := &types.MsgRelayPrice{
-		Relayer:               srcAddress,
+		Relayer:               relayer,
 		DestinationChain:      srcChain,
 		ClientContractAddress: msg.ContractAddress.Hex(),
 		OjoContractAddress:    srcAddress,
@@ -114,6 +119,7 @@ func (h GmpHandler) HandleGeneralMessageWithToken(
 	if err != nil {
 		return err
 	}
+	ctx.Logger().Info("HandleGeneralMessage GMP Decoder", "tx", tx)
 	_, err = h.gmp.RelayPrice(ctx, tx)
 	return err
 }

app/upgrades.go

@@ -39,6 +39,7 @@ func (app App) RegisterUpgradeHandlers() {
 	app.registerUpgrade0_3_0Rc3(upgradeInfo)
 	app.registerUpgrade0_3_0Rc4(upgradeInfo)
 	app.registerUpgrade0_3_0Rc5(upgradeInfo)
+	app.registerUpgrade0_3_0Rc6(upgradeInfo)
 }
 
 // performs upgrade from v0.1.3 to v0.1.4
@@ -194,6 +195,16 @@ func (app *App) registerUpgrade0_3_0Rc5(_ upgradetypes.Plan) {
 	)
 }
 
+func (app *App) registerUpgrade0_3_0Rc6(_ upgradetypes.Plan) {
+	const planName = "v0.3.0-rc6"
+	app.UpgradeKeeper.SetUpgradeHandler(planName,
+		func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+			ctx.Logger().Info("Upgrade handler execution", "name", planName)
+			return app.mm.RunMigrations(ctx, app.configurator, fromVM)
+		},
+	)
+}
+
 // helper function to check if the store loader should be upgraded
 func (app *App) storeUpgrade(planName string, ui upgradetypes.Plan, stores storetypes.StoreUpgrades) {
 	if ui.Name == planName && !app.UpgradeKeeper.IsSkipHeight(ui.Height) {