Skip to content
Merged
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
23 changes: 14 additions & 9 deletions cmd/opinitd/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,23 +97,28 @@ func txGrantOracleCmd(baseCtx *cmdContext) *cobra.Command {
fmt.Println("MsgUpdateOracle authz grant already exists, skipping")
}

if !hasAuthzGrant(existingGrants, types.MsgRelayOracleTypeUrl) {
grantRelayMsg, err := authz.NewMsgGrant(account.GetAddress(), oracleAddress, authz.NewGenericAuthorization(types.MsgRelayOracleTypeUrl), nil)
if err != nil {
return err
if cfg.OracleRelay.Enable {
if !hasAuthzGrant(existingGrants, types.MsgRelayOracleTypeUrl) {
grantRelayMsg, err := authz.NewMsgGrant(account.GetAddress(), oracleAddress, authz.NewGenericAuthorization(types.MsgRelayOracleTypeUrl), nil)
if err != nil {
return err
}
msgs = append(msgs, grantRelayMsg)
fmt.Println("Adding authz grant for MsgRelayOracleData")
} else {
fmt.Println("MsgRelayOracleData authz grant already exists, skipping")
}
msgs = append(msgs, grantRelayMsg)
fmt.Println("Adding authz grant for MsgRelayOracleData")
} else {
fmt.Println("MsgRelayOracleData authz grant already exists, skipping")
}

existingAllowance, err := queryFeegrant(baseCtx, cfg, account.GetAddressString(), oracleAddress.String())
if err != nil {
return errors.Wrap(err, "failed to query feegrant")
}

requiredMsgTypes := []string{types.MsgRelayOracleTypeUrl, types.MsgUpdateOracleTypeUrl, types.MsgAuthzExecTypeUrl, types.MsgUpdateClientTypeUrl}
requiredMsgTypes := []string{types.MsgUpdateOracleTypeUrl, types.MsgAuthzExecTypeUrl}
if cfg.OracleRelay.Enable {
requiredMsgTypes = append(requiredMsgTypes, types.MsgRelayOracleTypeUrl, types.MsgUpdateClientTypeUrl)
}

if existingAllowance != nil {
hasAllTypes, err := hasAllMsgTypes(existingAllowance, requiredMsgTypes)
Expand Down
Loading