update health computer + fix comments

# Conflicts:
#	.env
#	src/components/perps/BalancesTable/index.tsx

src/components/perps/BalancesTable/Columns/PnL.tsx

@@ -14,7 +14,7 @@ type Props = {
 
 export default function PnL(props: Props) {
   return (
-    <Tooltip content={<PnLTooltip {...props} />} type='info' underline>
+    <Tooltip content={<PnLTooltip {...props} />} type='info' underline className='w-min ml-auto'>
       <DisplayCurrency
         className='inline text-xs'
         coin={props.pnl.net}

src/components/perps/Module/PerpsModule.tsx

@@ -104,7 +104,7 @@ export function PerpsModule() {
       />
       <AssetAmountInput
         label='Amount'
-        max={BN(100000000)} // TODO: Implement max calculation
+        max={BN(10000000000)} // TODO: Implement max calculation
         amount={amount.abs()}
         setAmount={onChangeAmount}
         asset={perpsAsset}

src/components/perps/Module/TradingFee.tsx

@@ -3,6 +3,7 @@ import BigNumber from 'bignumber.js'
 import { CircularProgress } from 'components/common/CircularProgress'
 import DisplayCurrency from 'components/common/DisplayCurrency'
 import useTradingFeeAndPrice from 'hooks/perps/useTradingFeeAndPrice'
+import { BNCoin } from 'types/classes/BNCoin'
 
 type Props = {
   denom: string
@@ -20,5 +21,12 @@ export default function TradingFee(props: Props) {
   if (isLoading) return <CircularProgress className='h-full' size={12} />
   if (props.newAmount.isEqualTo(props.previousAmount) || !tradingFeeAndPrice?.fee) return '-'
 
-  return <DisplayCurrency coin={tradingFeeAndPrice.fee} />
+  return (
+    <DisplayCurrency
+      coin={BNCoin.fromDenomAndBigNumber(
+        tradingFeeAndPrice.baseDenom,
+        tradingFeeAndPrice.fee.opening.plus(tradingFeeAndPrice.fee.closing),
+      )}
+    />
+  )
 }

src/hooks/perps/useTradingFeeAndPrice.ts

@@ -6,7 +6,6 @@ import useCurrentAccount from 'hooks/accounts/useCurrentAccount'
 import useChainConfig from 'hooks/useChainConfig'
 import useClients from 'hooks/useClients'
 import useDebounce from 'hooks/useDebounce'
-import { BNCoin } from 'types/classes/BNCoin'
 import { BN } from 'utils/helpers'
 
 export default function useTradingFeeAndPrice(
@@ -34,14 +33,15 @@ export default function useTradingFeeAndPrice(
         })
 
         return {
+          baseDenom: positionFees.base_denom,
           price: positionFees.opening_exec_price
             ? BN(positionFees.opening_exec_price)
             : BN(positionFees.closing_exec_price ?? BN_ZERO),
-          fee: BNCoin.fromDenomAndBigNumber(
+          fee: {
-            positionFees.base_denom,
+            opening: BN(positionFees.opening_fee),
-            BN(positionFees.opening_fee).plus(positionFees.closing_fee),
+            closing: BN(positionFees.closing_fee),
-          ),
+          },
-          rate: BN(0.005),
+          rate: BN(0.0005),
         }
       }
 
@@ -61,15 +61,13 @@ export default function useTradingFeeAndPrice(
 
       return await Promise.all([closingPositionFees$, openingPositionFees$]).then(
         ([closingPositionFees, openingPositionFees]) => ({
+          baseDenom: openingPositionFees.base_denom,
           price: BN(openingPositionFees.opening_exec_price ?? 0),
-          fee: BNCoin.fromDenomAndBigNumber(
+          fee: {
-            closingPositionFees.base_denom,
+            opening: BN(closingPositionFees.opening_fee).plus(openingPositionFees.opening_fee),
-            BN(closingPositionFees.opening_fee)
+            closing: BN(closingPositionFees.closing_fee).plus(openingPositionFees.closing_fee),
-              .plus(closingPositionFees.closing_fee)
+          },
-              .plus(openingPositionFees.opening_fee)
+          rate: BN(0.0005), // TODO: Make this rate the actula rate again!
-              .plus(openingPositionFees.closing_fee),
-          ),
-          rate: BN(0.005),
         }),
       )
     },

src/hooks/useHealthComputer.tsx

@@ -14,6 +14,7 @@ import { VaultConfigBaseForString } from 'types/generated/mars-params/MarsParams
 import {
   AssetParamsBaseForAddr,
   HealthComputer,
+  Positions,
 } from 'types/generated/mars-rover-health-computer/MarsRoverHealthComputer.types'
 import { convertAccountToPositions } from 'utils/accounts'
 import { byDenom } from 'utils/array'
@@ -32,7 +33,8 @@ import { BN } from 'utils/helpers'
 
 // Pyth returns prices with up to 32 decimals. Javascript only supports 18 decimals. So we need to scale by 14 t
 // avoid "too many decimals" errors.
-const VALUE_SCALE_FACTOR = 14
+// TODO: Remove adjustment properly (after testing). We will just ignore the last 14 decimals.
+const VALUE_SCALE_FACTOR = 0
 
 export default function useHealthComputer(account?: Account) {
   const assets = useAllAssets()
@@ -42,10 +44,10 @@ export default function useHealthComputer(account?: Account) {
   const [slippage] = useLocalStorage<number>(LocalStorageKeys.SLIPPAGE, DEFAULT_SETTINGS.slippage)
 
   const [healthFactor, setHealthFactor] = useState(0)
-  const positions: PositionsWithoutPerps | null = useMemo(() => {
+  const positions: Positions | null = useMemo(() => {
     if (!account) return null
-    return convertAccountToPositions(account)
+    return convertAccountToPositions(account, prices)
-  }, [account])
+  }, [account, prices])
 
   const vaultPositionValues = useMemo(() => {
     if (!account?.vaults) return null
@@ -87,6 +89,7 @@ export default function useHealthComputer(account?: Account) {
         prev[curr.denom] = curr.amount
           .shiftedBy(VALUE_SCALE_FACTOR)
           .shiftedBy(-decimals + 6)
+          .decimalPlaces(18)
           .toString()
         return prev
       },

src/types/classes/BNCoin.ts

@@ -1,4 +1,4 @@
-import { ActionCoin } from 'types/generated/mars-credit-manager/MarsCreditManager.types'
+import { ActionCoin, PnL } from 'types/generated/mars-credit-manager/MarsCreditManager.types'
 import { BN } from 'utils/helpers'
 
 export class BNCoin {
@@ -23,7 +23,7 @@ export class BNCoin {
   toCoin(): Coin {
     return {
       denom: this.denom,
-      amount: this.amount.toString(),
+      amount: this.amount.integerValue().toString(),
     }
   }
 
@@ -33,7 +33,7 @@ export class BNCoin {
       amount: max
         ? 'account_balance'
         : {
-            exact: this.amount.toString(),
+            exact: this.amount.integerValue().toString(),
           },
     }
   }
@@ -41,7 +41,23 @@ export class BNCoin {
   toSignedCoin(): any {
     return {
       denom: this.denom,
-      size: this.amount.toString(),
+      size: this.amount.integerValue().toString(),
+    }
+  }
+
+  toPnLCoin(): PnL {
+    if (this.amount.isZero()) {
+      return 'break_even'
+    }
+
+    if (this.amount.isPositive()) {
+      return {
+        profit: this.toCoin(),
+      }
+    }
+
+    return {
+      loss: this.abs().toCoin(),
     }
   }
 

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

@@ -69,6 +69,7 @@ import {
   Positions,
   DebtAmount,
   PerpPosition,
+  PnlAmounts,
   PositionPnl,
   PnlCoins,
   PnlValues,

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

@@ -28,387 +28,387 @@ export interface InstantiateMsg {
 }
 export type ExecuteMsg =
   | {
-  create_credit_account: AccountKind
+      create_credit_account: AccountKind
-}
+    }
   | {
-  update_credit_account: {
+      update_credit_account: {
-    account_id: string
+        account_id: string
-    actions: Action[]
+        actions: Action[]
-  }
+      }
-}
+    }
   | {
-  repay_from_wallet: {
+      repay_from_wallet: {
-    account_id: string
+        account_id: string
-  }
+      }
-}
+    }
   | {
-  update_config: {
+      update_config: {
-    updates: ConfigUpdates
+        updates: ConfigUpdates
-  }
+      }
-}
+    }
   | {
-  update_owner: OwnerUpdate
+      update_owner: OwnerUpdate
-}
+    }
   | {
-  update_nft_config: {
+      update_nft_config: {
-    config?: NftConfigUpdates | null
+        config?: NftConfigUpdates | null
-    ownership?: Action2 | null
+        ownership?: Action2 | null
-  }
+      }
-}
+    }
   | {
-  callback: CallbackMsg
+      callback: CallbackMsg
-}
+    }
 export type AccountKind = 'default' | 'high_levered_strategy'
 export type Action =
   | {
-  deposit: Coin
+      deposit: Coin
-}
+    }
   | {
-  withdraw: ActionCoin
+      withdraw: ActionCoin
-}
+    }
   | {
-  borrow: Coin
+      borrow: Coin
-}
+    }
   | {
-  lend: ActionCoin
+      lend: ActionCoin
-}
+    }
   | {
-  reclaim: ActionCoin
+      reclaim: ActionCoin
-}
+    }
   | {
-  claim_rewards: {}
+      claim_rewards: {}
-}
+    }
   | {
-  repay: {
+      repay: {
-    coin: ActionCoin
+        coin: ActionCoin
-    recipient_account_id?: string | null
+        recipient_account_id?: string | null
-  }
+      }
-}
+    }
   | {
-  open_perp: {
+      open_perp: {
-    denom: string
+        denom: string
-    size: SignedDecimal
+        size: SignedDecimal
-  }
+      }
-}
+    }
   | {
-  close_perp: {
+      close_perp: {
-    denom: string
+        denom: string
-  }
+      }
-}
+    }
   | {
-  modify_perp: {
+      modify_perp: {
-    denom: string
+        denom: string
-    new_size: SignedDecimal
+        new_size: SignedDecimal
-  }
+      }
-}
+    }
   | {
-  enter_vault: {
+      enter_vault: {
-    coin: ActionCoin
+        coin: ActionCoin
-    vault: VaultBaseForString
+        vault: VaultBaseForString
-  }
+      }
-}
+    }
   | {
-  exit_vault: {
+      exit_vault: {
-    amount: Uint128
+        amount: Uint128
-    vault: VaultBaseForString
+        vault: VaultBaseForString
-  }
+      }
-}
+    }
   | {
-  request_vault_unlock: {
+      request_vault_unlock: {
-    amount: Uint128
+        amount: Uint128
-    vault: VaultBaseForString
+        vault: VaultBaseForString
-  }
+      }
-}
+    }
   | {
-  exit_vault_unlocked: {
+      exit_vault_unlocked: {
-    id: number
+        id: number
-    vault: VaultBaseForString
+        vault: VaultBaseForString
-  }
+      }
-}
+    }
   | {
-  liquidate: {
+      liquidate: {
-    debt_coin: Coin
+        debt_coin: Coin
-    liquidatee_account_id: string
+        liquidatee_account_id: string
-    request: LiquidateRequestForVaultBaseForString
+        request: LiquidateRequestForVaultBaseForString
-  }
+      }
-}
+    }
   | {
-  swap_exact_in: {
+      swap_exact_in: {
-    coin_in: ActionCoin
+        coin_in: ActionCoin
-    denom_out: string
+        denom_out: string
-    slippage: Decimal
+        slippage: Decimal
-  }
+      }
-}
+    }
   | {
-  provide_liquidity: {
+      provide_liquidity: {
-    coins_in: ActionCoin[]
+        coins_in: ActionCoin[]
-    lp_token_out: string
+        lp_token_out: string
-    slippage: Decimal
+        slippage: Decimal
-  }
+      }
-}
+    }
   | {
-  withdraw_liquidity: {
+      withdraw_liquidity: {
-    lp_token: ActionCoin
+        lp_token: ActionCoin
-    slippage: Decimal
+        slippage: Decimal
-  }
+      }
-}
+    }
   | {
-  refund_all_coin_balances: {}
+      refund_all_coin_balances: {}
-}
+    }
 export type ActionAmount =
   | 'account_balance'
   | {
-  exact: Uint128
+      exact: Uint128
-}
+    }
 export type LiquidateRequestForVaultBaseForString =
   | {
-  deposit: string
+      deposit: string
-}
+    }
   | {
-  lend: string
+      lend: string
-}
+    }
   | {
-  vault: {
+      vault: {
-    position_type: VaultPositionType
+        position_type: VaultPositionType
-    request_vault: VaultBaseForString
+        request_vault: VaultBaseForString
-  }
+      }
-}
+    }
 export type VaultPositionType = 'u_n_l_o_c_k_e_d' | 'l_o_c_k_e_d' | 'u_n_l_o_c_k_i_n_g'
 export type AccountNftBaseForString = string
 export type PerpsBaseForString = string
 export type OwnerUpdate =
   | {
-  propose_new_owner: {
+      propose_new_owner: {
-    proposed: string
+        proposed: string
-  }
+      }
-}
+    }
   | 'clear_proposed'
   | 'accept_proposed'
   | 'abolish_owner_role'
   | {
-  set_emergency_owner: {
+      set_emergency_owner: {
-    emergency_owner: string
+        emergency_owner: string
-  }
+      }
-}
+    }
   | 'clear_emergency_owner'
 export type Action2 =
   | {
-  transfer_ownership: {
+      transfer_ownership: {
-    expiry?: Expiration | null
+        expiry?: Expiration | null
-    new_owner: string
+        new_owner: string
-  }
+      }
-}
+    }
   | 'accept_ownership'
   | 'renounce_ownership'
 export type Expiration =
   | {
-  at_height: number
+      at_height: number
-}
+    }
   | {
-  at_time: Timestamp
+      at_time: Timestamp
-}
+    }
   | {
-  never: {}
+      never: {}
-}
+    }
 export type Timestamp = Uint64
 export type Uint64 = string
 export type CallbackMsg =
   | {
-  withdraw: {
+      withdraw: {
-    account_id: string
+        account_id: string
-    coin: ActionCoin
+        coin: ActionCoin
-    recipient: Addr
+        recipient: Addr
-  }
+      }
-}
+    }
   | {
-  borrow: {
+      borrow: {
-    account_id: string
+        account_id: string
-    coin: Coin
+        coin: Coin
-  }
+      }
-}
+    }
   | {
-  repay: {
+      repay: {
-    account_id: string
+        account_id: string
-    coin: ActionCoin
+        coin: ActionCoin
-  }
+      }
-}
+    }
   | {
-  repay_for_recipient: {
+      repay_for_recipient: {
-    benefactor_account_id: string
+        benefactor_account_id: string
-    coin: ActionCoin
+        coin: ActionCoin
-    recipient_account_id: string
+        recipient_account_id: string
-  }
+      }
-}
+    }
   | {
-  lend: {
+      lend: {
-    account_id: string
+        account_id: string
-    coin: ActionCoin
+        coin: ActionCoin
-  }
+      }
-}
+    }
   | {
-  reclaim: {
+      reclaim: {
-    account_id: string
+        account_id: string
-    coin: ActionCoin
+        coin: ActionCoin
-  }
+      }
-}
+    }
   | {
-  claim_rewards: {
+      claim_rewards: {
-    account_id: string
+        account_id: string
-    recipient: Addr
+        recipient: Addr
-  }
+      }
-}
+    }
   | {
-  assert_max_ltv: {
+      assert_max_ltv: {
-    account_id: string
+        account_id: string
-    prev_health_state: HealthState
+        prev_health_state: HealthState
-  }
+      }
-}
+    }
   | {
-  assert_deposit_caps: {
+      assert_deposit_caps: {
-    denoms: string[]
+        denoms: string[]
-  }
+      }
-}
+    }
   | {
-  open_perp: {
+      open_perp: {
-    account_id: string
+        account_id: string
-    denom: string
+        denom: string
-    size: SignedDecimal
+        size: SignedDecimal
-  }
+      }
-}
+    }
   | {
-  close_perp: {
+      close_perp: {
-    account_id: string
+        account_id: string
-    denom: string
+        denom: string
-  }
+      }
-}
+    }
   | {
-  modify_perp: {
+      modify_perp: {
-    account_id: string
+        account_id: string
-    denom: string
+        denom: string
-    new_size: SignedDecimal
+        new_size: SignedDecimal
-  }
+      }
-}
+    }
   | {
-  enter_vault: {
+      enter_vault: {
-    account_id: string
+        account_id: string
-    coin: ActionCoin
+        coin: ActionCoin
-    vault: VaultBaseForAddr
+        vault: VaultBaseForAddr
-  }
+      }
-}
+    }
   | {
-  exit_vault: {
+      exit_vault: {
-    account_id: string
+        account_id: string
-    amount: Uint128
+        amount: Uint128
-    vault: VaultBaseForAddr
+        vault: VaultBaseForAddr
-  }
+      }
-}
+    }
   | {
-  update_vault_coin_balance: {
+      update_vault_coin_balance: {
-    account_id: string
+        account_id: string
-    previous_total_balance: Uint128
+        previous_total_balance: Uint128
-    vault: VaultBaseForAddr
+        vault: VaultBaseForAddr
-  }
+      }
-}
+    }
   | {
-  request_vault_unlock: {
+      request_vault_unlock: {
-    account_id: string
+        account_id: string
-    amount: Uint128
+        amount: Uint128
-    vault: VaultBaseForAddr
+        vault: VaultBaseForAddr
-  }
+      }
-}
+    }
   | {
-  exit_vault_unlocked: {
+      exit_vault_unlocked: {
-    account_id: string
+        account_id: string
-    position_id: number
+        position_id: number
-    vault: VaultBaseForAddr
+        vault: VaultBaseForAddr
-  }
+      }
-}
+    }
   | {
-  liquidate: {
+      liquidate: {
-    debt_coin: Coin
+        debt_coin: Coin
-    liquidatee_account_id: string
+        liquidatee_account_id: string
-    liquidator_account_id: string
+        liquidator_account_id: string
-    request: LiquidateRequestForVaultBaseForAddr
+        request: LiquidateRequestForVaultBaseForAddr
-  }
+      }
-}
+    }
   | {
-  swap_exact_in: {
+      swap_exact_in: {
-    account_id: string
+        account_id: string
-    coin_in: ActionCoin
+        coin_in: ActionCoin
-    denom_out: string
+        denom_out: string
-    slippage: Decimal
+        slippage: Decimal
-  }
+      }
-}
+    }
   | {
-  update_coin_balance: {
+      update_coin_balance: {
-    account_id: string
+        account_id: string
-    change: ChangeExpected
+        change: ChangeExpected
-    previous_balance: Coin
+        previous_balance: Coin
-  }
+      }
-}
+    }
   | {
-  update_coin_balance_after_vault_liquidation: {
+      update_coin_balance_after_vault_liquidation: {
-    account_id: string
+        account_id: string
-    previous_balance: Coin
+        previous_balance: Coin
-    protocol_fee: Decimal
+        protocol_fee: Decimal
-  }
+      }
-}
+    }
   | {
-  provide_liquidity: {
+      provide_liquidity: {
-    account_id: string
+        account_id: string
-    coins_in: ActionCoin[]
+        coins_in: ActionCoin[]
-    lp_token_out: string
+        lp_token_out: string
-    slippage: Decimal
+        slippage: Decimal
-  }
+      }
-}
+    }
   | {
-  withdraw_liquidity: {
+      withdraw_liquidity: {
-    account_id: string
+        account_id: string
-    lp_token: ActionCoin
+        lp_token: ActionCoin
-    slippage: Decimal
+        slippage: Decimal
-  }
+      }
-}
+    }
   | {
-  refund_all_coin_balances: {
+      refund_all_coin_balances: {
-    account_id: string
+        account_id: string
-  }
+      }
-}
+    }
   | {
-  assert_hls_rules: {
+      assert_hls_rules: {
-    account_id: string
+        account_id: string
-  }
+      }
-}
+    }
   | {
-  remove_reentrancy_guard: {}
+      remove_reentrancy_guard: {}
-}
+    }
   | {
-  send_rewards_to_addr: {
+      send_rewards_to_addr: {
-    account_id: string
+        account_id: string
-    previous_balances: Coin[]
+        previous_balances: Coin[]
-    recipient: Addr
+        recipient: Addr
-  }
+      }
-}
+    }
 export type Addr = string
 export type HealthState =
   | 'healthy'
   | {
-  unhealthy: {
+      unhealthy: {
-    max_ltv_health_factor: Decimal
+        max_ltv_health_factor: Decimal
-  }
+      }
-}
+    }
 export type LiquidateRequestForVaultBaseForAddr =
   | {
-  deposit: string
+      deposit: string
-}
+    }
   | {
-  lend: string
+      lend: string
-}
+    }
   | {
-  vault: {
+      vault: {
-    position_type: VaultPositionType
+        position_type: VaultPositionType
-    request_vault: VaultBaseForAddr
+        request_vault: VaultBaseForAddr
-  }
+      }
-}
+    }
 export type ChangeExpected = 'increase' | 'decrease'
 export interface Coin {
   amount: Uint128
@@ -451,80 +451,80 @@ export interface VaultBaseForAddr {
 }
 export type QueryMsg =
   | {
-  account_kind: {
+      account_kind: {
-    account_id: string
+        account_id: string
-  }
+      }
-}
+    }
   | {
-  accounts: {
+      accounts: {
-    limit?: number | null
+        limit?: number | null
-    owner: string
+        owner: string
-    start_after?: string | null
+        start_after?: string | null
-  }
+      }
-}
+    }
   | {
-  config: {}
+      config: {}
-}
+    }
   | {
-  vault_utilization: {
+      vault_utilization: {
-    vault: VaultBaseForString
+        vault: VaultBaseForString
-  }
+      }
-}
+    }
   | {
-  positions: {
+      positions: {
-    account_id: string
+        account_id: string
-  }
+      }
-}
+    }
   | {
-  all_coin_balances: {
+      all_coin_balances: {
-    limit?: number | null
+        limit?: number | null
-    start_after?: [string, string] | null
+        start_after?: [string, string] | null
-  }
+      }
-}
+    }
   | {
-  all_debt_shares: {
+      all_debt_shares: {
-    limit?: number | null
+        limit?: number | null
-    start_after?: [string, string] | null
+        start_after?: [string, string] | null
-  }
+      }
-}
+    }
   | {
-  total_debt_shares: string
+      total_debt_shares: string
-}
+    }
   | {
-  all_total_debt_shares: {
+      all_total_debt_shares: {
-    limit?: number | null
+        limit?: number | null
-    start_after?: string | null
+        start_after?: string | null
-  }
+      }
-}
+    }
   | {
-  all_vault_positions: {
+      all_vault_positions: {
-    limit?: number | null
+        limit?: number | null
-    start_after?: [string, string] | null
+        start_after?: [string, string] | null
-  }
+      }
-}
+    }
   | {
-  estimate_provide_liquidity: {
+      estimate_provide_liquidity: {
-    coins_in: Coin[]
+        coins_in: Coin[]
-    lp_token_out: string
+        lp_token_out: string
-  }
+      }
-}
+    }
   | {
-  estimate_withdraw_liquidity: {
+      estimate_withdraw_liquidity: {
-    lp_token: Coin
+        lp_token: Coin
-  }
+      }
-}
+    }
   | {
-  vault_position_value: {
+      vault_position_value: {
-    vault_position: VaultPosition
+        vault_position: VaultPosition
-  }
+      }
-}
+    }
 export type VaultPositionAmount =
   | {
-  unlocked: VaultAmount
+      unlocked: VaultAmount
-}
+    }
   | {
-  locking: LockingVaultAmount
+      locking: LockingVaultAmount
-}
+    }
 export type VaultAmount = string
 export type VaultAmount1 = string
 export type UnlockingPositions = VaultUnlockingPosition[]
@@ -597,11 +597,11 @@ export type ArrayOfCoin = Coin[]
 export type PnL =
   | 'break_even'
   | {
-  profit: Coin
+      profit: Coin
-}
+    }
   | {
-  loss: Coin
+      loss: Coin
-}
+    }
 export interface Positions {
   account_id: string
   debts: DebtAmount[]
@@ -623,11 +623,11 @@ export interface PerpPosition {
   denom: string
   entry_exec_price: Decimal
   entry_price: Decimal
-  realised_pnl: RealizedPnlAmounts
+  realised_pnl: PnlAmounts
   size: SignedDecimal
   unrealised_pnl: PositionPnl
 }
-export interface RealizedPnlAmounts {
+export interface PnlAmounts {
   accrued_funding: SignedDecimal
   closing_fee: SignedDecimal
   opening_fee: SignedDecimal
@@ -635,6 +635,7 @@ export interface RealizedPnlAmounts {
   price_pnl: SignedDecimal
 }
 export interface PositionPnl {
+  amounts: PnlAmounts
   coins: PnlCoins
   values: PnlValues
 }

src/types/generated/mars-rover-health-computer/MarsRoverHealthComputer.client.ts

@@ -27,10 +27,11 @@ import {
   DebtAmount,
   Coin,
   PerpPosition,
+  PnlAmounts,
+  SignedDecimal,
   PositionPnl,
   PnlCoins,
   PnlValues,
-  SignedDecimal,
   VaultPosition,
   LockingVaultAmount,
   VaultUnlockingPosition,

src/types/generated/mars-rover-health-computer/MarsRoverHealthComputer.react-query.ts

@@ -27,10 +27,11 @@ import {
   DebtAmount,
   Coin,
   PerpPosition,
+  PnlAmounts,
+  SignedDecimal,
   PositionPnl,
   PnlCoins,
   PnlValues,
-  SignedDecimal,
   VaultPosition,
   LockingVaultAmount,
   VaultUnlockingPosition,

src/types/generated/mars-rover-health-computer/MarsRoverHealthComputer.types.ts

@@ -41,7 +41,7 @@ export type UnlockingPositions = VaultUnlockingPosition[]
 export interface HealthComputer {
   denoms_data: DenomsData
   kind: AccountKind
-  positions: PositionsWithoutPerps
+  positions: Positions
   vaults_data: VaultsData
 }
 export interface DenomsData {
@@ -102,13 +102,29 @@ export interface Coin {
 export interface PerpPosition {
   base_denom: string
   closing_fee_rate: Decimal
+  current_exec_price: Decimal
   current_price: Decimal
   denom: string
+  entry_exec_price: Decimal
   entry_price: Decimal
-  pnl: PositionPnl
+  realised_pnl: PnlAmounts
   size: SignedDecimal
+  unrealised_pnl: PositionPnl
+}
+export interface PnlAmounts {
+  accrued_funding: SignedDecimal
+  closing_fee: SignedDecimal
+  opening_fee: SignedDecimal
+  pnl: SignedDecimal
+  price_pnl: SignedDecimal
+}
+export interface SignedDecimal {
+  abs: Decimal
+  negative: boolean
+  [k: string]: unknown
 }
 export interface PositionPnl {
+  amounts: PnlAmounts
   coins: PnlCoins
   values: PnlValues
 }
@@ -122,11 +138,6 @@ export interface PnlValues {
   pnl: SignedDecimal
   price_pnl: SignedDecimal
 }
-export interface SignedDecimal {
-  abs: Decimal
-  negative: boolean
-  [k: string]: unknown
-}
 export interface VaultPosition {
   amount: VaultPositionAmount
   vault: VaultBaseForAddr

src/types/interfaces/perps.d.ts

@@ -1,11 +1,5 @@
 type TradeDirection = 'long' | 'short'
 
-// TODO: 📈Remove this type when healthcomputer is implemented
-type PositionsWithoutPerps = Omit<
-  import('types/generated/mars-credit-manager/MarsCreditManager.types').Positions,
-  'perps'
->
-
 interface PerpsPosition {
   denom: string
   baseDenom: string
@@ -13,6 +7,7 @@ interface PerpsPosition {
   amount: BigNumber
   pnl: PerpsPnL
   entryPrice: BigNumber
+  closingFeeRate: BigNumber
 }
 
 interface PerpPositionRow extends PerpsPosition {

src/utils/accounts.ts

@@ -4,6 +4,7 @@ import { BN_ZERO } from 'constants/math'
 import { ORACLE_DENOM } from 'constants/oracle'
 import { BNCoin } from 'types/classes/BNCoin'
 import { VaultPosition } from 'types/generated/mars-credit-manager/MarsCreditManager.types'
+import { Positions } from 'types/generated/mars-rover-health-computer/MarsRoverHealthComputer.types'
 import { byDenom } from 'utils/array'
 import { BN } from 'utils/helpers'
 import { convertApyToApr } from 'utils/parsers'
@@ -174,7 +175,7 @@ export function accumulateAmounts(denom: string, coins: BNCoin[]): BigNumber {
 }
 
 // TODO: 📈 Add correct type mapping
-export function convertAccountToPositions(account: Account): PositionsWithoutPerps {
+export function convertAccountToPositions(account: Account, prices: BNCoin[]): Positions {
   return {
     account_id: account.id,
     debts: account.debts.map((debt) => ({
@@ -188,6 +189,66 @@ export function convertAccountToPositions(account: Account): PositionsWithoutPer
       amount: lend.amount.toString(),
       denom: lend.denom,
     })),
+    perps: account.perps.map((perpPosition) => {
+      // TODO: Check if this needs to be converted (in regards to HC decimal scaling)
+      const currentPrice = prices.find(byDenom(perpPosition.denom))?.amount ?? BN_ZERO
+      return {
+        // Used
+        base_denom: perpPosition.baseDenom,
+        // Used
+        closing_fee_rate: perpPosition.closingFeeRate.toString(),
+        // Used
+        current_price: currentPrice.toString(), // Check what prices we should pass to current and entry prices. Entry price will change when modifying positionl
+        current_exec_price: currentPrice.toString(), // TODO: 📈 This needs to be queried
+        denom: perpPosition.denom,
+        // Used (for now, this might be changed)
+        entry_price: currentPrice.toString(),
+        // Used (not actually used, but it's in todo)
+        entry_exec_price: currentPrice.toString(), // TODO: 📈 Check if this matters (currently just using entry price)
+        // Used
+        size: perpPosition.amount.toString() as any,
+        unrealised_pnl: {
+          coins: {
+            closing_fee: perpPosition.pnl.unrealized.fees.abs().toCoin(),
+            // Used
+            pnl: perpPosition.pnl.unrealized.net.toPnLCoin(), // Used
+          },
+          amounts: {
+            // CHeck if these are correct
+            accrued_funding: perpPosition.pnl.unrealized.funding.amount
+              .integerValue()
+              .toString() as any,
+            opening_fee: perpPosition.pnl.unrealized.fees.amount
+              .abs()
+              .integerValue()
+              .toString() as any, // Add openning fee for modifying position
+            closing_fee: perpPosition.pnl.unrealized.fees.amount
+              .abs()
+              .integerValue()
+              .toString() as any, // Add closing fee for modifying position
+            pnl: perpPosition.pnl.unrealized.net.amount.integerValue().toString() as any,
+            price_pnl: perpPosition.pnl.unrealized.price.amount.integerValue().toString() as any,
+          },
+          values: {
+            // This does not matter for health calculation
+            accrued_funding: perpPosition.pnl.unrealized.funding.amount
+              .integerValue()
+              .toString() as any,
+            closing_fee: perpPosition.pnl.unrealized.fees.amount.integerValue().toString() as any,
+            pnl: perpPosition.pnl.unrealized.net.amount.integerValue().toString() as any,
+            price_pnl: perpPosition.pnl.unrealized.price.amount.integerValue().toString() as any,
+          },
+        },
+        realised_pnl: {
+          // This does not matter for the health calculation
+          accrued_funding: perpPosition.pnl.realized.funding.amount.toString() as any,
+          closing_fee: perpPosition.pnl.realized.fees.amount.toString() as any,
+          opening_fee: perpPosition.pnl.realized.fees.amount.toString() as any,
+          pnl: perpPosition.pnl.realized.net.amount.toString() as any,
+          price_pnl: perpPosition.pnl.realized.price.amount.toString() as any,
+        },
+      }
+    }),
     vaults: account.vaults.map(
       (vault) =>
         ({

src/utils/getPerpsPosition.ts

@@ -2,16 +2,17 @@ import BigNumber from 'bignumber.js'
 
 import { BN_ONE, BN_ZERO } from 'constants/math'
 import { BNCoin } from 'types/classes/BNCoin'
+import { BN } from 'utils/helpers'
 
 export default function getPerpsPosition(
   asset: Asset,
   amount: BigNumber,
   tradeDirection: TradeDirection,
-) {
+): PerpsPosition {
   const perpsBaseDenom = 'ibc/F91EA2C0A23697A1048E08C2F787E3A58AC6F706A1CD2257A504925158CFC0F3'
   return {
     amount,
-    closingFee: BNCoin.fromDenomAndBigNumber(perpsBaseDenom, BN_ONE),
+    closingFeeRate: BN(0.0005), // TODO: Pass the actual rate
     pnl: {
       net: BNCoin.fromDenomAndBigNumber(perpsBaseDenom, BN_ONE),
       realized: {

src/utils/health_computer/index.d.ts

@@ -96,10 +96,10 @@ export interface InitOutput {
     h: number,
   ) => void
   readonly liquidation_price_js: (a: number, b: number, c: number, d: number, e: number) => void
+  readonly interface_version_8: () => void
   readonly allocate: (a: number) => number
   readonly deallocate: (a: number) => void
   readonly requires_iterator: () => void
-  readonly interface_version_8: () => void
   readonly __wbindgen_malloc: (a: number, b: number) => number
   readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number
   readonly __wbindgen_add_to_stack_pointer: (a: number) => number

src/utils/health_computer/index.js

@@ -296,6 +296,7 @@ async function __wbg_load(module, imports) {
 function __wbg_get_imports() {
   const imports = {}
   imports.wbg = {}
+  imports.wbg.__wbg_log_117d9799fa4f6287 = function (arg0, arg1, arg2, arg3) {}
   imports.wbg.__wbindgen_object_clone_ref = function (arg0) {
     const ret = getObject(arg0)
     return addHeapObject(ret)

src/utils/health_computer/index_bg.wasm.d.ts

@@ -15,10 +15,10 @@ export function max_swap_estimate_js(
   h: number,
 ): void
 export function liquidation_price_js(a: number, b: number, c: number, d: number, e: number): void
+export function interface_version_8(): void
 export function allocate(a: number): number
 export function deallocate(a: number): void
 export function requires_iterator(): void
-export function interface_version_8(): void
 export function __wbindgen_malloc(a: number, b: number): number
 export function __wbindgen_realloc(a: number, b: number, c: number, d: number): number
 export function __wbindgen_add_to_stack_pointer(a: number): number

src/utils/resolvers.ts

@@ -118,7 +118,7 @@ export function resolvePerpsPositions(
       baseDenom: position.base_denom,
       amount: BN(position.size as any), // Amount is negative for SHORT positions
       tradeDirection: BN(position.size as any).isNegative() ? 'short' : 'long',
-      // closingFee: BNCoin.fromCoin(position.pnl.coins.closing_fee),
+      closingFeeRate: BN(position.closing_fee_rate),
       pnl: {
         net: BNCoin.fromDenomAndBigNumber(
           position.base_denom,