Update xcclookup

go.mod

@@ -23,7 +23,6 @@ require (
 	github.com/golangci/golangci-lint/v2 v2.2.1
 	github.com/gorilla/mux v1.8.1
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
-	github.com/ingenuity-build/multierror v0.1.0
 	github.com/osmosis-labs/osmosis/osmomath v0.0.16
 	github.com/prometheus/client_golang v1.22.0
 	github.com/prometheus/common v0.65.0
@@ -34,6 +33,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d
 	go.opencensus.io v0.24.0
+	go.uber.org/multierr v1.11.0
 	golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c
 	golang.org/x/tools v0.34.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822
@@ -351,7 +351,6 @@ require (
 	go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
 	go.opentelemetry.io/otel/trace v1.36.0 // indirect
 	go.uber.org/automaxprocs v1.6.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/crypto v0.39.0 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac //indirect

go.sum

@@ -1361,8 +1361,6 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
-github.com/ingenuity-build/multierror v0.1.0 h1:nS+YE/+ujwtl09kNWsIMNu8TUjs9PKrtnP5x45txxOs=
-github.com/ingenuity-build/multierror v0.1.0/go.mod h1:ZU6BORie0gkg/hhdTvEH979RsaCE2Wdsxph9AISVmac=
 github.com/jgautheron/goconst v1.8.2 h1:y0XF7X8CikZ93fSNT6WBTb/NElBu9IjaY7CCYQrCMX4=
 github.com/jgautheron/goconst v1.8.2/go.mod h1:A0oxgBCHy55NQn6sYpO7UdnA9p+h7cPtoOZUmvNIako=
 github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=

go.work.sum

@@ -1250,6 +1250,8 @@ github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab h1:HqW
 github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
 github.com/informalsystems/tm-load-test v1.3.0 h1:FGjKy7vBw6mXNakt+wmNWKggQZRsKkEYpaFk/zR64VA=
 github.com/informalsystems/tm-load-test v1.3.0/go.mod h1:OQ5AQ9TbT5hKWBNIwsMjn6Bf4O0U4b1kRc+0qZlQJKw=
+github.com/ingenuity-build/multierror v0.1.0 h1:nS+YE/+ujwtl09kNWsIMNu8TUjs9PKrtnP5x45txxOs=
+github.com/ingenuity-build/multierror v0.1.0/go.mod h1:ZU6BORie0gkg/hhdTvEH979RsaCE2Wdsxph9AISVmac=
 github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
 github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
 github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI=

icq-relayer/go.sum

@@ -790,6 +790,7 @@ github.com/coinbase/mesh-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931
 github.com/cometbft/cometbft v0.37.15 h1:un+iXPh7naon5e7LQgKB2BYcrnAG0SGmUgDesyX7FII=
 github.com/cometbft/cometbft v0.37.15/go.mod h1:t/BvwfSJKt2HUHX01L6y1+uw+LOoxU6hFj447wOB5IA=
 github.com/cometbft/cometbft-db v0.14.1 h1:SxoamPghqICBAIcGpleHbmoPqy+crij/++eZz3DlerQ=
+github.com/cometbft/cometbft-db v0.14.1/go.mod h1:KHP1YghilyGV/xjD5DP3+2hyigWx0WTp9X+0Gnx0RxQ=
 github.com/confio/ics23/go v0.9.1 h1:3MV46eeWwO3xCauKyAtuAdJYMyPnnchW4iLr2bTw6/U=
 github.com/confio/ics23/go v0.9.1/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak=
 github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
@@ -820,6 +821,7 @@ github.com/cosmos/ibc-go/v7 v7.10.0/go.mod h1:PiVSJhIPBq/rI+6UOfKPy4RKDCvQ2vR+Vd
 github.com/cosmos/ics23/go v0.11.0 h1:jk5skjT0TqX5e5QJbEnwXIS2yI2vnmLOgpQPeM5RtnU=
 github.com/cosmos/ics23/go v0.11.0/go.mod h1:A8OjxPE67hHST4Icw94hOxxFEJMBG031xIGF/JHNIY0=
 github.com/cosmos/ledger-cosmos-go v0.12.4 h1:drvWt+GJP7Aiw550yeb3ON/zsrgW0jgh5saFCr7pDnw=
+github.com/cosmos/ledger-cosmos-go v0.12.4/go.mod h1:fjfVWRf++Xkygt9wzCsjEBdjcf7wiiY35fv3ctT+k4M=
 github.com/cosmos/rosetta-sdk-go v0.10.0 h1:E5RhTruuoA7KTIXUcMicL76cffyeoyvNybzUGSKFTcM=
 github.com/cosmos/rosetta-sdk-go v0.10.0/go.mod h1:SImAZkb96YbwvoRkzSMQB6noNJXFgWl/ENIznEoYQI4=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=

tools/tools.go

@@ -1,5 +1,4 @@
 //go:build tools
-// +build tools
 
 package tools
 

utils/error.go

@@ -0,0 +1,14 @@
+package utils
+
+import (
+	"fmt"
+)
+
+// helper function to convert error map to slice for multierr
+func ErrorMapToSlice(errs map[string]error) []error {
+	var errList []error
+	for _, err := range Keys(errs) {
+		errList = append(errList, fmt.Errorf("%s: %w", err, errs[err]))
+	}
+	return errList
+}

x/claimsmanager/types/claimsmanager.go

@@ -1,7 +1,9 @@
 package types
 
 import (
-	"github.com/ingenuity-build/multierror"
+	"fmt"
+
+	"go.uber.org/multierr"
 
 	"cosmossdk.io/math"
 
@@ -14,24 +16,20 @@ func NewClaim(address, chainID string, module ClaimType, srcChainID string, amou
 
 // ValidateBasic performs stateless validation of a Claim.
 func (c *Claim) ValidateBasic() error {
-	errs := make(map[string]error)
+	var errs error
 
 	_, err := sdk.AccAddressFromBech32(c.UserAddress)
 	if err != nil {
-		errs["UserAddress"] = err
+		errs = multierr.Append(errs, fmt.Errorf("userAddress: %w", err))
 	}
 
 	if c.ChainId == "" {
-		errs["ChainID"] = ErrUndefinedAttribute
+		errs = multierr.Append(errs, fmt.Errorf("chainID: %w", ErrUndefinedAttribute))
 	}
 
 	if c.Amount.IsNil() || !c.Amount.IsPositive() {
-		errs["Amount"] = ErrNotPositive
-	}
-
-	if len(errs) > 0 {
-		return multierror.New(errs)
+		errs = multierr.Append(errs, fmt.Errorf("amount: %w", ErrNotPositive))
 	}
 
-	return nil
+	return errs
 }

x/claimsmanager/types/genesis.go

@@ -3,7 +3,9 @@ package types
 import (
 	"fmt"
 
-	"github.com/ingenuity-build/multierror"
+	"go.uber.org/multierr"
+
+	"github.com/quicksilver-zone/quicksilver/utils"
 )
 
 func NewGenesisState(params Params) *GenesisState {
@@ -34,7 +36,7 @@ func (gs *GenesisState) Validate() error {
 	}
 
 	if len(errs) > 0 {
-		return multierror.New(errs)
+		return multierr.Combine(utils.ErrorMapToSlice(errs)...)
 	}
 
 	return nil

x/claimsmanager/types/msgs.go

@@ -1,6 +1,10 @@
 package types
 
-import "github.com/ingenuity-build/multierror"
+import (
+	"go.uber.org/multierr"
+
+	"github.com/quicksilver-zone/quicksilver/utils"
+)
 
 // ValidateBasic performs stateless validation for Proof.
 func (p *Proof) ValidateBasic() error {
@@ -28,7 +32,7 @@ func (p *Proof) ValidateBasic() error {
 
 	// check for errors and return
 	if len(errs) > 0 {
-		return multierror.New(errs)
+		return multierr.Combine(utils.ErrorMapToSlice(errs)...)
 	}
 
 	return nil

x/epochs/keeper/grpc_query_test.go

@@ -1,7 +1,6 @@
 package keeper_test
 
 import (
-	gocontext "context"
 	"time"
 
 	"github.com/quicksilver-zone/quicksilver/x/epochs/types"
@@ -14,7 +13,7 @@ func (suite *KeeperTestSuite) TestQueryEpochInfos() {
 	chainStartTime := suite.ctx.BlockTime()
 
 	// Invalid param
-	epochInfosResponse, err := queryClient.EpochInfos(gocontext.Background(), &types.QueryEpochsInfoRequest{})
+	epochInfosResponse, err := queryClient.EpochInfos(suite.ctx, &types.QueryEpochsInfoRequest{})
 	suite.Require().NoError(err)
 	suite.Require().Len(epochInfosResponse.Epochs, 3)
 

x/interchainstaking/keeper/intent.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ingenuity-build/multierror"
+	"go.uber.org/multierr"
 
 	sdkmath "cosmossdk.io/math"
 
@@ -246,7 +246,11 @@ func (k msgServer) validateValidatorIntents(ctx sdk.Context, zone types.Zone, in
 	}
 
 	if len(errMap) > 0 {
-		return multierror.New(errMap)
+		var errList []error
+		for _, err := range errMap {
+			errList = append(errList, err)
+		}
+		return multierr.Combine(errList...)
 	}
 
 	return nil

x/interchainstaking/types/error_test.go

@@ -4,23 +4,22 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/ingenuity-build/multierror"
+	"go.uber.org/multierr"
 )
 
 func TestErrorsDeterminism(t *testing.T) {
-	e := multierror.MultiError{
-		Errors: map[string]error{
-			"a":    errors.New("a"),
-			"Z":    errors.New("Z"),
-			"🚨":    errors.New("🚨"),
-			"a🚨":   errors.New("a🚨"),
-			"ABC":  errors.New("ABC"),
-			"1one": errors.New("1one"),
-			"A":    errors.New("A"),
-			"X":    errors.New("X"),
-		},
+	errs := []error{
+		errors.New("a"),
+		errors.New("Z"),
+		errors.New("🚨"),
+		errors.New("a🚨"),
+		errors.New("ABC"),
+		errors.New("1one"),
+		errors.New("A"),
+		errors.New("X"),
 	}
 
+	e := multierr.Combine(errs...)
 	e0 := e.Error()
 
 	for i := 0; i < 100; i++ {

x/interchainstaking/types/msgs.go

@@ -7,14 +7,15 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ingenuity-build/multierror"
+	"go.uber.org/multierr"
 
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/bech32"
 	"github.com/cosmos/cosmos-sdk/types/tx"
 	"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
 
+	"github.com/quicksilver-zone/quicksilver/utils"
 	"github.com/quicksilver-zone/quicksilver/utils/addressutils"
 )
 
@@ -90,7 +91,7 @@ func (msg MsgRequestRedemption) ValidateBasic() error {
 	}
 
 	if len(errs) > 0 {
-		return multierror.New(errs)
+		return multierr.Combine(utils.ErrorMapToSlice(errs)...)
 	}
 
 	return nil
@@ -137,7 +138,7 @@ func (msg MsgCancelRedemption) ValidateBasic() error {
 	}
 
 	if len(errs) > 0 {
-		return multierror.New(errs)
+		return multierr.Combine(utils.ErrorMapToSlice(errs)...)
 	}
 
 	return nil
@@ -181,7 +182,7 @@ func (msg MsgRequeueRedemption) ValidateBasic() error {
 	}
 
 	if len(errs) > 0 {
-		return multierror.New(errs)
+		return multierr.Combine(utils.ErrorMapToSlice(errs)...)
 	}
 
 	return nil
@@ -237,7 +238,7 @@ func (msg MsgUpdateRedemption) ValidateBasic() error {
 	}
 
 	if len(errs) > 0 {
-		return multierror.New(errs)
+		return multierr.Combine(utils.ErrorMapToSlice(errs)...)
 	}
 
 	return nil
@@ -337,7 +338,7 @@ func (msg MsgSignalIntent) ValidateBasic() error {
 		}
 	}
 	if len(errm) > 0 {
-		return multierror.New(errm)
+		return multierr.Combine(utils.ErrorMapToSlice(errm)...)
 	}
 
 	return nil

x/participationrewards/keeper/distribution.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/ingenuity-build/multierror"
+	"go.uber.org/multierr"
 
 	"cosmossdk.io/math"
 
@@ -182,7 +182,7 @@ func (k *Keeper) CalcTokenValues(ctx sdk.Context) (TokenValues, error) {
 	DepthFirstSearch(graph2, visited, baseDenom, sdk.OneDec(), tvs)
 
 	if len(errs) > 0 {
-		return nil, multierror.New(errs)
+		return nil, multierr.Combine(utils.ErrorMapToSlice(errs)...)
 	}
 
 	return tvs, nil