Defensive checks callbacks (#875)

* fix: super defensive checks. fixes #842 * use Keys() helper func --------- Co-authored-by: Jacob Gadikian <[email protected]>
quicksilver-zone · Dec 12, 2023 · fb10791 · fb10791
1 parent 570709f
commit fb10791
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/x/interchainquery/keeper/msg_server.go b/x/interchainquery/keeper/msg_server.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"sort"
 	"strings"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -63,15 +62,9 @@ func (k msgServer) SubmitQueryResponse(goCtx context.Context, msg *types.MsgSubm
 	noDelete := false
 	// execute registered callbacks.
 
-	keys := make([]string, 0)
-	for k := range k.callbacks {
-		keys = append(keys, k)
-	}
-
-	sort.Strings(keys)
 	callbackExecuted := false
 
-	for _, key := range keys {
+	for _, key := range utils.Keys[types.QueryCallbacks](k.callbacks) {
 		module := k.callbacks[key]
 		if module.Has(q.CallbackId) {
 			err := module.Call(ctx, q.CallbackId, msg.Result, q)

diff --git a/x/interchainstaking/keeper/callbacks.go b/x/interchainstaking/keeper/callbacks.go
@@ -51,6 +51,9 @@ func (k *Keeper) CallbackHandler() Callbacks {
 
 // Call calls callback handler.
 func (c Callbacks) Call(ctx sdk.Context, id string, args []byte, query icqtypes.Query) error {
+	if !c.Has(id) {
+		return fmt.Errorf("callback %s not found", id)
+	}
 	return c.callbacks[id](c.k, ctx, args, query)
 }
 

diff --git a/x/participationrewards/keeper/callbacks.go b/x/participationrewards/keeper/callbacks.go
@@ -49,6 +49,9 @@ func (k *Keeper) CallbackHandler() Callbacks {
 
 // Call calls callback handler.
 func (c Callbacks) Call(ctx sdk.Context, id string, args []byte, query icqtypes.Query) error {
+	if c.Has(id) {
+		return fmt.Errorf("callback %s not found", id)
+	}
 	return c.callbacks[id](ctx, c.k, args, query)
 }