Merge pull request #1312 from mars-protocol/develop

v2.8.6

Author: linkielink

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mars-v2-frontend",
-  "version": "2.8.5",
+  "version": "2.8.6",
   "homepage": "./",
   "private": false,
   "license": "SEE LICENSE IN LICENSE FILE",

src/components/Modals/Hls/Manage/ChangeLeverage.tsx

@@ -5,7 +5,6 @@ import LeverageSummary from 'components/Modals/Hls/Deposit/LeverageSummary'
 import { BN_ZERO } from 'constants/math'
 import { useUpdatedAccount } from 'hooks/accounts/useUpdatedAccount'
 import useDepositEnabledAssets from 'hooks/assets/useDepositEnabledAssets'
-import useIsOsmosis from 'hooks/chain/useIsOsmosis'
 import useHealthComputer from 'hooks/health-computer/useHealthComputer'
 import useSlippage from 'hooks/settings/useSlippage'
 import useRouteInfo from 'hooks/trade/useRouteInfo'
@@ -37,7 +36,6 @@ export default function ChangeLeverage(props: Props) {
     leverage,
     addedTrades,
   } = useUpdatedAccount(props.account)
-  const isOsmosis = useIsOsmosis()
 
   const changeHlsStakingLeverage = useStore((s) => s.changeHlsStakingLeverage)
   const { computeMaxBorrowAmount } = useHealthComputer(props.account)
@@ -141,7 +139,6 @@ export default function ChangeLeverage(props: Props) {
       slippage,
       routeInfo,
       swapInAmount,
-      isOsmosis,
     )
     changeHlsStakingLeverage({ accountId: props.account.id, actions })
   }, [
@@ -153,7 +150,6 @@ export default function ChangeLeverage(props: Props) {
     props.account.id,
     slippage,
     swapInAmount,
-    isOsmosis,
     changeHlsStakingLeverage,
   ])
 

src/components/Modals/Hls/Manage/Deposit.tsx

@@ -132,7 +132,7 @@ export default function Deposit(props: Props) {
     props.borrowMarket.liquidity,
   ])
 
-  const actions = useDepositActions({ depositCoin, borrowCoin, chainConfig, routeInfo })
+  const actions = useDepositActions({ depositCoin, borrowCoin, routeInfo })
 
   const currentDebt: BigNumber = useMemo(
     () => props.account.debts.find(byDenom(props.borrowMarket.asset.denom))?.amount || BN_ZERO,

src/hooks/hls/useDepositActions.ts

@@ -7,28 +7,20 @@ import { getSwapExactInAction } from 'utils/swap'
 interface Props {
   borrowCoin: BNCoin
   depositCoin: BNCoin
-  chainConfig: ChainConfig
   routeInfo?: SwapRouteInfo | null
 }
 
 export default function useDepositActions(props: Props) {
-  const { borrowCoin, depositCoin, routeInfo, chainConfig } = props
+  const { borrowCoin, depositCoin, routeInfo } = props
 
   const [slippage] = useSlippage()
-  const isOsmosis = chainConfig.isOsmosis
 
   const swapAction = useMemo(
     () =>
       routeInfo
-        ? getSwapExactInAction(
-            borrowCoin.toActionCoin(),
-            depositCoin.denom,
-            routeInfo,
-            slippage,
-            isOsmosis,
-          )
+        ? getSwapExactInAction(borrowCoin.toActionCoin(), depositCoin.denom, routeInfo, slippage)
         : null,
-    [borrowCoin, depositCoin, routeInfo, slippage, isOsmosis],
+    [borrowCoin, depositCoin, routeInfo, slippage],
   )
   return useMemo(
     () => [

src/hooks/hls/useDepositHlsStaking.ts

@@ -1,9 +1,8 @@
-import useDepositEnabledAssets from 'hooks/assets/useDepositEnabledAssets'
-import useChainConfig from 'hooks/chain/useChainConfig'
 import { BN_ZERO } from 'constants/math'
-import { useMemo, useState } from 'react'
+import useDepositEnabledAssets from 'hooks/assets/useDepositEnabledAssets'
 import useSlippage from 'hooks/settings/useSlippage'
 import useRouteInfo from 'hooks/trade/useRouteInfo'
+import { useMemo, useState } from 'react'
 import { BNCoin } from 'types/classes/BNCoin'
 import { Action } from 'types/generated/mars-credit-manager/MarsCreditManager.types'
 import { getCoinValue } from 'utils/formatters'
@@ -16,7 +15,6 @@ interface Props {
 export default function useDepositHlsStaking(props: Props) {
   const [slippage] = useSlippage()
   const assets = useDepositEnabledAssets()
-  const chainConfig = useChainConfig()
 
   const [depositAmount, setDepositAmount] = useState<BigNumber>(BN_ZERO)
   const [borrowAmount, setBorrowAmount] = useState<BigNumber>(BN_ZERO)
@@ -83,7 +81,6 @@ export default function useDepositHlsStaking(props: Props) {
               props.collateralDenom,
               route,
               slippage,
-              chainConfig.isOsmosis,
             ),
           ]),
     ]
@@ -95,7 +92,6 @@ export default function useDepositHlsStaking(props: Props) {
     props.borrowDenom,
     props.collateralDenom,
     slippage,
-    chainConfig.isOsmosis,
   ])
 
   return {

src/hooks/hls/useHlsCloseFarmingPositionActions.ts

@@ -2,7 +2,6 @@ import BigNumber from 'bignumber.js'
 
 import { BN_ZERO } from 'constants/math'
 import useAssets from 'hooks/assets/useAssets'
-import useIsOsmosis from 'hooks/chain/useIsOsmosis'
 import useStakedAstroLpRewards from 'hooks/incentives/useStakedAstroLpRewards'
 import useMarkets from 'hooks/markets/useMarkets'
 import useSlippage from 'hooks/settings/useSlippage'
@@ -28,7 +27,6 @@ export default function useHlsCloseFarmingPositionActions(props: Props): {
   const { account, farm, borrowAsset } = props.hlsFarm
   const { data: assets } = useAssets()
   const [slippage] = useSlippage()
-  const isOsmosis = useIsOsmosis()
   const markets = useMarkets()
   const borrowDenom = borrowAsset.denom
   const zeroCoin = BNCoin.fromDenomAndBigNumber(farm.denoms.primary, BN_ZERO)
@@ -129,7 +127,6 @@ export default function useHlsCloseFarmingPositionActions(props: Props): {
             borrowDenom,
             routeInfo,
             slippage,
-            isOsmosis,
           )
 
     return {
@@ -182,7 +179,6 @@ export default function useHlsCloseFarmingPositionActions(props: Props): {
     currentLpRewards,
     debtAmount,
     fundsLeftAfterSwap,
-    isOsmosis,
     routeInfo,
     slippage,
     swapInAmount,

src/hooks/hls/useHlsCloseStakingPositionActions.ts

@@ -1,7 +1,6 @@
 import BigNumber from 'bignumber.js'
 
 import { BN_ZERO } from 'constants/math'
-import useIsOsmosis from 'hooks/chain/useIsOsmosis'
 import useSlippage from 'hooks/settings/useSlippage'
 import useRouteInfo from 'hooks/trade/useRouteInfo'
 import { useMemo } from 'react'
@@ -19,7 +18,6 @@ export default function useHlsCloseStakingPositionActions(props: Props): {
   isLoadingRoute: boolean
 } {
   const [slippage] = useSlippage()
-  const isOsmosis = useIsOsmosis()
   const collateralDenom = props.account.strategy.denoms.deposit
   const borrowDenom = props.account.strategy.denoms.borrow
 
@@ -73,7 +71,6 @@ export default function useHlsCloseStakingPositionActions(props: Props): {
             borrowDenom,
             routeInfo,
             slippage,
-            isOsmosis,
           )
 
     return {
@@ -117,7 +114,6 @@ export default function useHlsCloseStakingPositionActions(props: Props): {
     collateralAmount,
     collateralDenom,
     debtAmount,
-    isOsmosis,
     routeInfo,
     slippage,
     swapInAmount,

src/store/slices/broadcast.ts

@@ -682,14 +682,11 @@ export default function createBroadcastSlice(
       repay: boolean
       routeInfo: SwapRouteInfo
     }) => {
-      const isOsmosis = get().chainConfig.isOsmosis
-
       const swapExactIn = getSwapExactInAction(
         options.coinIn.toActionCoin(options.isMax),
         options.denomOut,
         options.routeInfo,
         options.slippage ?? 0,
-        isOsmosis,
       )
 
       const msg: CreditManagerExecuteMsg = {

src/types/generated/mars-credit-manager/MarsCreditManager.types.ts

@@ -23,6 +23,7 @@ export interface InstantiateMsg {
   oracle: OracleBaseForString
   owner: string
   params: ParamsBaseForString
+  perps_liquidation_bonus_ratio: Decimal
   red_bank: RedBankUnchecked
   swapper: SwapperBaseForString
   zapper: ZapperBaseForString
@@ -188,8 +189,7 @@ export type Action =
       swap_exact_in: {
         coin_in: ActionCoin
         denom_out: string
-        min_receive?: Uint128
-        slippage?: Decimal
+        min_receive: Uint128
         route?: SwapperRoute | null
       }
     }
@@ -595,6 +595,7 @@ export interface ConfigUpdates {
   oracle?: OracleBaseForString | null
   params?: ParamsBaseForString | null
   perps?: PerpsBaseForString | null
+  perps_liquidation_bonus_ratio?: Decimal | null
   red_bank?: RedBankUnchecked | null
   rewards_collector?: string | null
   swapper?: SwapperBaseForString | null
@@ -616,7 +617,7 @@ export interface HealthValuesResponse {
   liquidation_threshold_adjusted_collateral: Uint128
   max_ltv_adjusted_collateral: Uint128
   max_ltv_health_factor?: Decimal | null
-  perps_pnl_losses: Uint128
+  perps_pnl_loss: Uint128
   perps_pnl_profit: Uint128
   total_collateral_value: Uint128
   total_debt_value: Uint128
@@ -802,6 +803,7 @@ export interface ConfigResponse {
   ownership: OwnerResponse
   params: string
   perps: string
+  perps_liquidation_bonus_ratio: Decimal
   red_bank: string
   rewards_collector?: RewardsCollector | null
   swapper: string

src/types/generated/mars-incentives/MarsIncentives.client.ts

@@ -15,7 +15,7 @@ import {
   Addr,
   ActionAmount,
   OwnerUpdate,
-  MigrateV2ToV2_0_1,
+  MigrateV2_1_0ToV2_2_0,
   WhitelistEntry,
   Coin,
   ActionCoin,
@@ -451,7 +451,7 @@ export interface MarsIncentivesInterface extends MarsIncentivesReadOnlyInterface
     _funds?: Coin[],
   ) => Promise<ExecuteResult>
   migrate: (
-    migrateV2ToV201: MigrateV2ToV2_0_1,
+    migrateV210ToV220: MigrateV2_1_0ToV2_2_0,
     fee?: number | StdFee | 'auto',
     memo?: string,
     _funds?: Coin[],
@@ -739,7 +739,7 @@ export class MarsIncentivesClient
     )
   }
   migrate = async (
-    migrateV2ToV201: MigrateV2ToV2_0_1,
+    migrateV210ToV220: MigrateV2_1_0ToV2_2_0,
     fee: number | StdFee | 'auto' = 'auto',
     memo?: string,
     _funds?: Coin[],
@@ -748,7 +748,7 @@ export class MarsIncentivesClient
       this.sender,
       this.contractAddress,
       {
-        migrate: migrateV2ToV201,
+        migrate: migrateV210ToV220,
       },
       fee,
       memo,

src/types/generated/mars-incentives/MarsIncentives.react-query.ts

@@ -16,7 +16,7 @@ import {
   Addr,
   ActionAmount,
   OwnerUpdate,
-  MigrateV2ToV2_0_1,
+  MigrateV2_1_0ToV2_2_0,
   WhitelistEntry,
   Coin,
   ActionCoin,
@@ -445,7 +445,7 @@ export function useMarsIncentivesStakedAstroLpRewardsQuery<
 }
 export interface MarsIncentivesMigrateMutation {
   client: MarsIncentivesClient
-  msg: MigrateV2ToV2_0_1
+  msg: MigrateV2_1_0ToV2_2_0
   args?: {
     fee?: number | StdFee | 'auto'
     memo?: string

src/types/generated/mars-incentives/MarsIncentives.types.ts

@@ -75,7 +75,7 @@ export type ExecuteMsg =
       update_owner: OwnerUpdate
     }
   | {
-      migrate: MigrateV2ToV2_0_1
+      migrate: MigrateV2_1_0ToV2_2_0
     }
 export type Uint128 = string
 export type IncentiveKind = 'red_bank' | 'perp_vault'
@@ -100,7 +100,7 @@ export type OwnerUpdate =
       }
     }
   | 'clear_emergency_owner'
-export type MigrateV2ToV2_0_1 =
+export type MigrateV2_1_0ToV2_2_0 =
   | {
       user_unclaimed_rewards: {
         limit: number

src/types/generated/mars-red-bank/MarsRedBank.client.ts

@@ -14,7 +14,6 @@ import {
   OwnerUpdate,
   Decimal,
   Uint128,
-  MigrateV1ToV2,
   InitOrUpdateAssetParams,
   InterestRateModel,
   QueryMsg,
@@ -489,12 +488,6 @@ export interface MarsRedBankInterface extends MarsRedBankReadOnlyInterface {
     memo?: string,
     _funds?: Coin[],
   ) => Promise<ExecuteResult>
-  migrate: (
-    migrateV1ToV2: MigrateV1ToV2,
-    fee?: number | StdFee | 'auto',
-    memo?: string,
-    _funds?: Coin[],
-  ) => Promise<ExecuteResult>
 }
 export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRedBankInterface {
   client: SigningCosmWasmClient
@@ -515,7 +508,6 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed
     this.repay = this.repay.bind(this)
     this.liquidate = this.liquidate.bind(this)
     this.updateAssetCollateralStatus = this.updateAssetCollateralStatus.bind(this)
-    this.migrate = this.migrate.bind(this)
   }
   updateOwner = async (
     ownerUpdate: OwnerUpdate,
@@ -777,21 +769,4 @@ export class MarsRedBankClient extends MarsRedBankQueryClient implements MarsRed
       _funds,
     )
   }
-  migrate = async (
-    migrateV1ToV2: MigrateV1ToV2,
-    fee: number | StdFee | 'auto' = 'auto',
-    memo?: string,
-    _funds?: Coin[],
-  ): Promise<ExecuteResult> => {
-    return await this.client.execute(
-      this.sender,
-      this.contractAddress,
-      {
-        migrate: migrateV1ToV2,
-      },
-      fee,
-      memo,
-      _funds,
-    )
-  }
 }

src/types/generated/mars-red-bank/MarsRedBank.react-query.ts

@@ -15,7 +15,6 @@ import {
   OwnerUpdate,
   Decimal,
   Uint128,
-  MigrateV1ToV2,
   InitOrUpdateAssetParams,
   InterestRateModel,
   QueryMsg,
@@ -616,26 +615,6 @@ export function useMarsRedBankConfigQuery<TData = ConfigResponse>({
     },
   )
 }
-export interface MarsRedBankMigrateMutation {
-  client: MarsRedBankClient
-  msg: MigrateV1ToV2
-  args?: {
-    fee?: number | StdFee | 'auto'
-    memo?: string
-    funds?: Coin[]
-  }
-}
-export function useMarsRedBankMigrateMutation(
-  options?: Omit<
-    UseMutationOptions<ExecuteResult, Error, MarsRedBankMigrateMutation>,
-    'mutationFn'
-  >,
-) {
-  return useMutation<ExecuteResult, Error, MarsRedBankMigrateMutation>(
-    ({ client, msg, args: { fee, memo, funds } = {} }) => client.migrate(msg, fee, memo, funds),
-    options,
-  )
-}
 export interface MarsRedBankUpdateAssetCollateralStatusMutation {
   client: MarsRedBankClient
   msg: {