Fixes (#519)

* debug * fix: ensure we choose the correct transfer channel; it must be open * dont attempt to handle rewards if no withdraw account exists yet * remove debug lines * formatting --------- Co-authored-by: Ajaz Ahmed Ansari <[email protected]>
quicksilver-zone · Aug 2, 2023 · 68e3ac7 · 68e3ac7
1 parent 204ea95
commit 68e3ac7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/x/interchainstaking/keeper/ibc_packet_handlers.go b/x/interchainstaking/keeper/ibc_packet_handlers.go
@@ -22,12 +22,11 @@ import (
 	clienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types"
 	channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types"
 	"github.com/golang/protobuf/proto" //nolint:staticcheck
-	lsmstakingtypes "github.com/iqlusioninc/liquidity-staking-module/x/staking/types"
-
 	"github.com/ingenuity-build/quicksilver/utils"
 	"github.com/ingenuity-build/quicksilver/utils/addressutils"
 	queryTypes "github.com/ingenuity-build/quicksilver/x/interchainquery/types"
 	"github.com/ingenuity-build/quicksilver/x/interchainstaking/types"
+	lsmstakingtypes "github.com/iqlusioninc/liquidity-staking-module/x/staking/types"
 )
 
 type TypedMsg struct {
@@ -320,7 +319,7 @@ func (k *Keeper) HandleMsgTransfer(ctx sdk.Context, msg sdk.Msg) error {
 
 	var channel *channeltypes.IdentifiedChannel
 	k.IBCKeeper.ChannelKeeper.IterateChannels(ctx, func(ic channeltypes.IdentifiedChannel) bool {
-		if ic.Counterparty.ChannelId == sMsg.SourceChannel && ic.Counterparty.PortId == sMsg.SourcePort && len(ic.ConnectionHops) == 1 && ic.ConnectionHops[0] == zone.ConnectionId {
+		if ic.Counterparty.ChannelId == sMsg.SourceChannel && ic.Counterparty.PortId == sMsg.SourcePort && len(ic.ConnectionHops) == 1 && ic.ConnectionHops[0] == zone.ConnectionId && ic.State == channeltypes.OPEN {
 			channel = &ic
 			return true
 		}

diff --git a/x/participationrewards/keeper/rewards_holdings.go b/x/participationrewards/keeper/rewards_holdings.go
@@ -33,10 +33,12 @@ func (k Keeper) AllocateHoldingsRewards(ctx sdk.Context) error {
 			}
 		}
 
-		if err := k.DistributeToUsersFromAddress(ctx, icsRewardsAllocations, zone.WithdrawalAddress.Address); err != nil {
-			k.Logger(ctx).Error("failed to distribute to users", "ua", userAllocations, "err", err)
-			// we might want to do a soft fail here so that all zones are not affected...
-			return false
+		if zone.WithdrawalAddress != nil {
+			if err := k.DistributeToUsersFromAddress(ctx, icsRewardsAllocations, zone.WithdrawalAddress.Address); err != nil {
+				k.Logger(ctx).Error("failed to distribute to users", "ua", userAllocations, "err", err)
+				// we might want to do a soft fail here so that all zones are not affected...
+				return false
+			}
 		}
 
 		k.ClaimsManagerKeeper.ArchiveAndGarbageCollectClaims(ctx, zone.ChainId)