fixing int and dec conversions (#1240)

avkr003 · web-flow · commit 34b4f884e4f0 · 2025-04-15T11:35:01.000Z
* fixing int and dec conversions

* changes for devnet
diff --git a/app/setup_handlers.go b/app/setup_handlers.go
@@ -77,7 +77,7 @@ func (app *ElysApp) setUpgradeHandler() {
 			//}
 
 			// Set cosmwasm params
-			if !strings.Contains(plan.Name, "v3-rc") && plan.Name != "v999999" {
+			if plan.Name == "v3" {
 				wasmParams := wasmTypes.DefaultParams()
 				wasmParams.CodeUploadAccess = wasmTypes.AllowNobody
 				wasmParams.InstantiateDefaultPermission = wasmTypes.AccessTypeNobody
@@ -104,7 +104,7 @@ func (app *ElysApp) setUpgradeStore() {
 
 	app.Logger().Debug("Upgrade info", "info", upgradeInfo)
 
-	if shouldLoadUpgradeStore(app, upgradeInfo) && !strings.Contains(upgradeInfo.Name, "v3-rc") && upgradeInfo.Name != "v999999" {
+	if shouldLoadUpgradeStore(app, upgradeInfo) && upgradeInfo.Name == "v3" {
 		storeUpgrades := storetypes.StoreUpgrades{
 			Added: []string{wasmTypes.StoreKey},
 			//Added:   []string{},
diff --git a/x/amm/keeper/apply_join_pool_state_change.go b/x/amm/keeper/apply_join_pool_state_change.go
@@ -84,7 +84,7 @@ func (k Keeper) ApplyJoinPoolStateChange(
 
 				// Track amount in pool
 				weightRecoveryFeeForPool := weightBalanceBonus.Abs().Mul(sdkmath.LegacyOneDec().Sub(params.WeightBreakingFeePortion))
-				k.TrackWeightBreakingSlippage(ctx, pool.PoolId, sdk.NewCoin(coin.Denom, sdkmath.Int(weightRecoveryFeeForPool.Mul(weightRecoveryFeeAmount.ToLegacyDec()))))
+				k.TrackWeightBreakingSlippage(ctx, pool.PoolId, sdk.NewCoin(coin.Denom, weightRecoveryFeeForPool.Mul(coin.Amount.ToLegacyDec()).TruncateInt()))
 			}
 		}
 	}
diff --git a/x/amm/keeper/create_multihop_expected_swap_outs.go b/x/amm/keeper/create_multihop_expected_swap_outs.go
@@ -32,7 +32,7 @@ func (k Keeper) createMultihopExpectedSwapOuts(
 			return nil, err
 		}
 
-		insExpected[i] = math.Int(tokenIn.Amount)
+		insExpected[i] = tokenIn.Amount
 		tokenOut = tokenIn
 	}
 
diff --git a/x/amm/keeper/msg_server_swap_exact_amount_in.go b/x/amm/keeper/msg_server_swap_exact_amount_in.go
@@ -3,7 +3,6 @@ package keeper
 import (
 	"context"
 
-	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/elys-network/elys/x/amm/types"
 )
@@ -35,7 +34,7 @@ func (k Keeper) SwapExactAmountIn(ctx sdk.Context, msg *types.MsgSwapExactAmount
 	}
 	// Try executing the tx on cached context environment, to filter invalid transactions out
 	cacheCtx, _ := ctx.CacheContext()
-	tokenOutAmount, swapFee, discount, err := k.RouteExactAmountIn(cacheCtx, sender, recipient, msg.Routes, msg.TokenIn, sdkmath.Int(msg.TokenOutMinAmount))
+	tokenOutAmount, swapFee, discount, err := k.RouteExactAmountIn(cacheCtx, sender, recipient, msg.Routes, msg.TokenIn, msg.TokenOutMinAmount)
 	if err != nil {
 		return nil, err
 	}
diff --git a/x/amm/keeper/msg_server_upfront_swap_exact_amount_in.go b/x/amm/keeper/msg_server_upfront_swap_exact_amount_in.go
@@ -5,7 +5,6 @@ import (
 
 	"slices"
 
-	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/elys-network/elys/x/amm/types"
 )
@@ -37,7 +36,7 @@ func (k Keeper) UpFrontSwapExactAmountIn(ctx sdk.Context, msg *types.MsgUpFrontS
 		return nil, types.ErrUnauthorizedUpFrontSwap
 	}
 
-	tokenOutAmount, swapFee, discount, err := k.RouteExactAmountIn(ctx, sender, sender, msg.Routes, msg.TokenIn, sdkmath.Int(msg.TokenOutMinAmount))
+	tokenOutAmount, swapFee, discount, err := k.RouteExactAmountIn(ctx, sender, sender, msg.Routes, msg.TokenIn, msg.TokenOutMinAmount)
 	if err != nil {
 		return nil, err
 	}
diff --git a/x/amm/keeper/msg_server_upfront_swap_exact_amount_in_test.go b/x/amm/keeper/msg_server_upfront_swap_exact_amount_in_test.go
@@ -27,7 +27,7 @@ func (suite *AmmKeeperTestSuite) TestUpFrontSwapExactAmountIn() {
 					Sender:            "cosmos1xv9tklw7d82sezh9haa573wufgy59vmwe6xxe5",
 					Routes:            []types.SwapAmountInRoute{},
 					TokenIn:           sdk.NewCoin("tokenA", sdkmath.NewInt(100)),
-					TokenOutMinAmount: sdkmath.Int(sdkmath.LegacyMustNewDecFromStr("50")),
+					TokenOutMinAmount: sdkmath.NewInt(50),
 				}
 				_, err := suite.app.AmmKeeper.UpFrontSwapExactAmountIn(suite.ctx, msg)
 				return err
diff --git a/x/amm/keeper/update_pool_for_swap.go b/x/amm/keeper/update_pool_for_swap.go
@@ -193,7 +193,7 @@ func (k Keeper) UpdatePoolForSwap(
 
 	// convert the fees into USD
 	swapFeeValueInUSD := k.CalculateCoinsUSDValue(ctx, swapFeeInCoins).String()
-	slippageAmountInUSD := k.CalculateUSDValue(ctx, tokenIn.Denom, sdkmath.Int(slippageAmount)).String()
+	slippageAmountInUSD := k.CalculateUSDValue(ctx, tokenIn.Denom, slippageAmount.TruncateInt()).String()
 	weightRecoveryFeeAmountInUSD := k.CalculateUSDValue(ctx, tokenIn.Denom, weightRecoveryFeeAmount).String()
 	bonusTokenAmountInUSD := k.CalculateUSDValue(ctx, tokenOut.Denom, bonusTokenAmount).String()
 	takerFeesAmountInUSD := k.CalculateCoinsUSDValue(ctx, takerFeesInCoins).String()
diff --git a/x/leveragelp/keeper/position_test.go b/x/leveragelp/keeper/position_test.go
@@ -204,7 +204,7 @@ func TestIteratePoolPosIdsStopLossSorted(t *testing.T) {
 			Liabilities:       math.NewInt(0),
 			AmmPoolId:         info.PoolId,
 			PositionHealth:    math.LegacyNewDec(0),
-			StopLossPrice:     math.LegacyDec(info.StopLossPrice),
+			StopLossPrice:     info.StopLossPrice,
 		}
 		leveragelp.SetPosition(ctx, &position)
 	}
diff --git a/x/leveragelp/keeper/query_get_position_test.go b/x/leveragelp/keeper/query_get_position_test.go
@@ -109,7 +109,7 @@ func (suite *KeeperTestSuite) TestQueryGetPosition() {
 			PositionUsdValue: sdkmath.LegacyMustNewDecFromStr("0.004940470091100279"),
 		},
 		InterestRateHour:    sdkmath.LegacyMustNewDecFromStr("0.000017123287671233"),
-		InterestRateHourUsd: sdkmath.LegacyZeroDec(),
+		InterestRateHourUsd: sdkmath.LegacyMustNewDecFromStr("0.000000068493152000"),
 	}
 	pos_for_address_res, _ := k.QueryPositionsForAddress(suite.ctx, &types.PositionsForAddressRequest{Address: addr.String(), Pagination: nil})
 
diff --git a/x/leveragelp/keeper/utils.go b/x/leveragelp/keeper/utils.go
@@ -130,7 +130,7 @@ func (k Keeper) GetInterestRateUsd(ctx sdk.Context, positions []*types.QueryPosi
 		price := k.oracleKeeper.GetAssetPriceFromDenom(ctx, position.Position.Collateral.Denom)
 		interestRateHour := pool.InterestRate.Quo(hours)
 		positionAndInterest.InterestRateHour = interestRateHour
-		positionAndInterest.InterestRateHourUsd = interestRateHour.Mul(sdkmath.LegacyDec(position.Position.Liabilities.Mul(price.RoundInt())))
+		positionAndInterest.InterestRateHourUsd = interestRateHour.Mul(price).Mul(position.Position.Liabilities.ToLegacyDec())
 		positions_and_interest = append(positions_and_interest, &positionAndInterest)
 	}
 
diff --git a/x/perpetual/client/cli/tx_update_stop_loss.go b/x/perpetual/client/cli/tx_update_stop_loss.go
@@ -35,7 +35,7 @@ func CmdUpdateStopLoss() *cobra.Command {
 			msg := types.NewMsgUpdateStopLoss(
 				clientCtx.GetFromAddress().String(),
 				uint64(positionId),
-				math.LegacyDec(argPrice),
+				argPrice,
 			)
 			if err = msg.ValidateBasic(); err != nil {
 				return err
diff --git a/x/perpetual/client/cli/tx_update_take_profit_price.go b/x/perpetual/client/cli/tx_update_take_profit_price.go
@@ -35,7 +35,7 @@ func CmdUpdateTakeProfitPrice() *cobra.Command {
 			msg := types.NewMsgUpdateTakeProfitPrice(
 				clientCtx.GetFromAddress().String(),
 				uint64(positionId),
-				math.LegacyDec(argPrice),
+				argPrice,
 			)
 			if err = msg.ValidateBasic(); err != nil {
 				return err

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func (k Keeper) ApplyJoinPoolStateChange(`
`84`	`84`
`85`	`85`	`// Track amount in pool`
`86`	`86`	`weightRecoveryFeeForPool := weightBalanceBonus.Abs().Mul(sdkmath.LegacyOneDec().Sub(params.WeightBreakingFeePortion))`
`87`		`- k.TrackWeightBreakingSlippage(ctx, pool.PoolId, sdk.NewCoin(coin.Denom, sdkmath.Int(weightRecoveryFeeForPool.Mul(weightRecoveryFeeAmount.ToLegacyDec()))))`
	`87`	`+ k.TrackWeightBreakingSlippage(ctx, pool.PoolId, sdk.NewCoin(coin.Denom, weightRecoveryFeeForPool.Mul(coin.Amount.ToLegacyDec()).TruncateInt()))`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func (k Keeper) createMultihopExpectedSwapOuts(`
`32`	`32`	`return nil, err`
`33`	`33`	`}`
`34`	`34`
`35`		`- insExpected[i] = math.Int(tokenIn.Amount)`
	`35`	`+ insExpected[i] = tokenIn.Amount`
`36`	`36`	`tokenOut = tokenIn`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ package keeper`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
`6`		`- sdkmath "cosmossdk.io/math"`
`7`	`6`	`sdk "github.com/cosmos/cosmos-sdk/types"`
`8`	`7`	`"github.com/elys-network/elys/x/amm/types"`
`9`	`8`	`)`
`@@ -35,7 +34,7 @@ func (k Keeper) SwapExactAmountIn(ctx sdk.Context, msg *types.MsgSwapExactAmount`
`35`	`34`	`}`
`36`	`35`	`// Try executing the tx on cached context environment, to filter invalid transactions out`
`37`	`36`	`cacheCtx, _ := ctx.CacheContext()`
`38`		`- tokenOutAmount, swapFee, discount, err := k.RouteExactAmountIn(cacheCtx, sender, recipient, msg.Routes, msg.TokenIn, sdkmath.Int(msg.TokenOutMinAmount))`
	`37`	`+ tokenOutAmount, swapFee, discount, err := k.RouteExactAmountIn(cacheCtx, sender, recipient, msg.Routes, msg.TokenIn, msg.TokenOutMinAmount)`
`39`	`38`	`if err != nil {`
`40`	`39`	`return nil, err`
`41`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ import (`
`5`	`5`
`6`	`6`	`"slices"`
`7`	`7`
`8`		`- sdkmath "cosmossdk.io/math"`
`9`	`8`	`sdk "github.com/cosmos/cosmos-sdk/types"`
`10`	`9`	`"github.com/elys-network/elys/x/amm/types"`
`11`	`10`	`)`
`@@ -37,7 +36,7 @@ func (k Keeper) UpFrontSwapExactAmountIn(ctx sdk.Context, msg *types.MsgUpFrontS`
`37`	`36`	`return nil, types.ErrUnauthorizedUpFrontSwap`
`38`	`37`	`}`
`39`	`38`
`40`		`- tokenOutAmount, swapFee, discount, err := k.RouteExactAmountIn(ctx, sender, sender, msg.Routes, msg.TokenIn, sdkmath.Int(msg.TokenOutMinAmount))`
	`39`	`+ tokenOutAmount, swapFee, discount, err := k.RouteExactAmountIn(ctx, sender, sender, msg.Routes, msg.TokenIn, msg.TokenOutMinAmount)`
`41`	`40`	`if err != nil {`
`42`	`41`	`return nil, err`
`43`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func (suite *AmmKeeperTestSuite) TestUpFrontSwapExactAmountIn() {`
`27`	`27`	`Sender: "cosmos1xv9tklw7d82sezh9haa573wufgy59vmwe6xxe5",`
`28`	`28`	`Routes: []types.SwapAmountInRoute{},`
`29`	`29`	`TokenIn: sdk.NewCoin("tokenA", sdkmath.NewInt(100)),`
`30`		`- TokenOutMinAmount: sdkmath.Int(sdkmath.LegacyMustNewDecFromStr("50")),`
	`30`	`+ TokenOutMinAmount: sdkmath.NewInt(50),`
`31`	`31`	`}`
`32`	`32`	`_, err := suite.app.AmmKeeper.UpFrontSwapExactAmountIn(suite.ctx, msg)`
`33`	`33`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ func TestIteratePoolPosIdsStopLossSorted(t *testing.T) {`
`204`	`204`	`Liabilities: math.NewInt(0),`
`205`	`205`	`AmmPoolId: info.PoolId,`
`206`	`206`	`PositionHealth: math.LegacyNewDec(0),`
`207`		`- StopLossPrice: math.LegacyDec(info.StopLossPrice),`
	`207`	`+ StopLossPrice: info.StopLossPrice,`
`208`	`208`	`}`
`209`	`209`	`leveragelp.SetPosition(ctx, &position)`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ func (suite *KeeperTestSuite) TestQueryGetPosition() {`
`109`	`109`	`PositionUsdValue: sdkmath.LegacyMustNewDecFromStr("0.004940470091100279"),`
`110`	`110`	`},`
`111`	`111`	`InterestRateHour: sdkmath.LegacyMustNewDecFromStr("0.000017123287671233"),`
`112`		`- InterestRateHourUsd: sdkmath.LegacyZeroDec(),`
	`112`	`+ InterestRateHourUsd: sdkmath.LegacyMustNewDecFromStr("0.000000068493152000"),`
`113`	`113`	`}`
`114`	`114`	`pos_for_address_res, _ := k.QueryPositionsForAddress(suite.ctx, &types.PositionsForAddressRequest{Address: addr.String(), Pagination: nil})`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func (k Keeper) GetInterestRateUsd(ctx sdk.Context, positions []*types.QueryPosi`
`130`	`130`	`price := k.oracleKeeper.GetAssetPriceFromDenom(ctx, position.Position.Collateral.Denom)`
`131`	`131`	`interestRateHour := pool.InterestRate.Quo(hours)`
`132`	`132`	`positionAndInterest.InterestRateHour = interestRateHour`
`133`		`- positionAndInterest.InterestRateHourUsd = interestRateHour.Mul(sdkmath.LegacyDec(position.Position.Liabilities.Mul(price.RoundInt())))`
	`133`	`+ positionAndInterest.InterestRateHourUsd = interestRateHour.Mul(price).Mul(position.Position.Liabilities.ToLegacyDec())`
`134`	`134`	`positions_and_interest = append(positions_and_interest, &positionAndInterest)`
`135`	`135`	`}`
`136`	`136`