Skip to content

Commit b2fb290

Browse files
authored
fix: avoid adding MsgOracleRealyTypeUrl before config enabled (#126)
* fix: avoid adding MsgOracleRealyTypeUrl before config enabled * fix
1 parent 71b69dc commit b2fb290

1 file changed

Lines changed: 14 additions & 9 deletions

File tree

cmd/opinitd/tx.go

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,23 +97,28 @@ func txGrantOracleCmd(baseCtx *cmdContext) *cobra.Command {
9797
fmt.Println("MsgUpdateOracle authz grant already exists, skipping")
9898
}
9999

100-
if !hasAuthzGrant(existingGrants, types.MsgRelayOracleTypeUrl) {
101-
grantRelayMsg, err := authz.NewMsgGrant(account.GetAddress(), oracleAddress, authz.NewGenericAuthorization(types.MsgRelayOracleTypeUrl), nil)
102-
if err != nil {
103-
return err
100+
if cfg.OracleRelay.Enable {
101+
if !hasAuthzGrant(existingGrants, types.MsgRelayOracleTypeUrl) {
102+
grantRelayMsg, err := authz.NewMsgGrant(account.GetAddress(), oracleAddress, authz.NewGenericAuthorization(types.MsgRelayOracleTypeUrl), nil)
103+
if err != nil {
104+
return err
105+
}
106+
msgs = append(msgs, grantRelayMsg)
107+
fmt.Println("Adding authz grant for MsgRelayOracleData")
108+
} else {
109+
fmt.Println("MsgRelayOracleData authz grant already exists, skipping")
104110
}
105-
msgs = append(msgs, grantRelayMsg)
106-
fmt.Println("Adding authz grant for MsgRelayOracleData")
107-
} else {
108-
fmt.Println("MsgRelayOracleData authz grant already exists, skipping")
109111
}
110112

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

116-
requiredMsgTypes := []string{types.MsgRelayOracleTypeUrl, types.MsgUpdateOracleTypeUrl, types.MsgAuthzExecTypeUrl, types.MsgUpdateClientTypeUrl}
118+
requiredMsgTypes := []string{types.MsgUpdateOracleTypeUrl, types.MsgAuthzExecTypeUrl}
119+
if cfg.OracleRelay.Enable {
120+
requiredMsgTypes = append(requiredMsgTypes, types.MsgRelayOracleTypeUrl, types.MsgUpdateClientTypeUrl)
121+
}
117122

118123
if existingAllowance != nil {
119124
hasAllTypes, err := hasAllMsgTypes(existingAllowance, requiredMsgTypes)

0 commit comments

Comments
 (0)