Merge branch 'main' into dependabot/npm_and_yarn/web-ui/cosmos-kit/co…

…re-2.7.8

.github/workflows/buildtest.yaml

@@ -29,7 +29,7 @@ jobs:
     name: build quicksilver
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.20.11"
         env:
@@ -63,7 +63,7 @@ jobs:
     name: test quicksilver
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.20.11"
         env:
@@ -123,7 +123,7 @@ jobs:
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.20.5"
       - name: Run simulation tests

.github/workflows/codeql.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: 1.19.5
       # Initializes the CodeQL tools for scanning.

.github/workflows/docker.yaml

@@ -22,7 +22,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.20.11"
 

.github/workflows/golangci.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: '1.21'
           cache: false

.github/workflows/interchaintest.yaml

@@ -36,7 +36,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.20.5"
 
@@ -57,7 +57,7 @@ jobs:
     needs: build-and-push-image
     steps:
       - name: Set up Go 1.20
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.20.5"
         id: go
@@ -74,7 +74,7 @@ jobs:
     needs: build-and-push-image
     steps:
       - name: Set up Go 1.20
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.20.5"
         id: go
@@ -91,7 +91,7 @@ jobs:
     needs: build-and-push-image
     steps:
       - name: Set up Go 1.20
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.20.5"
         id: go

.github/workflows/simulation.yml

@@ -17,7 +17,7 @@ jobs:
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.20.5"
 

x/interchainstaking/keeper/keeper.go

@@ -416,29 +416,6 @@ func (k *Keeper) SetValidatorForZone(ctx sdk.Context, zone *types.Zone, data []b
 	return nil
 }
 
-func (k *Keeper) UpdateWithdrawalRecordsForSlash(ctx sdk.Context, zone *types.Zone, valoper string, delta sdk.Dec) error {
-	var err error
-	k.IterateZoneStatusWithdrawalRecords(ctx, zone.ChainId, types.WithdrawStatusUnbond, func(_ int64, record types.WithdrawalRecord) bool {
-		recordSubAmount := sdkmath.ZeroInt()
-		distr := record.Distribution
-		for _, d := range distr {
-			if d.Valoper != valoper {
-				continue
-			}
-			newAmount := sdk.NewDec(int64(d.Amount)).Quo(delta).TruncateInt()
-			thisSubAmount := sdkmath.NewInt(int64(d.Amount)).Sub(newAmount)
-			recordSubAmount = recordSubAmount.Add(thisSubAmount)
-			d.Amount = newAmount.Uint64()
-			k.Logger(ctx).Info("Updated withdrawal record due to slashing", "valoper", valoper, "old_amount", d.Amount, "new_amount", newAmount.Int64(), "sub_amount", thisSubAmount.Int64())
-		}
-		record.Distribution = distr
-		record.Amount = record.Amount.Sub(sdk.NewCoin(zone.BaseDenom, recordSubAmount))
-		k.SetWithdrawalRecord(ctx, record)
-		return false
-	})
-	return err
-}
-
 func (k *Keeper) depositInterval(ctx sdk.Context) zoneItrFn {
 	return func(index int64, zone *types.Zone) (stop bool) {
 		if zone.DepositAddress != nil {

x/interchainstaking/keeper/withdrawal_record.go

@@ -3,8 +3,11 @@ package keeper
 import (
 	"encoding/binary"
 	"encoding/hex"
+	"fmt"
 	"time"
 
+	sdkmath "cosmossdk.io/math"
+
 	"github.com/cosmos/cosmos-sdk/store/prefix"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
@@ -222,3 +225,37 @@ func (k *Keeper) AllZoneUnbondingRecords(ctx sdk.Context, chainID string) []type
 	})
 	return records
 }
+
+func (k *Keeper) UpdateWithdrawalRecordsForSlash(ctx sdk.Context, zone *types.Zone, valoper string, delta sdk.Dec) error {
+	var err error
+	k.IterateZoneStatusWithdrawalRecords(ctx, zone.ChainId, types.WithdrawStatusUnbond, func(_ int64, record types.WithdrawalRecord) bool {
+		recordSubAmount := sdkmath.ZeroInt()
+		distr := record.Distribution
+		for _, d := range distr {
+			if d.Valoper != valoper {
+				continue
+			}
+			distAmount := sdk.NewDec(int64(d.Amount))
+			if distAmount.IsNegative() {
+				err = fmt.Errorf("distAmount cannot be negative; suspected overflow")
+				return true
+			}
+
+			newAmount := distAmount.Quo(delta).TruncateInt()
+			thisSubAmount := distAmount.TruncateInt().Sub(newAmount)
+			recordSubAmount = recordSubAmount.Add(thisSubAmount)
+			d.Amount = newAmount.Uint64()
+			k.Logger(ctx).Info("Updated withdrawal record due to slashing", "valoper", valoper, "old_amount", d.Amount, "new_amount", newAmount.Int64(), "sub_amount", thisSubAmount.Int64())
+		}
+		record.Distribution = distr
+		subAmount := sdk.NewCoins(sdk.NewCoin(zone.BaseDenom, recordSubAmount))
+		if !record.Amount.IsAllGT(subAmount) {
+			err = fmt.Errorf("deductedTotal cannot contain negative coins; suspected overflow")
+			return true
+		}
+		record.Amount = record.Amount.Sub(subAmount...)
+		k.SetWithdrawalRecord(ctx, record)
+		return false
+	})
+	return err
+}