stackswap-front-api-test-02 1.2.9 → 1.2.11

package/src/stackswap/manager/lbtc.manager.ts

@@ -1,7 +1,7 @@
 import {getPostConditionFromAsset, getReadOptions, getWriteOptions} from "../util";
 import BigNumber from "bignumber.js";
 import {
-  callReadOnlyFunction,
+  fetchCallReadOnlyFunction,
   contractPrincipalCV, cvToValue, falseCV,
   FungibleConditionCode,
   standardPrincipalCV,
@@ -26,7 +26,7 @@ export class LbtcManager {
           []
         );
         // @ts-ignore
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         return cvToValue(result_raw);
     }
 
@@ -37,7 +37,7 @@ export class LbtcManager {
           'get-collateral-type-by-name',
           [stringAsciiCV(coll_type)]
         );
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         return cvToValue(result_raw);
     }
 
@@ -48,7 +48,7 @@ export class LbtcManager {
           'get-vaults',
           [standardPrincipalCV(this.stackswap.getSenderAddress())]
         );
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         return cvToValue(result_raw);
     }
 
@@ -59,7 +59,7 @@ export class LbtcManager {
           'get-vault-by-id',
           [uintCV(vault_id)]
         );
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         return cvToValue(result_raw);
     }
 
@@ -69,7 +69,7 @@ export class LbtcManager {
           'get-vault-entries',
           [standardPrincipalCV(this.stackswap.getSenderAddress())]
         );
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         // // console.log('getVaultIDFromUser2', cvToValue(result_raw))
         return cvToValue(result_raw);
     }
@@ -528,7 +528,7 @@ export class LbtcManager {
               contractPrincipalCV(this.stackswap.config.STACKSWAP_ADDRESS(), this.stackswap.config.CONTRACT_NAME_ORACLE())
           ]
         );
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         return cvToValue(result_raw);
     }
 
@@ -543,7 +543,7 @@ export class LbtcManager {
               stringAsciiCV(token)
           ]
         );
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         // // console.log(cvToValue(result_raw))
         return cvToValue(result_raw);
     }
@@ -558,7 +558,7 @@ export class LbtcManager {
               contractPrincipalCV(this.stackswap.config.STACKSWAP_ADDRESS(), this.stackswap.config.CONTRACT_NAME_COLLATERAL_TYPES()),
           ]
         );
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         // // console.log(cvToValue(result_raw))
         return cvToValue(result_raw);
     }

package/src/stackswap/manager/lbtcstaking.manager.ts

@@ -1,15 +1,22 @@
 
 import {
-  callReadOnlyFunction,
+  fetchCallReadOnlyFunction,
   cvToValue,
-  FungibleConditionCode, listCV, makeStandardNonFungiblePostCondition, NonFungibleConditionCode,
+  FungibleConditionCode, listCV, NonFungibleConditionCode,
   standardPrincipalCV,
   uintCV
 } from "@stacks/transactions";
 import axios from "axios";
 import {openContractCall} from "@stacks/connect";
 import BigNumber from "bignumber.js";
-import {getPostConditionFromAsset, getReadOptions, getWriteOptions, num2decimal, numFormat_} from "../util";
+import {
+  createNonFungiblePostCondition,
+  getPostConditionFromAsset,
+  getReadOptions,
+  getWriteOptions,
+  num2decimal,
+  numFormat_
+} from "../util";
 import {StackswapAPI} from "../../index";
 import {BaseToken, Token} from "./token.manager";
 
@@ -26,7 +33,7 @@ export class LBTCStakingManager {
       'get-first-stacks-block-in-reward-cycle', [
         uintCV(cycle)
       ]);
-    const result_raw = await callReadOnlyFunction(function_option);
+    const result_raw = await fetchCallReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     return result;
   }
@@ -37,7 +44,7 @@ export class LBTCStakingManager {
       const options = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_LBTC_STACKING_LOGIC_V3(), 'get-reward-cycle', [
         uintCV(block),
       ]);
-      const result = await callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(options);
       // // console.log(cvToValue(result));
       return cvToValue(result).value;
     } catch (e) {
@@ -56,7 +63,7 @@ export class LBTCStakingManager {
       const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_LBTC_STACKING_DATA_V3(), 'get-staker', [
         standardPrincipalCV(this.stackswap.getSenderAddress()),
       ]);
-      const result = await callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(options);
       // // console.log('reward', round, cvToValue(result));
       const res = cvToValue(result).value;
       // // console.log('getStaker', res);
@@ -81,7 +88,7 @@ export class LBTCStakingManager {
       const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_LBTC_STACKING_DATA_V3(), 'get-staking-stats-at-cycle', [
         uintCV(round),
       ]);
-      const result = await callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(options);
       // // console.log('reward', round, cvToValue(result));
       const res = cvToValue(result).value;
       // // console.log('getRoundData', res);
@@ -97,7 +104,7 @@ export class LBTCStakingManager {
       const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_STSW_STACKING_DATA_V2(), 'get-staking-stats-at-cycle-or-default', [
         uintCV(round),
       ]);
-      const result = await callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(options);
       // // console.log('reward', round, cvToValue(result));
       const res = cvToValue(result).value;
       // // console.log('getRoundData', res);
@@ -131,7 +138,7 @@ export class LBTCStakingManager {
         standardPrincipalCV(this.stackswap.getSenderAddress()),
         uintCV(round_id)
       ]);
-    const result_raw = await callReadOnlyFunction(function_option);
+    const result_raw = await fetchCallReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     // // console.log("reward", round_id, result, result_raw)
     return result;
@@ -150,7 +157,7 @@ export class LBTCStakingManager {
         'get-staking-vault',[
           uintCV(nft)]
       );
-      const result_raw = await callReadOnlyFunction(function_option);
+      const result_raw = await fetchCallReadOnlyFunction(function_option);
       const result = cvToValue(result_raw);
         res_dict[nft] = result;
         id_list.push(nft);
@@ -210,8 +217,8 @@ export class LBTCStakingManager {
   async txReclaim(index:number, amountSTX:string, callback : any = null){
     // // console.log("Unstaking", amountSTX)
     const post_conditions = [];
-    const assetString = `${this.stackswap.config.STACKSWAP_ADDRESS()}.${this.stackswap.config.CONTRACT_NAME_STACKSWAP_LBTC_STACKING_DATA_V3()}::lBTC-staking-vault`
-    post_conditions.push(await makeStandardNonFungiblePostCondition(this.stackswap.getSenderAddress(), NonFungibleConditionCode.Sends, assetString, uintCV(index)))
+    const assetString : any = `${this.stackswap.config.STACKSWAP_ADDRESS()}.${this.stackswap.config.CONTRACT_NAME_STACKSWAP_LBTC_STACKING_DATA_V3()}::lBTC-staking-vault`
+    post_conditions.push( createNonFungiblePostCondition(this.stackswap.getSenderAddress(), NonFungibleConditionCode.Sends, assetString, uintCV(index)))
     post_conditions.push(await getPostConditionFromAsset(this.stackswap, `${this.stackswap.config.STACKSWAP_ADDRESS()}.${this.stackswap.config.CONTRACT_NAME_STACKSWAP_LBTC_STACKING_DATA_V3()}`, this.stackswap.config.BASE_LBTC_DATA().addr, amountSTX, FungibleConditionCode.Equal))
     const function_option : any = getWriteOptions(
       this.stackswap,
@@ -236,7 +243,7 @@ export class LBTCStakingManager {
         standardPrincipalCV(this.stackswap.getSenderAddress()),
         listCV(reward_list),
       ]);
-    const result_raw = await callReadOnlyFunction(function_option);
+    const result_raw = await fetchCallReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     // // console.log("reward", result.rewardSum.value, result_raw)
     return result.rewardSum.value;
@@ -340,7 +347,7 @@ export class LBTCStakingManager {
         uintCV(cycle),
         standardPrincipalCV(user),
       ]);
-      const result = await callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(options);
       // // console.log(cvToValue(result));
       const res = cvToValue(result).value;
 

package/src/stackswap/manager/multisig.manager.ts

@@ -1,6 +1,6 @@
 import {openContractCall} from "@stacks/connect";
 import {
-  callReadOnlyFunction,
+  fetchCallReadOnlyFunction,
   cvToValue,
   falseCV,
   FungibleConditionCode,
@@ -62,7 +62,7 @@ export class MultisigManager {
     const pair_details_options : any = getReadOptions(this.stackswap, this.stackswap.config.BASE_STSW_DATA().addr, 'get-balance',
       [parseAddressToCV('SPVRC3RHFD58B2PY1HZD2V71THPW7G445WBRCQYW.octopus_v01')]);
     try {
-      const result = await callReadOnlyFunction(pair_details_options);
+      const result = await fetchCallReadOnlyFunction(pair_details_options);
       // // console.log('get-balance', cvToValue(result));
       return  cvToValue(result).value;
     } catch (e) {
@@ -75,7 +75,7 @@ export class MultisigManager {
   async getMultisigResult(functionName: string) {
     const pair_details_options : any = getReadOptions(this.stackswap, 'SPVRC3RHFD58B2PY1HZD2V71THPW7G445WBRCQYW.octopus_v01', functionName,
       []);
-    const result = await callReadOnlyFunction(pair_details_options);
+    const result = await fetchCallReadOnlyFunction(pair_details_options);
     // // console.log(functionName, cvToValue(result));
     return  cvToValue(result);
   }

package/src/stackswap/manager/nft.manager.ts

@@ -1,20 +1,24 @@
 
 import {StackswapAPI} from "../../index";
-import {getPostConditionFromAsset, getReadOptions, getWriteOptions} from "../util";
+import {
+    createNonFungiblePostCondition,
+    getPostConditionFromAsset,
+    getReadOptions,
+    getWriteOptions,
+} from "../util";
 import {openContractCall} from "@stacks/connect";
 import {
-    callReadOnlyFunction, contractPrincipalCV,
+    fetchCallReadOnlyFunction, contractPrincipalCV,
     cvToValue,
     FungibleConditionCode,
     listCV,
-    makeStandardNonFungiblePostCondition, NonFungibleConditionCode, standardPrincipalCV,
+    standardPrincipalCV,
     TupleCV,
-    uintCV
+    uintCV, NonFungibleConditionCode,
 } from "@stacks/transactions";
 import BigNumber from "bignumber.js";
 import axios from "axios";
 
-
 export class NftManager {
     stackswap : StackswapAPI;
 
@@ -66,8 +70,8 @@ export class NftManager {
         }
     }
     async getPostConditionFromAssetNFT(account: string, tokenStr: string, condition: NonFungibleConditionCode, id: string) {
-        const assetString = await this.getNFTAsset(tokenStr);
-        return makeStandardNonFungiblePostCondition(account, condition, assetString, uintCV(id));
+        const assetString: any = await this.getNFTAsset(tokenStr);
+        return createNonFungiblePostCondition(account, condition, assetString, uintCV(id));
     }
 
     async mintNFT(price: string | number, addr: string, callback: any = null){
@@ -180,7 +184,7 @@ export class NftManager {
         const function_option:any =  getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_AINFT(), 'get-nft-data', [
             uintCV(id),
         ]);
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log(result);
         return result.value;
@@ -190,7 +194,7 @@ export class NftManager {
         const function_option : any =  getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_AINFT(), 'get-owner', [
             uintCV(id),
         ]);
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         try{
             return result.value.value;
@@ -203,7 +207,7 @@ export class NftManager {
         const function_option : any =  getReadOptions(this.stackswap, contract, 'get-mint-pass-balance', [
             standardPrincipalCV(this.stackswap.getSenderAddress()),
         ]);
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         try{
             return result;
@@ -216,7 +220,7 @@ export class NftManager {
         const function_option : any =  getReadOptions(this.stackswap, contract, 'get-balance', [
             standardPrincipalCV(this.stackswap.getSenderAddress()),
         ]);
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         try{
             // // console.log('result_raw', result_raw);
             // const result = cvToValue(result_raw);
@@ -232,7 +236,7 @@ export class NftManager {
         const function_option : any =  getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_AINFT(), 'get-reserve-amount', [
             uintCV(id),
         ]);
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log(result);
         return result.value;
@@ -242,7 +246,7 @@ export class NftManager {
         const function_option : any =  getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_AINFT(), 'get-token-uri', [
             uintCV(id),
         ]);
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log(result);
         return result.value;
@@ -251,7 +255,7 @@ export class NftManager {
     async getTotalList(){
         const function_option : any =  getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_AINFT(), 'get-total-list', [
         ]);
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         try{
             const result = cvToValue(result_raw);
             return result;
@@ -263,7 +267,7 @@ export class NftManager {
     async getMarketList(){
         const function_option : any =  getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_AINFT(), 'get-market-list', [
         ], );
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         try{
             const result = cvToValue(result_raw);
             return result;
@@ -276,7 +280,7 @@ export class NftManager {
         const function_option : any =  getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_AINFT(), 'get-listing-in-ustx', [
             uintCV(id),
         ]);
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         try{
             // // console.log(result.value.price.value);

package/src/stackswap/manager/operator.manager.ts

@@ -3,7 +3,7 @@ import BigNumber from "bignumber.js";
 import {openContractCall} from "@stacks/connect";
 import {getPostConditionFromAsset, getReadOptions, getWriteOptions} from "../util";
 import {
-  callReadOnlyFunction, contractPrincipalCV,
+  fetchCallReadOnlyFunction, contractPrincipalCV,
   cvToValue,
   FungibleConditionCode, listCV,
   standardPrincipalCV, stringUtf8CV,
@@ -81,7 +81,7 @@ export class OperatorManager {
   async distributorGetInvestor(){
     const options = getReadOptions(this.stackswap, 'distributor0001', 'get-invester',
       [ standardPrincipalCV(this.stackswap.getSenderAddress())]);
-    const result = await callReadOnlyFunction(options);
+    const result = await fetchCallReadOnlyFunction(options);
     // // console.log(cvToValue(result));
 
     return cvToValue(result).value;
@@ -89,7 +89,7 @@ export class OperatorManager {
   async distributorGetReclaim(){
     const options : any = getReadOptions(this.stackswap, 'distributor0001', 'get-claimable-amount',
       [ standardPrincipalCV(this.stackswap.getSenderAddress())]);
-    const result = await callReadOnlyFunction(options);
+    const result = await fetchCallReadOnlyFunction(options);
     // // console.log(cvToValue(result));
 
     return cvToValue(result);

package/src/stackswap/manager/other.manager.ts

@@ -1,7 +1,7 @@
 import {openContractCall} from "@stacks/connect";
 import {
   // bufferCV,
-  callReadOnlyFunction,
+  fetchCallReadOnlyFunction,
   cvToValue,
   FungibleConditionCode,
   standardPrincipalCV,
@@ -24,7 +24,7 @@ export class OtherManager {
       const options = getReadOptions(this.stackswap, contract_address, 'get-user-rewards', [
         standardPrincipalCV(this.stackswap.getSenderAddress()),
       ]);
-      const result = await callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(options);
       return cvToValue(result).value;
     } catch (e) {
       return 0;
@@ -47,7 +47,7 @@ export class OtherManager {
   async get_pox_info(){
     const options = getReadOptions(this.stackswap, 'SP000000000000000000002Q6VF78.pox', 'get-pox-info',
       [ ]);
-    const result = await callReadOnlyFunction(options);
+    const result = await fetchCallReadOnlyFunction(options);
     // // console.log(cvToValue(result).value);
     return cvToValue(result).value;
   }

package/src/stackswap/manager/pool.manager.ts

@@ -1,4 +1,4 @@
-import {callReadOnlyFunction, cvToValue} from "@stacks/transactions";
+import {fetchCallReadOnlyFunction, cvToValue} from "@stacks/transactions";
 import BigNumber from "bignumber.js";
 import axios from "axios";
 import {StackswapAPI} from "../../index";
@@ -167,11 +167,11 @@ export class PoolManager {
     const pair_details_options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_SWAP(), 'get-pair-details',
       [ parseAddressToCV(token_x.addr), parseAddressToCV(token_y.addr) ]);
     try {
-      const result = await callReadOnlyFunction(pair_details_options);
+      const result = await fetchCallReadOnlyFunction(pair_details_options);
       // @ts-ignore
       // // console.log(result);
       // // console.log(cvToValue(result));
-      const result2 = await callReadOnlyFunction(getReadOptions(this.stackswap, cvToValue(result)['liquidity-token'].value, 'get-lp-data', []));
+      const result2 = await fetchCallReadOnlyFunction(getReadOptions(this.stackswap, cvToValue(result)['liquidity-token'].value, 'get-lp-data', []));
       // // console.log('cv-to-value',cvToValue(result2)['value']);
       // // console.log(cvToValue(result2).value);
       return LiquidityPool.parsePoolsFromServerData(cvToValue(result2).value, token_x, token_y, true);
@@ -186,9 +186,9 @@ export class PoolManager {
     const pair_details_options : any = getReadOptions(this.stackswap, swap_contract, 'get-pair-details',
       [ parseAddressToCV(token_x.addr), parseAddressToCV(token_y.addr) ]);
     try {
-      const result = await callReadOnlyFunction(pair_details_options);
+      const result = await fetchCallReadOnlyFunction(pair_details_options);
       // @ts-ignore
-      const result2 = await callReadOnlyFunction(getReadOptions(this.stackswap, cvToValue(result)['liquidity-token'].value, 'get-lp-data', []));
+      const result2 = await fetchCallReadOnlyFunction(getReadOptions(this.stackswap, cvToValue(result)['liquidity-token'].value, 'get-lp-data', []));
       // // console.log('cv-to-value',cvToValue(result2)['value']);
       // // console.log(cvToValue(result2).value);
       return LiquidityPool.parsePoolsFromServerData(cvToValue(result2).value, token_x, token_y, true);

package/src/stackswap/manager/poxl.manager.ts

@@ -2,7 +2,7 @@ import axios from "axios";
 import {openContractCall} from "@stacks/connect";
 import {decimal2integer, getPostConditionFromAsset, getReadOptions, getWriteOptions} from "../util";
 import {
-  callReadOnlyFunction,
+  fetchCallReadOnlyFunction,
   cvToValue,
   FungibleConditionCode,
   noneCV,
@@ -46,7 +46,7 @@ export class PoxlManager {
     await openContractCall(options);
   }
   async getRandomInt( contract_address: string, input: number) {
-    await callReadOnlyFunction( getReadOptions(this.stackswap, contract_address, 'get-random-uint-at-block', [uintCV(input)]));
+    await fetchCallReadOnlyFunction( getReadOptions(this.stackswap, contract_address, 'get-random-uint-at-block', [uintCV(input)]));
     // @ts-ignore
     // // console.log(result['value'].value.toString());
   }
@@ -88,7 +88,7 @@ export class PoxlManager {
       standardPrincipalCV(this.stackswap.getSenderAddress()),
       uintCV(block),
     ]);
-    const result = await callReadOnlyFunction(options);
+    const result = await fetchCallReadOnlyFunction(options);
     // // console.log(cvToValue(result));
     return cvToValue(result);
   }

package/src/stackswap/manager/staking.manager.ts

@@ -1,6 +1,6 @@
 
 import {
-  callReadOnlyFunction,
+  fetchCallReadOnlyFunction,
   contractPrincipalCV,
   cvToValue,
   FungibleConditionCode, listCV,
@@ -26,7 +26,7 @@ export class StakingManager {
       'get-first-stacks-block-in-reward-cycle', [
         uintCV(cycle)
       ]);
-    const result_raw = await callReadOnlyFunction(function_option);
+    const result_raw = await fetchCallReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     return result;
   }
@@ -36,7 +36,7 @@ export class StakingManager {
     const pair_details_options : any = getReadOptions(source, this.stackswap.config.BASE_STSW_DATA().addr, 'get-balance',
       [contractPrincipalCV(this.stackswap.config.STACKSWAP_ADDRESS(),this.stackswap.config.BASE_vSTSW_DATA().addr.split('.')[1])]);
     try {
-      const result = await callReadOnlyFunction(pair_details_options);
+      const result = await fetchCallReadOnlyFunction(pair_details_options);
       // // console.log(cvToValue(result));
       return  cvToValue(result).value;
     } catch (e) {
@@ -53,7 +53,7 @@ export class StakingManager {
       const options : any = getReadOptions(source, this.stackswap.config.CONTRACT_NAME_STACKSWAP_STSW_STACKING_DATA_V2(), 'get-staker', [
         standardPrincipalCV(this.stackswap.getSenderAddress()),
       ]);
-      const result = await callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(options);
       // // console.log('reward', round, cvToValue(result));
 
       const unclaimedList = [];
@@ -77,7 +77,7 @@ export class StakingManager {
       const options = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_STSW_STACKING_LOGIC_V2(), 'get-reward-cycle', [
         uintCV(block),
       ]);
-      const result = await callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(options);
       // // console.log(cvToValue(result));
       return cvToValue(result).value;
     } catch (e) {
@@ -92,7 +92,7 @@ export class StakingManager {
       const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_STSW_STACKING_DATA_V2(), 'get-staking-stats-at-cycle', [
         uintCV(round),
       ]);
-      const result = await callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(options);
       // // console.log('reward', round, cvToValue(result));
       const res = cvToValue(result).value;
       // // console.log('getRoundData', res);
@@ -107,7 +107,7 @@ export class StakingManager {
       const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_STSW_STACKING_DATA_V2(), 'get-staking-stats-at-cycle-or-default', [
         uintCV(round),
       ]);
-      const result = await callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(options);
       // // console.log('reward', round, cvToValue(result));
       const res = cvToValue(result).value;
       // console.log('getRoundData', res);
@@ -124,7 +124,7 @@ export class StakingManager {
         standardPrincipalCV(user),
       ]);
       // // console.log(cvToValue(result));ss
-      const result = await callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(options);
       // // console.log(cvToValue(result));
       const res = cvToValue(result).value;
       return {amount: res.amountSTSW.value, value: res.amountvSTSW.value};
@@ -188,7 +188,7 @@ export class StakingManager {
         standardPrincipalCV(this.stackswap.getSenderAddress()),
         uintCV(round_id)
       ]);
-    const result_raw = await callReadOnlyFunction(function_option);
+    const result_raw = await fetchCallReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     // // console.log("reward", round_id, result, result_raw)
     return Number(result);
@@ -222,7 +222,7 @@ export class StakingManager {
     address[0], address[1];
     const function_option : any = getReadOptions(this.stackswap, this.stackswap.config.BASE_vSTSW_DATA().addr,
       'get-user-count',[standardPrincipalCV(this.stackswap.getSenderAddress()) ]);
-    const result_raw = await callReadOnlyFunction(function_option);
+    const result_raw = await fetchCallReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     if(result == null){return 0}
     // tslint:disable-next-line:radix
@@ -231,7 +231,7 @@ export class StakingManager {
 
   async getStakingBalanceFromVSTSW_V2(){
     const function_option : any = getReadOptions(this.stackswap, this.stackswap.config.BASE_vSTSW_DATA().addr,'get-user-count',[standardPrincipalCV(this.stackswap.getSenderAddress()) ]);
-    const result_raw = await callReadOnlyFunction(function_option);
+    const result_raw = await fetchCallReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     // // console.log("V2", result)
     if(result == null){return 0}
@@ -252,7 +252,7 @@ export class StakingManager {
         standardPrincipalCV(this.stackswap.getSenderAddress()),
         uintCV(i)]
       );
-      const result_raw = await callReadOnlyFunction(function_option);
+      const result_raw = await fetchCallReadOnlyFunction(function_option);
       const result = cvToValue(result_raw);
       if ( !result.value.returned.value ){
         res_dict[i] = result;
@@ -272,7 +272,7 @@ export class StakingManager {
         standardPrincipalCV(this.stackswap.getSenderAddress()),
         uintCV(i)]
       );
-      const result_raw = await callReadOnlyFunction(function_option);
+      const result_raw = await fetchCallReadOnlyFunction(function_option);
       const result = cvToValue(result_raw);
       if(result.value.returned.value === false){
         // tslint:disable-next-line:radix
@@ -373,7 +373,7 @@ export class StakingManager {
         standardPrincipalCV(this.stackswap.getSenderAddress()),
         listCV(reward_list),
       ]);
-    const result_raw = await callReadOnlyFunction(function_option);
+    const result_raw = await fetchCallReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     // // console.log("reward", result.rewardSum.value, result_raw)
     return result.rewardSum.value;

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

@@ -25,6 +25,72 @@ export class SwapManager {
     this.stackswap = stackswap;
   }
 
+  async findRouterAll(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_all/' + 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 == Token.getBaseTokens(this.stackswap, BaseToken.STX).addr){
+        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 == Token.getBaseTokens(this.stackswap, BaseToken.STSW).addr) {
+        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[0] == Token.getBaseTokens(this.stackswap, BaseToken.STSW).addr && res.bridge_token[1] == Token.getBaseTokens(this.stackswap, BaseToken.STX).addr){
+        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[1] == Token.getBaseTokens(this.stackswap, BaseToken.STSW).addr && res.bridge_token[0] == Token.getBaseTokens(this.stackswap, BaseToken.STX).addr) {
+        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 findRouter4(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_v4/' + token_x.addr +'/'+token_y.addr + '/' + current_block;
     const result = await axios.get ( url,