support mapped accounts in claims

x/participationrewards/keeper/submodule_liquid.go

@@ -2,6 +2,7 @@
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 
 	"cosmossdk.io/math"
@@ -46,7 +47,16 @@
 		// or if the denom found is not valid.
 		denom, err := utils.DenomFromRequestKey(proof.Key, addr)
 		if err != nil {
-			return sdk.ZeroInt(), err
+			// check for mapped address for this user from SrcZone.
+			mappedAddr, found := k.icsKeeper.GetLocalAddressMap(ctx, addr, msg.SrcZone)
+			if found {
+				denom, err = utils.DenomFromRequestKey(proof.Key, mappedAddr)
+				if err != nil {
+					return sdk.ZeroInt(), errors.New("not a valid proof for submitting user or mapped account")
+				}
+			} else {
+				return sdk.ZeroInt(), errors.New("not a valid proof for submitting user")
+			}
 		}
 
 		data, found := k.GetProtocolData(ctx, types.ProtocolDataTypeLiquidToken, fmt.Sprintf("%s_%s", msg.SrcZone, denom))

x/participationrewards/keeper/submodule_osmosis.go

@@ -1,6 +1,7 @@
 package keeper
 
 import (
+	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -13,10 +14,11 @@
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/bech32"
 	"github.com/cosmos/cosmos-sdk/x/bank/keeper"
-	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
 	osmosistypes "github.com/quicksilver-zone/quicksilver/third-party-chains/osmosis-types"
 	osmolockup "github.com/quicksilver-zone/quicksilver/third-party-chains/osmosis-types/lockup"
+	"github.com/quicksilver-zone/quicksilver/utils"
+	"github.com/quicksilver-zone/quicksilver/utils/addressutils"
 	"github.com/quicksilver-zone/quicksilver/x/participationrewards/types"
 )
 
@@ -76,12 +78,28 @@
 func (*OsmosisModule) ValidateClaim(ctx sdk.Context, k *Keeper, msg *types.MsgSubmitClaim) (math.Int, error) {
 	amount := sdk.ZeroInt()
 	var lock osmolockup.PeriodLock
+
+	addr, err := addressutils.AccAddressFromBech32(msg.UserAddress, "")
+	if err != nil {
+		return sdk.ZeroInt(), err
+	}
+
 	for _, proof := range msg.Proofs {
 		if proof.ProofType == types.ProofTypeBank {
-			addr, poolDenom, err := banktypes.AddressAndDenomFromBalancesStore(proof.Key[1:])
+			poolDenom, err := utils.DenomFromRequestKey(proof.Key, addr)
 			if err != nil {
-				return sdk.ZeroInt(), err
+				// check for mapped address for this user from SrcZone.
+				mappedAddr, found := k.icsKeeper.GetLocalAddressMap(ctx, addr, msg.SrcZone)
+				if found {
+					poolDenom, err = utils.DenomFromRequestKey(proof.Key, mappedAddr)
+					if err != nil {
+						return sdk.ZeroInt(), errors.New("not a valid proof for submitting user or mapped account")
+					}
+				} else {
+					return sdk.ZeroInt(), errors.New("not a valid proof for submitting user")
+				}
 			}
+
 			coin, err := keeper.UnmarshalBalanceCompat(k.cdc, proof.Data, poolDenom)
 			if err != nil {
 				return sdk.ZeroInt(), err
@@ -103,8 +121,11 @@
 				return sdk.ZeroInt(), err
 			}
 
-			if sdk.AccAddress(lockupOwner).String() != msg.UserAddress {
-				return sdk.ZeroInt(), errors.New("not a valid proof for submitting user")
+			if !bytes.Equal(lockupOwner, addr) {
+				mappedAddr, found := k.icsKeeper.GetLocalAddressMap(ctx, addr, msg.SrcZone)
+				if !found || !bytes.Equal(lockupOwner, mappedAddr) {
+					return sdk.ZeroInt(), errors.New("not a valid proof for submitting user or mapped account")
+				}
 			}
 		}
 		sdkAmount, err := osmosistypes.DetermineApplicableTokensInPool(ctx, k, lock, msg.Zone)

x/participationrewards/keeper/submodule_osmosiscl.go

@@ -1,6 +1,7 @@
 package keeper
 
 import (
+	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -13,6 +14,7 @@
 	osmosistypes "github.com/quicksilver-zone/quicksilver/third-party-chains/osmosis-types"
 	osmocl "github.com/quicksilver-zone/quicksilver/third-party-chains/osmosis-types/concentrated-liquidity"
 	osmoclmodel "github.com/quicksilver-zone/quicksilver/third-party-chains/osmosis-types/concentrated-liquidity/model"
+	"github.com/quicksilver-zone/quicksilver/utils/addressutils"
 	"github.com/quicksilver-zone/quicksilver/x/participationrewards/types"
 )
 
@@ -72,6 +74,12 @@
 func (*OsmosisClModule) ValidateClaim(ctx sdk.Context, k *Keeper, msg *types.MsgSubmitClaim) (math.Int, error) {
 	claimAmount := math.ZeroInt()
 	var position osmoclmodel.Position
+
+	addr, err := addressutils.AccAddressFromBech32(msg.UserAddress, "")
+	if err != nil {
+		return math.ZeroInt(), err
+	}
+
 	for _, proof := range msg.Proofs {
 		position = osmoclmodel.Position{}
 		err := k.cdc.Unmarshal(proof.Data, &position)
@@ -84,8 +92,11 @@
 			return math.ZeroInt(), err
 		}
 
-		if sdk.AccAddress(lockupOwner).String() != msg.UserAddress {
-			return math.ZeroInt(), errors.New("not a valid proof for submitting user")
+		if !bytes.Equal(lockupOwner, addr) {
+			mappedAddr, found := k.icsKeeper.GetLocalAddressMap(ctx, addr, msg.SrcZone)
+			if !found || !bytes.Equal(lockupOwner, mappedAddr) {
+				return math.ZeroInt(), errors.New("not a valid proof for submitting user or mapped account")
+			}
 		}
 
 		sdkAmount, err := osmosistypes.DetermineApplicableTokensInClPool(ctx, k, position, msg.Zone)

x/participationrewards/keeper/submodule_umee.go

@@ -2,19 +2,20 @@
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 
 	"cosmossdk.io/math"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/bech32"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 
 	umee "github.com/quicksilver-zone/quicksilver/third-party-chains/umee-types"
 	leveragetypes "github.com/quicksilver-zone/quicksilver/third-party-chains/umee-types/leverage/types"
 	"github.com/quicksilver-zone/quicksilver/utils"
+	"github.com/quicksilver-zone/quicksilver/utils/addressutils"
 	cmtypes "github.com/quicksilver-zone/quicksilver/x/claimsmanager/types"
 	icstypes "github.com/quicksilver-zone/quicksilver/x/interchainstaking/types"
 	"github.com/quicksilver-zone/quicksilver/x/participationrewards/types"
@@ -185,7 +186,10 @@
 		return sdk.ZeroInt(), fmt.Errorf("unable to find registered zone for chain id: %s", msg.Zone)
 	}
 
-	_, addr, err := bech32.DecodeAndConvert(msg.UserAddress)
+	addr, err := addressutils.AccAddressFromBech32(msg.UserAddress, "")
+	if err != nil {
+		return sdk.ZeroInt(), err
+	}
 
 	amount := sdk.ZeroInt()
 	for _, proof := range msg.Proofs {
@@ -196,7 +200,15 @@
 
 		udenom, err := getDenomFromProof(proof, addr)
 		if err != nil {
-			return sdk.ZeroInt(), err
+			mappedAddr, found := k.icsKeeper.GetLocalAddressMap(ctx, addr, msg.SrcZone)
+			if found {
+				udenom, err = getDenomFromProof(proof, mappedAddr)
+				if err != nil {
+					return sdk.ZeroInt(), errors.New("not a valid proof for submitting user or mapped account")
+				}
+			} else {
+				return sdk.ZeroInt(), errors.New("not a valid proof for submitting user")
+			}
 		}
 
 		denom := leveragetypes.ToTokenDenom(udenom)

x/participationrewards/types/expected_keepers.go

@@ -76,4 +76,5 @@ type InterchainStakingKeeper interface {
 	IterateDelegatorIntents(ctx sdk.Context, zone *interchainstakingtypes.Zone, snapshot bool, fn func(index int64, intent interchainstakingtypes.DelegatorIntent) (stop bool))
 	GetValidators(ctx sdk.Context, chainID string) []interchainstakingtypes.Validator
 	SetValidator(ctx sdk.Context, chainID string, val interchainstakingtypes.Validator) error
+	GetLocalAddressMap(ctx sdk.Context, remoteAddress sdk.AccAddress, chainID string) (sdk.AccAddress, bool)
 }