Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: added back authz message handler in worker #121

Merged
merged 3 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,12 @@ pull_request_rules:
commit_message_template: >
{{ title }} (#{{ number }})

{{ body }}
{{ body }}
- name: backport patches to v0.47.x branch
conditions:
- base=cosmos/v0.50.x
- label=backport/v0.47.x
actions:
backport:
branches:
- cosmos/v0.47.x
5 changes: 1 addition & 4 deletions modules/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ import (
"encoding/json"
"strings"

"github.com/cosmos/cosmos-sdk/x/authz"

tmctypes "github.com/cometbft/cometbft/rpc/core/types"
tmtypes "github.com/cometbft/cometbft/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/go-co-op/gocron"

"github.com/forbole/juno/v6/types"
Expand Down Expand Up @@ -106,5 +103,5 @@ type AuthzMessageModule interface {
// are passed as well.
// NOTE. The returned error will be logged using the MsgError method. All other modules' handlers
// will still be called.
HandleMsgExec(index int, msgExec *authz.MsgExec, authzMsgIndex int, executedMsg sdk.Msg, tx *types.Transaction) error
HandleMsgExec(index int, authzMsgIndex int, executedMsg types.Message, tx *types.Transaction) error
}
1 change: 1 addition & 0 deletions node/builder/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"

"github.com/forbole/juno/v6/node"
nodeconfig "github.com/forbole/juno/v6/node/config"
"github.com/forbole/juno/v6/node/local"
Expand Down
29 changes: 29 additions & 0 deletions parser/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,35 @@ func (w Worker) handleMessage(index int, msg types.Message, tx *types.Transactio
w.logger.MsgError(module, tx, msg, err)
}
}

// If it's a MsgExecute, we need to make sure the included messages are handled as well
if msg.GetType() == "/cosmos.authz.v1beta1.MsgExec" {
var msgExec struct {
Msgs []json.RawMessage `json:"msgs"`
}

err := json.Unmarshal(msg.GetBytes(), &msgExec)
if err != nil {
w.logger.Error("unable to unmarshal MsgExec inner messages", "error", err)
return
}

for authzIndex, msgAny := range msgExec.Msgs {
executedMsg, err := types.UnmarshalMessage(authzIndex, msgAny)
if err != nil {
w.logger.Error("unable to unpack MsgExec inner message", "index", authzIndex, "error", err)
}

for _, module := range w.modules {
if messageModule, ok := module.(modules.AuthzMessageModule); ok {
err = messageModule.HandleMsgExec(index, authzIndex, executedMsg, tx)
if err != nil {
w.logger.MsgError(module, tx, executedMsg, err)
}
}
}
}
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion types/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ package config
import (
"strings"

"gopkg.in/yaml.v3"

databaseconfig "github.com/forbole/juno/v6/database/config"
loggingconfig "github.com/forbole/juno/v6/logging/config"
nodeconfig "github.com/forbole/juno/v6/node/config"
parserconfig "github.com/forbole/juno/v6/parser/config"
"gopkg.in/yaml.v3"
)

var (
Expand Down
Loading