Merge pull request #1630 from mars-protocol/develop

v2.11.3

Author: linkielink

package.json

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

src/api/swap/getAstroportRouteInfo.ts

@@ -16,8 +16,12 @@ export default async function getRouteInfo(
     const resp = await fetchWithTimeout(astroportUrl, FETCH_TIMEOUT)
     const route = (await resp.json())[0] as AstroportRouteResponse
 
+    let amountOut = BN(route.amount_out)
+    if (!amountOut.gt(0))
+      amountOut = amountOut.times(1 - chainConfig.swapFee).integerValue(BigNumber.ROUND_FLOOR)
+
     return {
-      amountOut: BN(route.amount_out),
+      amountOut,
       priceImpact: BN(route.price_impact),
       fee: BN(0), // TODO: Fees are not implemented yet on Astroport endpoint
       description: [

src/api/swap/getNeutronRouteInfo.ts

@@ -185,6 +185,11 @@ async function getNeutronRouteInfoInternal(
 
     const routeInfo = buildSwapRouteInfo(skipRouteResponse, route, description, isReverse)
 
+    if (!routeInfo.amountOut.gt(0))
+      routeInfo.amountOut = routeInfo.amountOut
+        .times(1 - chainConfig.swapFee)
+        .integerValue(BigNumber.ROUND_FLOOR)
+
     return routeInfo
   } catch (error) {
     if (shouldFallbackToAstroport && !isReverse) {

src/api/swap/getOsmosisRouteInfo.ts

@@ -7,13 +7,18 @@ export default async function getOsmosisRouteInfo(
   url: string,
   denomIn: string,
   assets: Asset[],
+  chainConfig: ChainConfig,
 ): Promise<SwapRouteInfo | null> {
   try {
     const resp = await fetchWithTimeout(url, FETCH_TIMEOUT)
     const route = (await resp.json()) as OsmosisRouteResponse
 
+    let amountOut = BN(route.amount_out)
+    if (!amountOut.gt(0))
+      amountOut = amountOut.times(1 - chainConfig.swapFee).integerValue(BigNumber.ROUND_FLOOR)
+
     return {
-      amountOut: BN(route.amount_out),
+      amountOut,
       priceImpact: BN(route.price_impact).times(100),
       fee: BN(route.effective_fee),
       description: [

src/chains/neutron/neutron-1.ts

@@ -187,6 +187,7 @@ const Neutron1: ChainConfig = {
   evmAssetSupport: true,
   slinky: true,
   managedVaults: true,
+  swapFee: 0.005,
 }
 
 export default Neutron1

src/chains/neutron/pion-1.ts

@@ -70,6 +70,7 @@ const Pion1: ChainConfig = {
   evmAssetSupport: true,
   slinky: true,
   managedVaults: true,
+  swapFee: 0.005,
 }
 
 export default Pion1

src/chains/osmosis/osmosis-1.ts

@@ -139,6 +139,7 @@ const Osmosis1: ChainConfig = {
   evmAssetSupport: true,
   slinky: false,
   managedVaults: false,
+  swapFee: 0,
 }
 
 export default Osmosis1

src/hooks/swap/useSwapRoute.ts

@@ -64,7 +64,7 @@ export default function useSwapRoute(
 
       try {
         const routeInfo = isOsmosis
-          ? await getOsmosisRouteInfo(osmosisUrl, fromDenom, assets)
+          ? await getOsmosisRouteInfo(osmosisUrl, fromDenom, assets, chainConfig)
           : await getNeutronRouteInfo(fromDenom, toDenom, amount, assets, chainConfig)
 
         if (routeInfo) {

src/hooks/trade/useRouteInfo.ts

@@ -26,7 +26,7 @@ export default function useRouteInfo(denomIn: string, denomOut: string, amount:
     isOsmosis && debouncedAmount !== '0' && osmosisUrl
       ? ['route', denomIn, denomOut, debouncedAmount, chainConfig.id]
       : null,
-    async () => getOsmosisRouteInfo(osmosisUrl, denomIn, assets),
+    async () => getOsmosisRouteInfo(osmosisUrl, denomIn, assets, chainConfig),
   )
 
   return isOsmosis ? osmosisRoute : neutronRoute

src/store/slices/broadcast.ts

@@ -697,7 +697,7 @@ export default function createBroadcastSlice(
 
         const osmosisUrl = `${chainConfig.endpoints.routes}/quote?tokenIn=${amount}${options.swapFromDenom}&tokenOutDenom=${options.debtDenom}`
         const routeInfo = isOsmosis
-          ? await getOsmosisRouteInfo(osmosisUrl, options.swapFromDenom, get().assets)
+          ? await getOsmosisRouteInfo(osmosisUrl, options.swapFromDenom, get().assets, chainConfig)
           : await getNeutronRouteInfo(
               options.swapFromDenom,
               options.debtDenom,