stackswap-front-api-test-02 1.0.145 → 1.0.148

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(), 'router-swap', [
+      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', [