Merge branch 'osmo-v27/0.50.10' into chore/update-changelog-v27

tests/integration/staking/keeper/determinstic_test.go

@@ -414,7 +414,7 @@ func TestGRPCValidatorDelegations(t *testing.T) {
 		ValidatorAddr: validator.OperatorAddress,
 	}
 
-	testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.ValidatorDelegations, 17484, false)
+	testdata.DeterministicIterations(f.ctx, t, req, f.queryClient.ValidatorDelegations, 14475, false)
 }
 
 func TestGRPCValidatorUnbondingDelegations(t *testing.T) {

x/bank/keeper/send.go

@@ -165,6 +165,19 @@ func (k BaseSendKeeper) InputOutputCoins(ctx context.Context, input types.Input,
 		return err
 	}
 
+	for _, out := range outputs {
+		outAddress, err := k.ak.AddressCodec().StringToBytes(out.Address)
+		if err != nil {
+			return err
+		}
+
+		if err := k.BlockBeforeSend(ctx, inAddress, outAddress, out.Coins); err != nil {
+			return err
+		}
+
+		k.TrackBeforeSend(ctx, inAddress, outAddress, out.Coins)
+	}
+
 	err = k.subUnlockedCoins(ctx, inAddress, input.Coins)
 	if err != nil {
 		return err

x/bank/keeper/supply_offset_old.go

@@ -0,0 +1,69 @@
+package keeper
+
+import (
+	"context"
+	"fmt"
+
+	"cosmossdk.io/math"
+	"cosmossdk.io/store/prefix"
+
+	"github.com/cosmos/cosmos-sdk/runtime"
+	"github.com/cosmos/cosmos-sdk/x/bank/types"
+)
+
+// NOTE: All these functions should only be used in the v27 migration
+// this file should be removed completely after the migration
+
+// GetSupplyOffset retrieves the SupplyOffset from store for a specific denom using the pre v26 (old) key
+// TODO: Remove after v27 migration
+func (k BaseViewKeeper) GetSupplyOffsetOld(ctx context.Context, denom string) math.Int {
+	store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx))
+	supplyOffsetStore := prefix.NewStore(store, types.SupplyOffsetKeyOld)
+
+	bz := supplyOffsetStore.Get([]byte(denom))
+	if bz == nil {
+		return math.NewInt(0)
+	}
+
+	var amount math.Int
+	err := amount.Unmarshal(bz)
+	if err != nil {
+		panic(fmt.Errorf("unable to unmarshal supply offset value %v", err))
+	}
+
+	return amount
+}
+
+// RemoveOldSupplyOffset removes the old supply offset key
+// TODO: Remove after v27 migration
+func (k BaseViewKeeper) RemoveOldSupplyOffset(ctx context.Context, denom string) {
+	store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx))
+	supplyOffsetStore := prefix.NewStore(store, types.SupplyOffsetKeyOld)
+
+	supplyOffsetStore.Delete([]byte(denom))
+}
+
+// setSupplyOffsetOld sets the supply offset for the given denom using the pre v26 (old) key
+// TODO: Remove after v27 migration
+func (k BaseKeeper) setSupplyOffsetOld(ctx context.Context, denom string, offsetAmount math.Int) {
+	intBytes, err := offsetAmount.Marshal()
+	if err != nil {
+		panic(fmt.Errorf("unable to marshal amount value %v", err))
+	}
+
+	store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx))
+	supplyOffsetStore := prefix.NewStore(store, types.SupplyOffsetKeyOld)
+
+	// Bank invariants and IBC requires to remove zero coins.
+	if offsetAmount.IsZero() {
+		supplyOffsetStore.Delete([]byte(denom))
+	} else {
+		supplyOffsetStore.Set([]byte(denom), intBytes)
+	}
+}
+
+// AddSupplyOffsetOld adjusts the current supply offset of a denom by the inputted offsetAmount using the pre v26 (old) key
+// TODO: Remove after v27 migration
+func (k BaseKeeper) AddSupplyOffsetOld(ctx context.Context, denom string, offsetAmount math.Int) {
+	k.setSupplyOffsetOld(ctx, denom, k.GetSupplyOffsetOld(ctx, denom).Add(offsetAmount))
+}

x/bank/types/keys.go

@@ -33,7 +33,12 @@ var (
 	// ParamsKey is the prefix for x/bank parameters
 	ParamsKey = collections.NewPrefix(5)
 
+	// SupplyOffKey is a Osmosis specific key that handles supply offsets
 	SupplyOffsetKey = collections.NewPrefix(88)
+
+	// SupplyOffKeyOld is a Osmosis specific key that handles supply offsets pre v0.50
+	// TODO: Remove in the v28 upgrade
+	SupplyOffsetKeyOld = []byte{0x88}
 )
 
 // BalanceValueCodec is a codec for encoding bank balances in a backwards compatible way.

x/staking/keeper/abci.go

@@ -6,7 +6,6 @@ import (
 	abci "github.com/cometbft/cometbft/abci/types"
 
 	"github.com/cosmos/cosmos-sdk/telemetry"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/staking/types"
 )
 
@@ -21,18 +20,5 @@ func (k *Keeper) BeginBlocker(ctx context.Context) error {
 func (k *Keeper) EndBlocker(ctx context.Context) ([]abci.ValidatorUpdate, error) {
 	defer telemetry.ModuleMeasureSince(types.ModuleName, telemetry.Now(), telemetry.MetricKeyEndBlocker)
 
-	// TODO: Remove migration code and panic catch in the next upgrade
-	// Wrap the migration call in a function that can recover from panics
-	func() {
-		defer func() {
-			if r := recover(); r != nil {
-				k.Logger(sdk.UnwrapSDKContext(ctx)).Error("Panic in MigrateDelegationsByValidatorIndex", "recover", r)
-			}
-		}()
-
-		// Only migrate 10000 items per block to make the migration as fast as possible
-		k.MigrateDelegationsByValidatorIndex(sdk.UnwrapSDKContext(ctx), 10000)
-	}()
-
 	return k.BlockValidatorUpdates(ctx)
 }

x/staking/keeper/grpc_query.go

@@ -2,7 +2,6 @@ package keeper
 
 import (
 	"context"
-	"fmt"
 	"strings"
 
 	"google.golang.org/grpc/codes"
@@ -109,12 +108,6 @@ func (k Querier) ValidatorDelegations(ctx context.Context, req *types.QueryValid
 		pageRes *query.PageResponse
 	)
 	pageRes, err = query.Paginate(delStore, req.Pagination, func(delAddr, value []byte) error {
-		// Check the store to see if there is a value stored under the key
-		key := store.Get(types.NextMigrateDelegationsByValidatorIndexKey)
-		if key != nil {
-			// Users will never see this error as if there is an error the function defaults to the legacy implementation below
-			return fmt.Errorf("store migration is not finished, try again later")
-		}
 		bz := store.Get(types.GetDelegationKey(delAddr, valAddr))
 
 		var delegation types.Delegation