Add claim rewards ica

x/stakeibc/keeper/hooks.go

@@ -45,6 +45,9 @@ func (k Keeper) BeforeEpochStart(ctx sdk.Context, epochInfo epochstypes.EpochInf
 		delegationInterval := k.GetParam(ctx, types.KeyDelegateInterval)
 		reinvestInterval := k.GetParam(ctx, types.KeyReinvestInterval)
 
+		// Claim accrued staking rewards at the beginning of the epoch
+		k.ClaimAccruedStakingRewards(ctx)
+
 		// Create a new deposit record for each host zone and the grab all deposit records
 		k.CreateDepositRecordsForEpoch(ctx, epochNumber)
 		depositRecords := k.RecordsKeeper.GetAllDepositRecord(ctx)
@@ -148,6 +151,18 @@ func (k Keeper) SetWithdrawalAddress(ctx sdk.Context) {
 	}
 }
 
+// Claim staking rewards for each host zone
+func (k Keeper) ClaimAccruedStakingRewards(ctx sdk.Context) {
+	k.Logger(ctx).Info("Claiming Accrued Staking Rewards...")
+
+	for _, hostZone := range k.GetAllActiveHostZone(ctx) {
+		err := k.ClaimAccruedStakingRewardsOnHost(ctx, hostZone)
+		if err != nil {
+			k.Logger(ctx).Error(fmt.Sprintf("Unable to claim accrued staking rewards on %s, err: %s", hostZone.ChainId, err))
+		}
+	}
+}
+
 // Updates the redemption rate for each host zone
 // At a high level, the redemption rate is equal to the amount of native tokens locked divided by the stTokens in existence.
 // The equation is broken down further into the following sub-components:

x/stakeibc/keeper/msg_server_submit_tx.go

@@ -153,6 +153,55 @@ func (k Keeper) SetWithdrawalAddressOnHost(ctx sdk.Context, hostZone types.HostZ
 	return nil
 }
 
+func (k Keeper) ClaimAccruedStakingRewardsOnHost(ctx sdk.Context, hostZone types.HostZone) error {
+	// The relevant ICA is the delegate account
+	owner := types.FormatICAAccountOwner(hostZone.ChainId, types.ICAAccountType_DELEGATION)
+	portID, err := icatypes.NewControllerPortID(owner)
+	if err != nil {
+		return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "%s has no associated portId", owner)
+	}
+	connectionId, err := k.GetConnectionId(ctx, portID)
+	if err != nil {
+		return errorsmod.Wrapf(sdkerrors.ErrInvalidChainID, "%s has no associated connection", portID)
+	}
+
+	// Fetch the relevant ICA
+	if hostZone.DelegationIcaAddress == "" {
+		k.Logger(ctx).Error(fmt.Sprintf("Zone %s is missing a delegation address!", hostZone.ChainId))
+		return nil
+	}
+
+	if hostZone.WithdrawalIcaAddress == "" {
+		k.Logger(ctx).Error(fmt.Sprintf("Zone %s is missing a withdrawal address!", hostZone.ChainId))
+		return nil
+	}
+	k.Logger(ctx).Info(utils.LogWithHostZone(hostZone.ChainId, "Withdrawal Address: %s, Delegator Address: %s",
+		hostZone.WithdrawalIcaAddress, hostZone.DelegationIcaAddress))
+
+	validators := hostZone.Validators
+	// build multi-message transaction to withdraw rewards from each validator
+	msgs := make([]proto.Message, 0, len(validators))
+	for _, Val := range validators {
+
+		// skip withdrawing rewards
+		if Val.Delegation.IsZero() {
+			continue
+		}
+		msg := &distributiontypes.MsgWithdrawDelegatorReward{
+			DelegatorAddress: hostZone.DelegationIcaAddress,
+			ValidatorAddress: Val.Address,
+		}
+		msgs = append(msgs, msg)
+	}
+
+	_, err = k.SubmitTxsStrideEpoch(ctx, connectionId, msgs, types.ICAAccountType_DELEGATION, "", nil)
+	if err != nil {
+		return errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "Failed to SubmitTxs for %s, %s, %s", connectionId, hostZone.ChainId, msgs)
+	}
+
+	return nil
+}
+
 // Submits an ICQ for the withdrawal account balance
 func (k Keeper) UpdateWithdrawalBalance(ctx sdk.Context, hostZone types.HostZone) error {
 	k.Logger(ctx).Info(utils.LogWithHostZone(hostZone.ChainId, "Submitting ICQ for withdrawal account balance"))