Merge branch 'develop' of https://github.com/mars-protocol/mars-v2-fr…

…ontend into simple-spot

# Conflicts:
#	src/components/Trade/TradeChart/TVChartContainer.tsx
#	src/components/Trade/TradeChart/index.tsx

src/api/cache.ts

@@ -61,3 +61,4 @@ export const allParamsCache: Cache<AssetParamsBaseForAddr[]> = new Map()
 export const underlyingDebtCache: Cache<string> = new Map()
 export const previewDepositCache: Cache<{ vaultAddress: string; amount: string }> = new Map()
 export const stakingAprCache: Cache<StakingApr[]> = new Map()
+export const assetParamsCache: Cache<AssetParamsBaseForAddr[]> = new Map()

src/api/params/getAssetParams.ts

@@ -1,11 +1,19 @@
+import { assetParamsCache, cacheFn } from 'api/cache'
 import { getParamsQueryClient } from 'api/cosmwasm-client'
 import { AssetParamsBaseForAddr } from 'types/generated/mars-params/MarsParams.types'
 import iterateContractQuery from 'utils/iterateContractQuery'
 
 export default async function getAssetParams(): Promise<AssetParamsBaseForAddr[]> {
   try {
-    const paramsQueryClient = await getParamsQueryClient()
-    return iterateContractQuery(paramsQueryClient.allAssetParams)
+    return await cacheFn(
+      async () => {
+        const paramsQueryClient = await getParamsQueryClient()
+        return iterateContractQuery(paramsQueryClient.allAssetParams)
+      },
+      assetParamsCache,
+      'assetParams',
+      600,
+    )
   } catch (ex) {
     throw ex
   }

src/api/vaults/getDepositedVaults.ts

@@ -62,7 +62,7 @@ async function getVaultPositionStatusAndUnlockIdAndUnlockTime(
   }
 }
 
-function flatVaultPositionAmount(
+export function flatVaultPositionAmount(
   vaultPositionAmount: VaultPositionAmount,
 ): VaultPositionFlatAmounts {
   const amounts = {
@@ -82,7 +82,7 @@ function flatVaultPositionAmount(
   return amounts
 }
 
-async function getLpTokensForVaultPosition(
+export async function getLpTokensForVaultPosition(
   vault: Vault,
   vaultPosition: VaultPosition,
 ): Promise<Coin[]> {