refactor: generalize implementation

Author: johnletey

api/v2/dollar.pulsar.go

@@ -10,6 +10,8 @@ deps:
   - buf.build/googleapis/googleapis:cc916c31859748a68fd229a3c8d7a2e8
 lint:
   except:
+    - ENUM_VALUE_PREFIX
+    - ENUM_ZERO_VALUE_SUFFIX
     - SERVICE_SUFFIX
     - RPC_REQUEST_STANDARD_NAME
     - RPC_RESPONSE_STANDARD_NAME

api/v2/events.pulsar.go

@@ -74,7 +74,7 @@ func QueryStats() *cobra.Command {
 func QueryYieldRecipients() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "yield-recipients",
-		Short: "Query all yield recipients for IBC channels",
+		Short: "Query all yield recipients for external chains",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
@@ -96,14 +96,19 @@ func QueryYieldRecipients() *cobra.Command {
 
 func QueryYieldRecipient() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "yield-recipient [channel-id]",
-		Short: "Query the yield recipient for an IBC channel",
-		Args:  cobra.ExactArgs(1),
+		Use:   "yield-recipient [provider] [identifier]",
+		Short: "Query the yield recipient for an external chain",
+		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
 			queryClient := v2.NewQueryClient(clientCtx)
 
-			res, err := queryClient.YieldRecipient(context.Background(), &v2.QueryYieldRecipient{ChannelId: args[0]})
+			provider := v2.Provider(v2.Provider_value[args[0]])
+
+			res, err := queryClient.YieldRecipient(context.Background(), &v2.QueryYieldRecipient{
+				Provider:   provider,
+				Identifier: args[1],
+			})
 			if err != nil {
 				return err
 			}

api/v2/genesis.pulsar.go

@@ -48,19 +48,22 @@ func GetTxCmd() *cobra.Command {
 
 func TxSetYieldRecipient() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "set-yield-recipient [channel-id] [yield-recipient]",
-		Short: "Set the yield recipient for an IBC channel",
-		Args:  cobra.ExactArgs(2),
+		Use:   "set-yield-recipient [provider] [identifier] [recipient]",
+		Short: "Set the yield recipient for an external chain",
+		Args:  cobra.ExactArgs(3),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
 			}
 
+			provider := v2.Provider(v2.Provider_value[args[0]])
+
 			msg := &v2.MsgSetYieldRecipient{
-				Signer:         clientCtx.GetFromAddress().String(),
-				ChannelId:      args[0],
-				YieldRecipient: args[1],
+				Signer:     clientCtx.GetFromAddress().String(),
+				Provider:   provider,
+				Identifier: args[1],
+				Recipient:  args[2],
 			}
 
 			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)

api/v2/query.pulsar.go

@@ -24,6 +24,7 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
+	"fmt"
 	"testing"
 
 	"cosmossdk.io/math"
@@ -117,12 +118,13 @@ func TestIBCYieldDistribution(t *testing.T) {
 	// TODO: Once NobleICS4Wrapper has been migrated, ensure that transfers are blocked at first!
 
 	// ACT: Set the yield recipient for the external chain.
-	_, err = validator.ExecTx(ctx, authority.KeyName(), "dollar", "set-yield-recipient", channelID, yieldRecipient)
+	_, err = validator.ExecTx(ctx, authority.KeyName(), "dollar", "set-yield-recipient", "IBC", channelID, yieldRecipient)
 	require.NoError(t, err)
 
 	// ASSERT: There is one yield recipient.
 	yieldRecipients = getYieldRecipients(t, ctx, validator)
-	require.Equal(t, yieldRecipient, yieldRecipients[channelID])
+	key := fmt.Sprintf("%s/%s", dollartypes.Provider_IBC, channelID)
+	require.Equal(t, yieldRecipient, yieldRecipients[key])
 
 	// ACT: Send 500,000 $USDN from the user on Noble to the external chain.
 	_, err = chain.SendIBCTransfer(ctx, channelID, user.KeyName(), ibc.WalletAmount{

api/v2/tx.pulsar.go

@@ -23,6 +23,7 @@ package dollar
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"cosmossdk.io/collections"
 	"cosmossdk.io/core/address"
@@ -70,10 +71,15 @@ func InitGenesis(ctx context.Context, k *keeper.Keeper, address address.Codec, g
 		panic(errors.Wrap(err, "unable to set genesis stats"))
 	}
 
-	for channelId, yieldRecipient := range genesis.YieldRecipients {
-		err = k.YieldRecipients.Set(ctx, channelId, yieldRecipient)
+	for key, recipient := range genesis.YieldRecipients {
+		splitKey := strings.Split(key, "/")
+		provider := types.Provider(types.Provider_value[splitKey[0]])
+		identifier := splitKey[1]
+
+		key := collections.Join(int32(provider), identifier)
+		err = k.YieldRecipients.Set(ctx, key, recipient)
 		if err != nil {
-			panic(errors.Wrapf(err, "unable to set genesis yield recipient (%s:%s)", channelId, yieldRecipient))
+			panic(errors.Wrapf(err, "unable to set genesis yield recipient (%s/%s:%s)", provider, identifier, recipient))
 		}
 	}