Merge pull request #1731 from balancednetwork/fix/fix-legacy-routing

Fix bnUSD related routing issue

Author: hetfly

apps/web/src/constants/tokens.ts

@@ -204,7 +204,7 @@ export const FUNDING_TOKENS_LIST = FUNDING_TOKENS[NETWORK_ID];
 
 export const ORACLE_PRICED_TOKENS = ['USDC', 'USDT'];
 
-export const UNTRADEABLE_TOKENS = ['JitoSOL', 'SOL', 'bnUSD', 'wBTC', 'tBTC', 'cbBTC', 'wETH', 'S', 'USDT', 'USDC'];
+export const UNTRADEABLE_TOKENS = ['JitoSOL', 'SOL', 'bnUSD', 'wBTC', 'tBTC', 'cbBTC', 'wETH', 'S', 'USDT'];
 
 //search for Pyth ID here https://hermes.pyth.network/docs/#/rest/price_feeds_metadata
 export const PYTH_PRICED_TOKENS: { symbol: string; pythId: string }[] = [

packages/v1-sdk/src/entities/pair.ts

@@ -19,6 +19,11 @@ import {
 } from '../constants';
 import { InsufficientInputAmountError, InsufficientReservesError } from '../errors';
 
+// Helper function to check if a token is bnUSD (handles both 'bnUSD' and 'bnUSD(old)' symbols)
+function isBnUSD(token: Token): boolean {
+  return token.symbol === 'bnUSD' || token.symbol === 'bnUSD(old)';
+}
+
 export const computePairAddress = ({
   factoryAddress,
   tokenA,
@@ -203,8 +208,8 @@ export class Pair {
     invariant(this.involvesToken(inputAmount.currency), 'TOKEN');
 
     if (this.type === PairType.STABILITY_FUND) {
-      // this.token1 is always bnUSD
-      if (inputAmount.currency.symbol === 'bnUSD') {
+      // this.token1 is always bnUSD (or bnUSD(old))
+      if (isBnUSD(inputAmount.currency)) {
         // bnUSD -> USDC
         // apply fee 0.1%
         const outputAmount = CurrencyAmount.fromRawAmount(
@@ -262,8 +267,8 @@ export class Pair {
   public getInputAmount(outputAmount: CurrencyAmount<Token>): [CurrencyAmount<Token>, Pair] {
     invariant(this.involvesToken(outputAmount.currency), 'TOKEN');
     if (this.type === PairType.STABILITY_FUND) {
-      // this.token1 is always bnUSD
-      if (outputAmount.currency.symbol === 'bnUSD') {
+      // this.token1 is always bnUSD (or bnUSD(old))
+      if (isBnUSD(outputAmount.currency)) {
         // USDC -> bnUSD
         return [
           CurrencyAmount.fromRawAmount(

packages/v1-sdk/src/entities/route.ts

@@ -4,6 +4,11 @@ import { Currency, Price, Token } from '@balancednetwork/sdk-core';
 
 import { Pair, PairType } from './pair';
 
+// Helper function to check if a token is bnUSD (handles both 'bnUSD' and 'bnUSD(old)' symbols)
+function isBnUSD(token: Token): boolean {
+  return token.symbol === 'bnUSD' || token.symbol === 'bnUSD(old)';
+}
+
 export type RouteAction = {
   type: number;
   address: string | null;
@@ -52,8 +57,8 @@ export class Route<TInput extends Currency, TOutput extends Currency> {
     for (const [i, pair] of this.pairs.entries()) {
       if (pair.type === PairType.STABILITY_FUND) {
         let price;
-        // pair.token1 is always bnUSD
-        if (this.path[i].symbol === 'bnUSD') {
+        // pair.token1 is always bnUSD (or bnUSD(old))
+        if (isBnUSD(this.path[i])) {
           // bnUSD -> USDC
           price = new Price(
             pair.token1,

packages/v1-sdk/src/entities/trade.ts

@@ -16,6 +16,11 @@ import { ONE, STABILITY_FUND_FRACTION, ZERO } from '../constants';
 import { Pair, PairType } from './pair';
 import { Route } from './route';
 
+// Helper function to check if a token is bnUSD (handles both 'bnUSD' and 'bnUSD(old)' symbols)
+function isBnUSD(token: Token): boolean {
+  return token.symbol === 'bnUSD' || token.symbol === 'bnUSD(old)';
+}
+
 // minimal interface so the input output comparator may be shared across types
 interface InputOutput<TInput extends Currency, TOutput extends Currency> {
   readonly inputAmount: CurrencyAmount<TInput>;
@@ -451,11 +456,10 @@ export class Trade<TInput extends Currency, TOutput extends Currency, TTradeType
     let result = new Fraction(ONE);
     for (let i = 0; i < this.route.path.length - 1; i++) {
       const pair = this.route.pairs[i];
-      const inputCurrencySymbol = this.route.path[i].symbol;
       const outputCurrencySymbol = this.route.path[i + 1].symbol;
 
       if (pair.type === PairType.STABILITY_FUND) {
-        if (inputCurrencySymbol === 'bnUSD') {
+        if (isBnUSD(this.route.path[i])) {
           result = result.multiply(STABILITY_FUND_FRACTION);
         }
       } else if (pair.type === PairType.STAKING) {