Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refresh 47 #763

Merged
merged 14 commits into from
May 10, 2023
Prev Previous commit
Next Next commit
Merge branch 'sdk47' into HEAD
faddat committed May 8, 2023

Verified

This commit was signed with the committer’s verified signature.
stgraber Stéphane Graber
commit bd4adfb7afb39940a0dfa75b5b594d624718be5e
1 change: 1 addition & 0 deletions app/app.go
Original file line number Diff line number Diff line change
@@ -36,6 +36,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/capability"
capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
"github.com/cosmos/cosmos-sdk/x/crisis"
crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper"
crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
4 changes: 2 additions & 2 deletions x/autopilot/keeper/airdrop.go
Original file line number Diff line number Diff line change
@@ -8,8 +8,8 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
transfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types"
channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types"
transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"

"github.com/Stride-Labs/stride/v9/utils"
"github.com/Stride-Labs/stride/v9/x/autopilot/types"
10 changes: 5 additions & 5 deletions x/autopilot/keeper/airdrop_test.go
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ import (
"fmt"
"strings"

"github.com/cosmos/ibc-go/v5/modules/apps/transfer"
transfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types"
channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types"
ibctesting "github.com/cosmos/ibc-go/v5/testing"
"github.com/cosmos/ibc-go/v7/modules/apps/transfer"
transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
ibctesting "github.com/cosmos/ibc-go/v7/testing"

sdk "github.com/cosmos/cosmos-sdk/types"

30 changes: 0 additions & 30 deletions x/claim/keeper/query.go

This file was deleted.

3 changes: 2 additions & 1 deletion x/stakeibc/keeper/unbonding_records.go
Original file line number Diff line number Diff line change
@@ -12,6 +12,8 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
"github.com/spf13/cast"

proto "github.com/cosmos/gogoproto/proto"

"github.com/Stride-Labs/stride/v9/utils"
recordstypes "github.com/Stride-Labs/stride/v9/x/records/types"
"github.com/Stride-Labs/stride/v9/x/stakeibc/types"
@@ -117,7 +119,6 @@ func (k Keeper) GetHostZoneUnbondingMsgs(ctx sdk.Context, hostZone types.HostZon
// Check if we can unbond more from this validator
validatorUnbondExtraCapacity := validator.DelegationAmt.Sub(targetUnbondAmount)
if validatorUnbondExtraCapacity.GT(sdkmath.ZeroInt()) {

// If we can fully cover the unbonding, do so with this validator
if validatorUnbondExtraCapacity.GT(overflowAmount) {
finalUnbondingsByValidator[validator.Address] = finalUnbondingsByValidator[validator.Address].Add(overflowAmount)
You are viewing a condensed version of this merge commit. You can view the full changes here.