stackswap-front-api-test-02 1.0.147 → 1.0.150

package/src/stackswap/manager/swap.manager.ts

@@ -13,7 +13,9 @@ export enum SwapType {
   ON_LOADING,
   SINGLE = 2,
   ROUTER_STX = 10,
-  ROUTER_STSW = 11
+  ROUTER_STSW = 11,
+  ROUTER_STX_STSW = 20,
+  ROUTER_STSW_STX = 21,
 }
 
 export class SwapManager {
@@ -23,6 +25,73 @@ export class SwapManager {
     this.stackswap = stackswap;
   }
 
+
+  async findRouter3(token_x : Token, token_y : Token, current_block: number) : Promise<{ valid: SwapType, [key: string]: any}> {
+    const url = this.stackswap.config.STACKS_BACKEND_URL() + '/api/v1/swap_v3/' + token_x.addr +'/'+token_y.addr + '/' + current_block;
+    const result = await axios.get ( url,
+      {timeout: 50000,});
+    // console.log('swap router : ', value)
+    const res = result.data;
+    if(Object.keys(res).length === 0){
+      return {valid : SwapType.NO_ROUTE}
+    }else if(res.type === 'SWAP'){
+      return{
+        valid : SwapType.SINGLE,
+        x_to_y : res.direction,
+        pair : LiquidityPool.parsePoolsFromServerData2(res.pair, token_x, token_y, res.direction)
+      }
+    }else if (res.type === 'RouterSWAP'){
+      if(res.bridge_token === 'STX'){
+        return {
+          valid : SwapType.ROUTER_STX,
+          router_from_pair : LiquidityPool.parsePoolsFromServerData2(res.from_pair, token_x, Token.getBaseTokens(this.stackswap, BaseToken.STX), res.from_direction),
+          router_to_pair : LiquidityPool.parsePoolsFromServerData2(res.to_pair, Token.getBaseTokens(this.stackswap, BaseToken.STX), token_y, res.to_direction),
+          router_from_mode : res.from_direction,
+          router_to_mode : res.to_direction
+        }
+
+      }else if(res.bridge_token === 'STSW') {
+        return{
+          valid : SwapType.ROUTER_STSW,
+          router_from_pair : LiquidityPool.parsePoolsFromServerData2(res.from_pair, token_x, Token.getBaseTokens(this.stackswap, BaseToken.STSW), res.from_direction),
+          router_to_pair : LiquidityPool.parsePoolsFromServerData2(res.to_pair, Token.getBaseTokens(this.stackswap, BaseToken.STSW), token_y, res.to_direction),
+          router_from_mode : res.from_direction,
+          router_to_mode : res.to_direction
+        }
+      } else{
+        return {valid : SwapType.NO_ROUTE}
+      }
+    } else if(res.type === 'RouterSWAP2') {
+      if(res.bridge_token === 'STSW|STX'){
+        return {
+          valid : SwapType.ROUTER_STSW_STX,
+          router_from_pair : LiquidityPool.parsePoolsFromServerData2(res.from_pair, token_x, Token.getBaseTokens(this.stackswap, BaseToken.STSW), res.from_direction),
+          router_bridge_pair : LiquidityPool.parsePoolsFromServerData2(res.bridge_pair, Token.getBaseTokens(this.stackswap, BaseToken.STSW), Token.getBaseTokens(this.stackswap, BaseToken.STX), res.bridge_direction),
+          router_to_pair : LiquidityPool.parsePoolsFromServerData2(res.to_pair, Token.getBaseTokens(this.stackswap, BaseToken.STX), token_y, res.to_direction),
+          router_from_mode : res.from_direction,
+          router_bridge_mode : res.bridge_direction,
+          router_to_mode : res.to_direction
+        }
+
+      }else if(res.bridge_token === 'STX|STSW') {
+        return{
+          valid : SwapType.ROUTER_STX_STSW,
+          router_from_pair : LiquidityPool.parsePoolsFromServerData2(res.from_pair, token_x, Token.getBaseTokens(this.stackswap, BaseToken.STX), res.from_direction),
+          router_bridge_pair : LiquidityPool.parsePoolsFromServerData2(res.bridge_pair, Token.getBaseTokens(this.stackswap, BaseToken.STX), Token.getBaseTokens(this.stackswap, BaseToken.STSW), res.bridge_direction),
+          router_to_pair : LiquidityPool.parsePoolsFromServerData2(res.to_pair, Token.getBaseTokens(this.stackswap, BaseToken.STSW), token_y, res.to_direction),
+          router_from_mode : res.from_direction,
+          router_bridge_mode : res.bridge_direction,
+          router_to_mode : res.to_direction
+        }
+      } else{
+        return {valid : SwapType.NO_ROUTE}
+      }
+    }
+    else {
+      return {valid : SwapType.NO_ROUTE}
+    }
+  }
+
   async findRouter2(token_x : Token, token_y : Token, current_block: number) : Promise<{ valid: SwapType, [key: string]: any}> {
     const url = this.stackswap.config.STACKS_BACKEND_URL() + '/api/v1/swap_v2/' + token_x.addr +'/'+token_y.addr + '/' + current_block;
     const result = await axios.get ( url,
@@ -103,6 +172,65 @@ export class SwapManager {
     }
   }
 
+  async routerSwap2ContractCall(token_from_amount: string, token_to_amount: string, token_bridge1_amount: string, token_bridge2_amount: string, pair_from: LiquidityPool, pair_to: LiquidityPool, pair_bridge: LiquidityPool, router_from_mode: boolean, router_to_mode: boolean, router_bridge_mode: boolean, tolerance: number, callback: any = null) {
+
+    const token_from = router_from_mode ? pair_from.token_x : pair_from.token_y;
+    const token_bridge1 = router_from_mode ? pair_from.token_y : pair_from.token_x;
+    const token_bridge2 = router_from_mode ? pair_to.token_x : pair_to.token_y;
+    const token_to = router_to_mode ? pair_to.token_y: pair_to.token_x;
+
+    const from_amt = new BigNumber(10 ** token_from.decimal).multipliedBy(token_from_amount).integerValue();
+    const bridge1_amt = new BigNumber(10 ** token_bridge1.decimal).multipliedBy(token_bridge1_amount).integerValue();
+    const bridge2_amt = new BigNumber(10 ** token_bridge2.decimal).multipliedBy(token_bridge2_amount).integerValue();
+    const to_amt = new BigNumber(10 ** token_to.decimal).multipliedBy(token_to_amount).integerValue();
+
+    const bridge1_min = bridge1_amt.multipliedBy((100 - tolerance)).dividedBy(100).integerValue();
+    const bridge1_max = bridge1_amt.multipliedBy((100 + tolerance)).dividedBy(100).integerValue();
+    const bridge2_min = bridge2_amt.multipliedBy((100 - tolerance)).dividedBy(100).multipliedBy((100 - tolerance)).dividedBy(100).integerValue();
+    const bridge2_max = bridge2_amt.multipliedBy((100 + tolerance)).dividedBy(100).multipliedBy((100 + tolerance)).dividedBy(100).integerValue();
+    const to_min = to_amt.multipliedBy((100 - tolerance)).dividedBy(100).multipliedBy((100 - tolerance)).dividedBy(100).multipliedBy((100 - tolerance)).dividedBy(100).integerValue();
+
+    const token_from_addr = (token_from.addr);
+    const token_bridge1_addr = (token_bridge1.addr);
+    const token_bridge2_addr = (token_bridge2.addr);
+    const token_to_addr = (token_to.addr);
+
+    const pair_from_addr = pair_from.token_lp.addr;
+    const pair_bridge_addr = pair_bridge.token_lp.addr;
+    const pair_to_addr = pair_to.token_lp.addr;
+
+    const from_mode = router_from_mode ? trueCV() : falseCV();
+    const bridge_mode = router_bridge_mode ? trueCV() : falseCV();
+    const to_mode = router_to_mode ? trueCV() : falseCV();
+
+    const post_condition = [];
+    post_condition.push(await getPostConditionFromAsset(this.stackswap, this.stackswap.getSenderAddress(), token_from.addr, from_amt.toString(), FungibleConditionCode.Equal));
+    post_condition.push(await getPostConditionFromAsset(this.stackswap, pair_from_addr, token_bridge1.addr, bridge1_min.toString(), FungibleConditionCode.GreaterEqual));
+    post_condition.push(await getPostConditionFromAsset(this.stackswap, this.stackswap.getSenderAddress(), token_bridge1.addr, bridge1_max.toString(), FungibleConditionCode.LessEqual));
+    post_condition.push(await getPostConditionFromAsset(this.stackswap, pair_bridge_addr, token_bridge2.addr, bridge2_min.toString(), FungibleConditionCode.GreaterEqual));
+    post_condition.push(await getPostConditionFromAsset(this.stackswap, this.stackswap.getSenderAddress(), token_bridge2.addr, bridge2_max.toString(), FungibleConditionCode.LessEqual));
+    post_condition.push(await getPostConditionFromAsset(this.stackswap, pair_to_addr, token_to.addr, to_min.toString(), FungibleConditionCode.GreaterEqual));
+
+    const options = getWriteOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_ROUTER_SWAP2(), 'exchange-router2', [
+      parseAddressToCV(token_from_addr),
+      parseAddressToCV(token_bridge1_addr),
+      parseAddressToCV(token_bridge2_addr),
+      parseAddressToCV(token_to_addr),
+      parseAddressToCV(pair_from_addr),
+      parseAddressToCV(pair_bridge_addr),
+      parseAddressToCV(pair_to_addr),
+      from_mode,
+      bridge_mode,
+      to_mode,
+      uintCV(from_amt.toString()),
+      uintCV(bridge1_min.toString()),
+      uintCV(bridge2_min.toString()),
+      uintCV(to_min.toString()),
+      this.stackswap.getSenderAddress(),
+    ], post_condition, callback);
+    openContractCall(options);
+  }
+
   async routerSwapContractCall(token_from_amount: string, token_to_amount: string, token_bridge_amount: string, pair_from: LiquidityPool, pair_to: LiquidityPool, router_from_mode: boolean, router_to_mode: boolean, tolerance: number, callback: any = null) {
 
     const token_from = router_from_mode ? pair_from.token_x : pair_from.token_y;
@@ -114,6 +242,7 @@ export class SwapManager {
     const to_amt = new BigNumber(10 ** token_to.decimal).multipliedBy(token_to_amount).integerValue();
 
     const bridge_min = bridge_amt.multipliedBy((100 - tolerance)).dividedBy(100).integerValue();
+    const bridge_max = bridge_amt.multipliedBy((100 + tolerance)).dividedBy(100).integerValue();
     const to_min = to_amt.multipliedBy((100 - tolerance)).dividedBy(100).multipliedBy((100 - tolerance)).dividedBy(100).integerValue();
 
     const token_from_addr = (token_from.addr);
@@ -129,7 +258,7 @@ export class SwapManager {
     const post_condition = [];
     post_condition.push(await getPostConditionFromAsset(this.stackswap, this.stackswap.getSenderAddress(), token_from.addr, from_amt.toString(), FungibleConditionCode.Equal));
     post_condition.push(await getPostConditionFromAsset(this.stackswap, pair_from_addr, token_bridge.addr, bridge_min.toString(), FungibleConditionCode.GreaterEqual));
-    post_condition.push(await getPostConditionFromAsset(this.stackswap, this.stackswap.getSenderAddress(), token_bridge.addr, bridge_min.toString(), FungibleConditionCode.GreaterEqual));
+    post_condition.push(await getPostConditionFromAsset(this.stackswap, this.stackswap.getSenderAddress(), token_bridge.addr, bridge_max.toString(), FungibleConditionCode.LessEqual));
     post_condition.push(await getPostConditionFromAsset(this.stackswap, pair_to_addr, token_to.addr, to_min.toString(), FungibleConditionCode.GreaterEqual));
 
     const options = getWriteOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_ROUTER_SWAP(), 'router-swap', [
@@ -268,40 +397,54 @@ export class SwapManager {
     }
   }
 
-  price_impact_router(router_from_mode: boolean, router_to_mode: boolean, pair_from : LiquidityPool, pair_to : LiquidityPool, token_from_amount : string) {
+
+  price_impact_router(router_from_mode: boolean, router_to_mode: boolean,
+                      pair_from:LiquidityPool, pair_to:LiquidityPool , token_from_amount: string) {
     // console.log('price impact');
     //  (dy (/ (* u997 balance-y dx) (+ (* u1000 balance-x) (* u997 dx)))) ;; overall fee is 30 bp, either all for the pool, or 25 bp for pool and 5 bp for operator
     // dy = balancey * dx / balancex + dx
     try {
-      const balance_x = router_from_mode ? pair_from.balance_x : pair_from.balance_y;
-      const token_from_decimal = router_from_mode ? pair_from.token_x.decimal : pair_from.token_y.decimal;
-      // console.log('balance_x', balance_x, typeof (balance_x));
+      const from_input_balance = router_from_mode ? pair_from.balance_x : pair_from.balance_y;
+      const from_input_decimal = router_from_mode ? pair_from.token_x.decimal : pair_from.token_y.decimal;
+      const from_output_balance= router_from_mode ? pair_from.balance_y : pair_from.balance_y;
 
-      const balance_y = router_to_mode ? pair_to.balance_y : pair_to.balance_x;
-      // console.log('balance_y', balance_y);
-
-      const dx = new BigNumber(token_from_amount).multipliedBy(10 ** token_from_decimal);
-      // console.log('dx', dx.toString(), typeof (dx));
-      if (dx.toNumber() > new BigNumber(balance_x).toNumber()) {
-        // console.log('dx is bigger than dy');
+      const from_input_dx = new BigNumber(token_from_amount).multipliedBy(10 ** from_input_decimal);
+      if (from_input_dx.toNumber() > new BigNumber(from_input_balance).toNumber()) {
         return 100;
       }
-      const dy_1 = new BigNumber(balance_y).multipliedBy(dx);
-      // console.log('dy_1', dy_1.toString());
-      const dy_2 = new BigNumber(balance_x).plus(dx);
-      // console.log('dy_2', dy_2.toString());
-      const dy = (dy_1.toNumber()) / (dy_2.toNumber());
-      // console.log('dy',dy.toString());
-      const input_price = new BigNumber(10 ** 10).multipliedBy(new BigNumber(balance_x)).dividedBy(new BigNumber(balance_y));
-      // console.log('input_price',input_price.toString());
-      const output_price = new BigNumber(10 ** 10).multipliedBy(new BigNumber(balance_x)).plus(dx).dividedBy(new BigNumber(balance_y).minus(dy));
-      // console.log('output_price',output_price.toString());
-      const price_impact2 = output_price.minus(input_price).multipliedBy(10000).dividedBy(input_price);
-      // console.log('price_impact2',price_impact2.toString());
-      let price_impact = price_impact2.toNumber();
+      const from_dy_1 = new BigNumber(from_output_balance).multipliedBy(from_input_dx);
+      const from_dy_2 = new BigNumber(from_input_balance).plus(from_input_dx);
+      const from_dy = (from_dy_1.toNumber()) / (from_dy_2.toNumber());
+
+      const from_input_price  = new BigNumber(10 ** 10).multipliedBy(new BigNumber(from_input_balance)).dividedBy(new BigNumber(from_output_balance));
+      const from_output_price = new BigNumber(10 ** 10).multipliedBy(new BigNumber(from_input_balance)).plus(from_input_dx).dividedBy(new BigNumber(from_output_balance).minus(from_dy));
+      const from_price_impact = from_output_price.minus(from_input_price).multipliedBy(10000).dividedBy(from_input_price);
+
+      console.log("FROM : ", token_from_amount, from_dy, from_price_impact.toNumber())
+      ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+      const to_input_balance = router_to_mode ? pair_to.balance_x : pair_to.balance_y;
+      const to_input_decimal = router_to_mode ? pair_to.token_x.decimal : pair_to.token_y.decimal;
+      const to_output_balance= router_to_mode ? pair_to.balance_y : pair_to.balance_y;
+
+      const to_input_dx = new BigNumber(from_dy).multipliedBy(10 ** to_input_decimal);
+      if (to_input_dx.toNumber() > new BigNumber(to_input_balance).toNumber()) {
+        return 100;
+      }
+      const to_dy_1 = new BigNumber(to_output_balance).multipliedBy(to_input_dx);
+      const to_dy_2 = new BigNumber(to_input_balance).plus(to_input_dx);
+      const to_dy = (to_dy_1.toNumber()) / (to_dy_2.toNumber());
+
+      const to_input_price  = new BigNumber(10 ** 10).multipliedBy(new BigNumber(to_input_balance)).dividedBy(new BigNumber(to_output_balance));
+      const to_output_price = new BigNumber(10 ** 10).multipliedBy(new BigNumber(to_input_balance)).plus(to_input_dx).dividedBy(new BigNumber(to_output_balance).minus(to_dy));
+      const to_price_impact = to_output_price.minus(to_input_price).multipliedBy(10000).dividedBy(to_input_price);
+
+      // console.log("TO : ", bridge_dy, to_dy, to_price_impact.toNumber())
+      ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+      let price_impact = from_price_impact.toNumber() * to_price_impact.toNumber();
       if (price_impact >= 10000) {
         price_impact = 9999;
       }
+      console.log("TOTAL : ", price_impact)
       return (price_impact / 100).toFixed(5);
     } catch (e) {
       // console.log(e);
@@ -309,6 +452,76 @@ export class SwapManager {
     }
   }
 
+  price_impact_router2(router_from_mode: boolean, router_bridge_mode: boolean, router_to_mode: boolean,
+                       pair_from:LiquidityPool, pair_bridge:LiquidityPool, pair_to:LiquidityPool , token_from_amount:string) {
+    // console.log('price impact');
+    //  (dy (/ (* u997 balance-y dx) (+ (* u1000 balance-x) (* u997 dx)))) ;; overall fee is 30 bp, either all for the pool, or 25 bp for pool and 5 bp for operator
+    // dy = balancey * dx / balancex + dx
+    try {
+      const from_input_balance = router_from_mode ? pair_from.balance_x : pair_from.balance_y;
+      const from_input_decimal = router_from_mode ? pair_from.token_x.decimal : pair_from.token_y.decimal;
+      const from_output_balance= router_from_mode ? pair_from.balance_y : pair_from.balance_y;
+      const from_input_dx = new BigNumber(token_from_amount).multipliedBy(10 ** from_input_decimal);
+      if (from_input_dx.toNumber() > new BigNumber(from_input_balance).toNumber()) {
+        return 100;
+      }
+      const from_dy_1 = new BigNumber(from_output_balance).multipliedBy(from_input_dx);
+      const from_dy_2 = new BigNumber(from_input_balance).plus(from_input_dx);
+      const from_dy = (from_dy_1.toNumber()) / (from_dy_2.toNumber());
+
+      const from_input_price  = new BigNumber(10 ** 10).multipliedBy(new BigNumber(from_input_balance)).dividedBy(new BigNumber(from_output_balance));
+      const from_output_price = new BigNumber(10 ** 10).multipliedBy(new BigNumber(from_input_balance)).plus(from_input_dx).dividedBy(new BigNumber(from_output_balance).minus(from_dy));
+      const from_price_impact = from_output_price.minus(from_input_price).multipliedBy(10000).dividedBy(from_input_price);
+
+      console.log("FROM : ", token_from_amount, from_dy, from_price_impact.toNumber())
+      ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+      const bridge_input_balance = router_bridge_mode ? pair_bridge.balance_x : pair_bridge.balance_y;
+      const bridge_input_decimal = router_bridge_mode ? pair_bridge.token_x.decimal : pair_bridge.token_y.decimal;
+      const bridge_output_balance= router_bridge_mode ? pair_bridge.balance_y : pair_bridge.balance_y;
+
+      const bridge_input_dx = new BigNumber(from_dy).multipliedBy(10 ** bridge_input_decimal);
+      if (bridge_input_dx.toNumber() > new BigNumber(bridge_input_balance).toNumber()) {
+        return 100;
+      }
+      const bridge_dy_1 = new BigNumber(bridge_output_balance).multipliedBy(bridge_input_dx);
+      const bridge_dy_2 = new BigNumber(bridge_input_balance).plus(bridge_input_dx);
+      const bridge_dy = (bridge_dy_1.toNumber()) / (bridge_dy_2.toNumber());
+
+      const bridge_input_price  = new BigNumber(10 ** 10).multipliedBy(new BigNumber(bridge_input_balance)).dividedBy(new BigNumber(bridge_output_balance));
+      const bridge_output_price = new BigNumber(10 ** 10).multipliedBy(new BigNumber(bridge_input_balance)).plus(bridge_input_dx).dividedBy(new BigNumber(bridge_output_balance).minus(bridge_dy));
+      const bridge_price_impact = bridge_output_price.minus(bridge_input_price).multipliedBy(10000).dividedBy(bridge_input_price);
+
+      console.log("BRIDGE : ", from_dy, bridge_dy, bridge_price_impact.toNumber())
+      ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+      const to_input_balance = router_to_mode ? pair_to.balance_x : pair_to.balance_y;
+      const to_input_decimal = router_to_mode ? pair_to.token_x.decimal : pair_to.token_y.decimal;
+      const to_output_balance= router_to_mode ? pair_to.balance_y : pair_to.balance_y;
+
+      const to_input_dx = new BigNumber(bridge_dy).multipliedBy(10 ** to_input_decimal);
+      if (to_input_dx.toNumber() > new BigNumber(to_input_balance).toNumber()) {
+        return 100;
+      }
+      const to_dy_1 = new BigNumber(to_output_balance).multipliedBy(to_input_dx);
+      const to_dy_2 = new BigNumber(to_input_balance).plus(to_input_dx);
+      const to_dy = (to_dy_1.toNumber()) / (to_dy_2.toNumber());
+
+      const to_input_price  = new BigNumber(10 ** 10).multipliedBy(new BigNumber(to_input_balance)).dividedBy(new BigNumber(to_output_balance));
+      const to_output_price = new BigNumber(10 ** 10).multipliedBy(new BigNumber(to_input_balance)).plus(to_input_dx).dividedBy(new BigNumber(to_output_balance).minus(to_dy));
+      const to_price_impact = to_output_price.minus(to_input_price).multipliedBy(10000).dividedBy(to_input_price);
+
+      console.log("TO : ", bridge_dy, to_dy, to_price_impact.toNumber())
+      ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+      let price_impact = from_price_impact.toNumber() * bridge_price_impact.toNumber() * to_price_impact.toNumber();
+      if (price_impact >= 10000) {
+        price_impact = 9999;
+      }
+      console.log("TOTAL : ", price_impact)
+      return (price_impact / 100).toFixed(5);
+    } catch (e) {
+      // console.log(e);
+      return 0;
+    }
+  }
   getPriceString(pair : LiquidityPool | null, token_x : Token| null, token_y : Token| null, price : number, price_invert : boolean) {
     try {
       if (price < 0){
@@ -347,40 +560,22 @@ export class SwapManager {
       }
 
       case SwapType.ROUTER_STX:
-        const bridge_token = Token.getBaseTokens(this.stackswap, BaseToken.STX);
-        const from_res = swap_data.router_from_pair.getPoolPrice(!swap_data.router_from_mode, Number(token_x_amount)  <=  0 || token_x_amount == '' ? '1': token_x_amount);
-          let router_from_price = -1;
-          if ( from_res.output_price !== '0') {
-            router_from_price = (1 / parseFloat(from_res.output_price));
-          }
-          const router_bridge_amt = new BigNumber(new BigNumber(from_res.dy).toFixed(Number(bridge_token.decimal))).toString();
-          const to_res = swap_data.router_to_pair.getPoolPrice(!swap_data.router_to_mode, Number(router_bridge_amt) <=  0 ? '-1': router_bridge_amt);
-          let router_to_price = -1;
-          if ( to_res.output_price !== '0') {
-            router_to_price = (1 / parseFloat(to_res.output_price));
-          }
-          const token_y_amount2 = new BigNumber(to_res.dy).toFixed(Number(Number(token_x_amount) <=  0 || token_x_amount == '' ? 0 : swap_data.router_to_pair.getTokenY(swap_data.router_to_mode).decimal)).toString();
-          price = router_from_price * router_to_price;
-          const price_strings2 = this.getPriceString(swap_data.pair, swap_data.router_from_pair.getTokenX(swap_data.router_from_mode), swap_data.router_to_pair.getTokenY(swap_data.router_to_mode), price, price_invert);
-        return {price : price, dy: token_y_amount2, price_strings: price_strings2, bridge_amount : router_bridge_amt};
+        return this.getRouterDY_V1(swap_data, token_x_amount,
+          Token.getBaseTokens(this.stackswap, BaseToken.STX), price_invert);
 
       case SwapType.ROUTER_STSW:
-        const bridge_token2 = Token.getBaseTokens(this.stackswap, BaseToken.STX);
-        const from_res2 = swap_data.router_from_pair.getPoolPrice(!swap_data.router_from_mode, Number(token_x_amount)  <=  0 || token_x_amount == '' ? '1': token_x_amount);
-        let router_from_price2 = -1;
-        if ( from_res2.output_price !== '0') {
-          router_from_price2 = (1 / parseFloat(from_res2.output_price));
-        }
-        const router_bridge_amt2 = new BigNumber(new BigNumber(from_res2.dy).toFixed(Number(bridge_token2.decimal))).toString();
-        const to_res2 = swap_data.router_to_pair.getPoolPrice(!swap_data.router_to_mode, Number(router_bridge_amt2) <=  0 ? '-1': router_bridge_amt2);
-        let router_to_price2 = -1;
-        if ( to_res2.output_price !== '0') {
-          router_to_price2 = (1 / parseFloat(to_res2.output_price));
-        }
-        const token_y_amount3 = new BigNumber(to_res2.dy).toFixed(Number(Number(token_x_amount) <=  0 || token_x_amount == '' ? 0 : swap_data.router_to_pair.getTokenY(swap_data.router_to_mode).decimal)).toString();
-        price = router_from_price2 * router_to_price2;
-        const price_strings3 = this.getPriceString(swap_data.pair, swap_data.router_from_pair.getTokenX(swap_data.router_from_mode), swap_data.router_to_pair.getTokenY(swap_data.router_to_mode), price, price_invert);
-        return {price : price, dy: token_y_amount3, price_strings: price_strings3, bridge_amount : router_bridge_amt2};
+        return this.getRouterDY_V1(swap_data, token_x_amount,
+          Token.getBaseTokens(this.stackswap, BaseToken.STSW), price_invert);
+
+      case SwapType.ROUTER_STX_STSW:
+        return this.getRouterDY_V2(swap_data, token_x_amount,
+          Token.getBaseTokens(this.stackswap, BaseToken.STX),
+          Token.getBaseTokens(this.stackswap, BaseToken.STSW), price_invert);
+
+      case SwapType.ROUTER_STSW_STX:
+        return this.getRouterDY_V2(swap_data, token_x_amount,
+          Token.getBaseTokens(this.stackswap, BaseToken.STSW),
+          Token.getBaseTokens(this.stackswap, BaseToken.STX), price_invert);
 
       default:
         return {price : price, dy: '0', price_strings: ''};
@@ -388,5 +583,51 @@ export class SwapManager {
 
   }
 
+  private getRouterDY_V1(swap_data: any, token_x_amount: string, bridge_token: Token, price_invert: boolean) :{price: number,dy: string, price_strings: string, bridge_amount: string} {
+    let price = -1;
+    const from_res = swap_data.router_from_pair.getPoolPrice(!swap_data.router_from_mode, Number(token_x_amount)  <=  0 || token_x_amount == '' ? '1': token_x_amount);
+    let router_from_price = -1;
+    if ( from_res.output_price !== '0') {
+      router_from_price = (1 / parseFloat(from_res.output_price));
+    }
+    const router_bridge_amt = new BigNumber(new BigNumber(from_res.dy).toFixed(Number(bridge_token.decimal))).toString();
+    const to_res = swap_data.router_to_pair.getPoolPrice(!swap_data.router_to_mode, Number(router_bridge_amt) <=  0 ? '-1': router_bridge_amt);
+    let router_to_price = -1;
+    if ( to_res.output_price !== '0') {
+      router_to_price = (1 / parseFloat(to_res.output_price));
+    }
+    const token_y_amount = new BigNumber(to_res.dy).toFixed(Number(Number(token_x_amount) <=  0 || token_x_amount == '' ? 0 : swap_data.router_to_pair.getTokenY(swap_data.router_to_mode).decimal)).toString();
+    price = router_from_price * router_to_price;
+    const price_strings = this.getPriceString(swap_data.pair, swap_data.router_from_pair.getTokenX(swap_data.router_from_mode), swap_data.router_to_pair.getTokenY(swap_data.router_to_mode), price, price_invert);
+    return {price : price, dy: token_y_amount, price_strings: price_strings, bridge_amount : router_bridge_amt};
+  }
+
+  private getRouterDY_V2(swap_data: any, token_x_amount: string, bridge_token1: Token, bridge_token2: Token, price_invert: boolean) :{price: number,dy: string, price_strings: string, bridge_amount1: string, bridge_amount2: string} {
+    let price = -1;
+    const from_res = swap_data.router_from_pair.getPoolPrice(!swap_data.router_from_mode, Number(token_x_amount)  <=  0 || token_x_amount == '' ? '1': token_x_amount);
+    let router_from_price = -1;
+    if ( from_res.output_price !== '0') {
+      router_from_price = (1 / parseFloat(from_res.output_price));
+    }
+    const router_bridge1_amt = new BigNumber(new BigNumber(from_res.dy).toFixed(Number(bridge_token1.decimal))).toString();
+
+    let router_bridge_price = -1;
+    const bridge_res = swap_data.router_bridge_pair.getPoolPrice(!swap_data.router_bridge_mode, Number(router_bridge1_amt)  <=  0 || router_bridge1_amt == '' ? '1': router_bridge1_amt);
+    if ( bridge_res.output_price !== '0') {
+      router_bridge_price = (1 / parseFloat(bridge_res.output_price));
+    }
+    const router_bridge2_amt = new BigNumber(new BigNumber(bridge_res.dy).toFixed(Number(bridge_token2.decimal))).toString();
+
+    const to_res = swap_data.router_to_pair.getPoolPrice(!swap_data.router_to_mode, Number(router_bridge2_amt) <=  0 ? '-1': router_bridge2_amt);
+    let router_to_price = -1;
+    if ( to_res.output_price !== '0') {
+      router_to_price = (1 / parseFloat(to_res.output_price));
+    }
+    const token_y_amount = new BigNumber(to_res.dy).toFixed(Number(Number(token_x_amount) <=  0 || token_x_amount == '' ? 0 : swap_data.router_to_pair.getTokenY(swap_data.router_to_mode).decimal)).toString();
+    price = router_from_price * router_to_price * router_bridge_price;
+    const price_strings = this.getPriceString(swap_data.pair, swap_data.router_from_pair.getTokenX(swap_data.router_from_mode), swap_data.router_to_pair.getTokenY(swap_data.router_to_mode), price, price_invert);
+    return {price: price, dy: token_y_amount, price_strings: price_strings, bridge_amount1: router_bridge1_amt, bridge_amount2: router_bridge2_amt};
+  }
+
 
 }