stackswap-front-api-test-02 1.2.12 → 1.2.14

package/src/stackswap/manager/groupfarm.manager.ts

@@ -1,9 +1,9 @@
 import {
-    fetchCallReadOnlyFunction,
+    callReadOnlyFunction,
     contractPrincipalCV,
     cvToValue,
     FungibleConditionCode,
-    listCV,
+    listCV, makeContractNonFungiblePostCondition, makeStandardNonFungiblePostCondition,
     NonFungibleConditionCode,
     standardPrincipalCV,
     uintCV,
@@ -15,12 +15,10 @@ import {
     getReadOptions,
     getWriteOptions,
     parseAddressToCV,
-    createNonFungiblePostCondition
 } from "../util";
 import {StackswapAPI} from "../../index";
 import {BaseToken, Token} from "./token.manager";
 import axios from "axios";
-import {AssetString} from "@stacks/transactions/dist/types";
 
 export enum Mode {
     WITH_SERVER,
@@ -37,7 +35,7 @@ export class GroupFarmManager {
     async getFarmCounts() {
         const pair_details_options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_ONE_STEP_GROUP_FARM(), 'get-farm-counts', []);
         try {
-            const result = cvToValue(await fetchCallReadOnlyFunction(pair_details_options)).value;
+            const result = cvToValue(await callReadOnlyFunction(pair_details_options)).value;
             return result;
         } catch (e) {
             return('');
@@ -51,7 +49,7 @@ export class GroupFarmManager {
         }
         const pair_details_options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_ONE_STEP_GROUP_FARM(), 'get-farms', [listCV(listTemp)]);
         try {
-            const result = cvToValue(await fetchCallReadOnlyFunction(pair_details_options)).value;
+            const result = cvToValue(await callReadOnlyFunction(pair_details_options)).value;
             // console.log('farmLists', result);
             return result;
         } catch (e) {
@@ -62,7 +60,7 @@ export class GroupFarmManager {
     async getAllDatas(farming_contract: string) {
         const function_option = getReadOptions(this.stackswap, farming_contract, 'getAllDatas', [
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log('getFarmingUserRewardTotal', result);
         return result;
@@ -70,7 +68,7 @@ export class GroupFarmManager {
     async getRewardData(farming_contract: string) {
         const function_option = getReadOptions(this.stackswap, farming_contract, 'getAllRewardData', [
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log('getFarmingUserRewardTotal', result);
         return result;
@@ -81,7 +79,7 @@ export class GroupFarmManager {
             const function_option = getReadOptions(this.stackswap, farming_contract, 'getRewardRound', [
                 uintCV(bh)
             ]);
-            const result_raw = await fetchCallReadOnlyFunction(function_option);
+            const result_raw = await callReadOnlyFunction(function_option);
             const result = cvToValue(result_raw);
             // // console.log('farming round', result);
             return result.value;
@@ -91,8 +89,8 @@ export class GroupFarmManager {
     }
 
     async getCurrentFarmingRound2(farming_contract: string) {
-        const bh = await this.stackswap.getCurrentBlock();
-        return await this.getFarmingRound(Number(bh), farming_contract);
+        const bh = await this.stackswap.getCurrentBlocks();
+        return await this.getFarmingRound(Number(bh.tenure_block_height), farming_contract);
     }
 
 
@@ -100,7 +98,7 @@ export class GroupFarmManager {
         const function_option = getReadOptions(this.stackswap, farming_contract, 'getFirstBlockOfRound', [
             uintCV(cycle)
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log(result);
         return result;
@@ -114,7 +112,7 @@ export class GroupFarmManager {
             contractPrincipalCV(address[0], address[1]),
             standardPrincipalCV(this.stackswap.getSenderAddress()),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         try {
             // console.log('getFarmingStakerStatus', result);
@@ -142,7 +140,7 @@ export class GroupFarmManager {
         const function_option = getReadOptions(this.stackswap, farming_contract, 'getTotalData', [
             contractPrincipalCV(address[0], address[1]),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log('lp total data', result);
         try {
@@ -159,7 +157,7 @@ export class GroupFarmManager {
             contractPrincipalCV(address[0], address[1]),
             uintCV(cycle),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log('lp round data', result);
         try {
@@ -176,7 +174,7 @@ export class GroupFarmManager {
                 contractPrincipalCV(address[0], address[1]),
                 standardPrincipalCV(this.stackswap.getSenderAddress()),
             ]);
-            const result_raw = await fetchCallReadOnlyFunction(function_option);
+            const result_raw = await callReadOnlyFunction(function_option);
             const result = cvToValue(result_raw);
             // // console.log('get_farming_total',result.value);
             return result.value;
@@ -190,7 +188,7 @@ export class GroupFarmManager {
             const function_option = getReadOptions(this.stackswap, farming_contract, 'getUserNFTData', [
                 standardPrincipalCV(this.stackswap.getSenderAddress()),
             ]);
-            const result_raw = await fetchCallReadOnlyFunction(function_option);
+            const result_raw = await callReadOnlyFunction(function_option);
             const result = cvToValue(result_raw);
             // // console.log('get_farming_total',result.value);
             return result.value;
@@ -224,7 +222,7 @@ export class GroupFarmManager {
             standardPrincipalCV(this.stackswap.getSenderAddress()),
             uintCV(cycle),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log('reward', result);
         return result;
@@ -237,7 +235,7 @@ export class GroupFarmManager {
             standardPrincipalCV(this.stackswap.getSenderAddress()),
             uintCV(round),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log('getFarmingUserRewardTotal', result);
         return result;
@@ -247,7 +245,7 @@ export class GroupFarmManager {
         const function_option = getReadOptions(this.stackswap, farming_contract, 'getNFTFarmingReward', [
             standardPrincipalCV(this.stackswap.getSenderAddress()),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log('getFarmingUserRewardTotal', result);
         return result;
@@ -260,7 +258,7 @@ export class GroupFarmManager {
             contractPrincipalCV(address[0], address[1]),
             listCV(unclaimed_list),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log('getFarmingUserRewardTotal', result);
         return result;
@@ -271,7 +269,7 @@ export class GroupFarmManager {
         const pair_details_options: any = getReadOptions(this.stackswap, token.addr, 'get-balance',
           [contractPrincipalCV(this.stackswap.config.STACKSWAP_ADDRESS(), farming_contract)]);
         try {
-            const result = await fetchCallReadOnlyFunction(pair_details_options);
+            const result = await callReadOnlyFunction(pair_details_options);
             return cvToValue(result).value;
         } catch (e) {
             return 0;
@@ -344,7 +342,7 @@ export class GroupFarmManager {
         await openContractCall(function_option);
     }
 
-    async getNFTAsset(tokenStr: string) : Promise<AssetString> {
+    async getNFTAsset(tokenStr: string){
         // // console.log(tokenStr);
         const token_addr = tokenStr.split('.');
         const url = this.stackswap.config.STACKS_API_URL() + '/v2/contracts/interface/' + token_addr[0] + '/' + token_addr[1];
@@ -366,13 +364,13 @@ export class GroupFarmManager {
         for (const gold of goldList) {
             gold_list.push(uintCV(gold))
             post_condition.push(
-              createNonFungiblePostCondition(this.stackswap.getSenderAddress(), NonFungibleConditionCode.Sends, gold_asset_string, uintCV(gold)),
+              makeStandardNonFungiblePostCondition(this.stackswap.getSenderAddress(), NonFungibleConditionCode.Sends, gold_asset_string, uintCV(gold)),
             )
         }
         for (const silver of silverList) {
             silver_list.push(uintCV(silver))
             post_condition.push(
-              createNonFungiblePostCondition(this.stackswap.getSenderAddress(), NonFungibleConditionCode.Sends, silver_asset_string, uintCV(silver)),
+              makeStandardNonFungiblePostCondition(this.stackswap.getSenderAddress(), NonFungibleConditionCode.Sends, silver_asset_string, uintCV(silver)),
             )
         }
         const function_option = getWriteOptions(this.stackswap, farming_contract, 'stakeNFTs', [
@@ -389,7 +387,7 @@ export class GroupFarmManager {
         for (const gold of rewardList.returnNFTS.value) {
             // console.log(gold);
             post_condition.push(
-              createNonFungiblePostCondition(farming_contract, NonFungibleConditionCode.Sends, gold_asset_string, uintCV(gold.value)),
+              makeContractNonFungiblePostCondition(farming_contract.split('.')[0],farming_contract.split('.')[1], NonFungibleConditionCode.Sends, gold_asset_string, uintCV(gold.value)),
             )
         }
         if(rewardToken1 !== Token.getBaseTokens(this.stackswap, BaseToken.NULL).addr){

package/src/stackswap/manager/launchpad.manager.ts

@@ -5,7 +5,7 @@ import {
   getWriteOptions, parseAddressToCV
 } from "../util";
 import {
-  fetchCallReadOnlyFunction, contractPrincipalCV,
+  callReadOnlyFunction, contractPrincipalCV,
   cvToValue,
   FungibleConditionCode, listCV,
   stringAsciiCV,
@@ -33,7 +33,7 @@ export class LaunchpadManager {
   async getLiquidityList() {
     const pair_details_options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_ONE_STEP_MINT(), 'get-liquidity-token-list', []);
     try {
-      const result = cvToValue(await fetchCallReadOnlyFunction(pair_details_options)).value;
+      const result = cvToValue(await callReadOnlyFunction(pair_details_options)).value;
 
       return result[this.getRandomIntNum(0, result.length-1)].value;
 
@@ -47,7 +47,7 @@ export class LaunchpadManager {
   async getSoftTokenList() {
     const pair_details_options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_ONE_STEP_MINT(), 'get-soft-token-list', []);
     try {
-      const result = cvToValue(await fetchCallReadOnlyFunction(pair_details_options)).value;
+      const result = cvToValue(await callReadOnlyFunction(pair_details_options)).value;
       return result[this.getRandomIntNum(0, result.length-1)].value;
     } catch (e) {
       return('');
@@ -58,7 +58,7 @@ export class LaunchpadManager {
   async getPOXLTokenList() {
     const pair_details_options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_ONE_STEP_MINT(), 'get-poxl-token-list', []);
     try {
-      const result = cvToValue(await fetchCallReadOnlyFunction(pair_details_options)).value;
+      const result = cvToValue(await callReadOnlyFunction(pair_details_options)).value;
 
       return result[this.getRandomIntNum(0, result.length-1)].value;
     } catch (e) {
@@ -69,7 +69,7 @@ export class LaunchpadManager {
   async getCITYTokenList() {
     const pair_details_options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_ONE_STEP_MINT_CITY(), 'get-city-token-list', []);
     try {
-      const result = cvToValue(await fetchCallReadOnlyFunction(pair_details_options)).value;
+      const result = cvToValue(await callReadOnlyFunction(pair_details_options)).value;
 
       return result[this.getRandomIntNum(0, result.length-1)].value;
     } catch (e) {
@@ -80,7 +80,7 @@ export class LaunchpadManager {
   async getTemplatetFarmList() {
     const pair_details_options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_ONE_STEP_GROUP_FARM(), 'get-template-farm-list', []);
     try {
-      const result = cvToValue(await fetchCallReadOnlyFunction(pair_details_options)).value;
+      const result = cvToValue(await callReadOnlyFunction(pair_details_options)).value;
 
       return result[this.getRandomIntNum(0, result.length-1)].value;
     } catch (e) {

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

@@ -1,7 +1,7 @@
 import {getPostConditionFromAsset, getReadOptions, getWriteOptions} from "../util";
 import BigNumber from "bignumber.js";
 import {
-  fetchCallReadOnlyFunction,
+  callReadOnlyFunction,
   contractPrincipalCV, cvToValue, falseCV,
   FungibleConditionCode,
   standardPrincipalCV,
@@ -26,7 +26,7 @@ export class LbtcManager {
           []
         );
         // @ts-ignore
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(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 fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         return cvToValue(result_raw);
     }
 
@@ -48,7 +48,7 @@ export class LbtcManager {
           'get-vaults',
           [standardPrincipalCV(this.stackswap.getSenderAddress())]
         );
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         return cvToValue(result_raw);
     }
 
@@ -59,7 +59,7 @@ export class LbtcManager {
           'get-vault-by-id',
           [uintCV(vault_id)]
         );
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         return cvToValue(result_raw);
     }
 
@@ -69,7 +69,7 @@ export class LbtcManager {
           'get-vault-entries',
           [standardPrincipalCV(this.stackswap.getSenderAddress())]
         );
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(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 fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         return cvToValue(result_raw);
     }
 
@@ -543,7 +543,7 @@ export class LbtcManager {
               stringAsciiCV(token)
           ]
         );
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(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 fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         // // console.log(cvToValue(result_raw))
         return cvToValue(result_raw);
     }

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

@@ -1,8 +1,8 @@
 
 import {
-  fetchCallReadOnlyFunction,
+  callReadOnlyFunction,
   cvToValue,
-  FungibleConditionCode, listCV, NonFungibleConditionCode,
+  FungibleConditionCode, listCV, makeStandardNonFungiblePostCondition, NonFungibleConditionCode,
   standardPrincipalCV,
   uintCV
 } from "@stacks/transactions";
@@ -10,7 +10,6 @@ import axios from "axios";
 import {openContractCall} from "@stacks/connect";
 import BigNumber from "bignumber.js";
 import {
-  createNonFungiblePostCondition,
   getPostConditionFromAsset,
   getReadOptions,
   getWriteOptions,
@@ -33,7 +32,7 @@ export class LBTCStakingManager {
       'get-first-stacks-block-in-reward-cycle', [
         uintCV(cycle)
       ]);
-    const result_raw = await fetchCallReadOnlyFunction(function_option);
+    const result_raw = await callReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     return result;
   }
@@ -44,7 +43,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 fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // // console.log(cvToValue(result));
       return cvToValue(result).value;
     } catch (e) {
@@ -53,8 +52,8 @@ export class LBTCStakingManager {
   }
 
    async getCurrentStakingRound() {
-    const bh = await this.stackswap.getCurrentBlock();
-    return await this.getStakingRound(bh);
+    const bh = await this.stackswap.getCurrentBlocks();
+    return await this.getStakingRound(bh.tenure_block_height);
   }
 
   async getStaker() : Promise<{ unclaimedList: string[], amount: string, stakedList: string[] }> {
@@ -63,7 +62,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 fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // // console.log('reward', round, cvToValue(result));
       const res = cvToValue(result).value;
       // // console.log('getStaker', res);
@@ -88,7 +87,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 fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // // console.log('reward', round, cvToValue(result));
       const res = cvToValue(result).value;
       // // console.log('getRoundData', res);
@@ -104,7 +103,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 fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // // console.log('reward', round, cvToValue(result));
       const res = cvToValue(result).value;
       // // console.log('getRoundData', res);
@@ -138,7 +137,7 @@ export class LBTCStakingManager {
         standardPrincipalCV(this.stackswap.getSenderAddress()),
         uintCV(round_id)
       ]);
-    const result_raw = await fetchCallReadOnlyFunction(function_option);
+    const result_raw = await callReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     // // console.log("reward", round_id, result, result_raw)
     return result;
@@ -157,7 +156,7 @@ export class LBTCStakingManager {
         'get-staking-vault',[
           uintCV(nft)]
       );
-      const result_raw = await fetchCallReadOnlyFunction(function_option);
+      const result_raw = await callReadOnlyFunction(function_option);
       const result = cvToValue(result_raw);
         res_dict[nft] = result;
         id_list.push(nft);
@@ -217,8 +216,8 @@ export class LBTCStakingManager {
   async txReclaim(index:number, amountSTX:string, callback : any = null){
     // // console.log("Unstaking", amountSTX)
     const post_conditions = [];
-    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)))
+    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)))
     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,
@@ -243,7 +242,7 @@ export class LBTCStakingManager {
         standardPrincipalCV(this.stackswap.getSenderAddress()),
         listCV(reward_list),
       ]);
-    const result_raw = await fetchCallReadOnlyFunction(function_option);
+    const result_raw = await callReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     // // console.log("reward", result.rewardSum.value, result_raw)
     return result.rewardSum.value;
@@ -298,7 +297,7 @@ export class LBTCStakingManager {
     if ( block_height_input != "") {
       bh = block_height_input;
     } else {
-      bh = await this.stackswap.getCurrentBlock();
+      bh = (await this.stackswap.getCurrentBlocks()).tenure_block_height;
     }
     const block_height = Number(bh);
 
@@ -347,7 +346,7 @@ export class LBTCStakingManager {
         uintCV(cycle),
         standardPrincipalCV(user),
       ]);
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(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 {
-  fetchCallReadOnlyFunction,
+  callReadOnlyFunction,
   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 fetchCallReadOnlyFunction(pair_details_options);
+      const result = await callReadOnlyFunction(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 fetchCallReadOnlyFunction(pair_details_options);
+    const result = await callReadOnlyFunction(pair_details_options);
     // // console.log(functionName, cvToValue(result));
     return  cvToValue(result);
   }

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

@@ -1,20 +1,19 @@
 
 import {StackswapAPI} from "../../index";
 import {
-    createNonFungiblePostCondition,
     getPostConditionFromAsset,
     getReadOptions,
     getWriteOptions,
 } from "../util";
 import {openContractCall} from "@stacks/connect";
 import {
-    fetchCallReadOnlyFunction, contractPrincipalCV,
+    callReadOnlyFunction, contractPrincipalCV,
     cvToValue,
     FungibleConditionCode,
     listCV,
     standardPrincipalCV,
     TupleCV,
-    uintCV, NonFungibleConditionCode,
+    uintCV, NonFungibleConditionCode, makeStandardNonFungiblePostCondition,
 } from "@stacks/transactions";
 import BigNumber from "bignumber.js";
 import axios from "axios";
@@ -70,8 +69,8 @@ export class NftManager {
         }
     }
     async getPostConditionFromAssetNFT(account: string, tokenStr: string, condition: NonFungibleConditionCode, id: string) {
-        const assetString: any = await this.getNFTAsset(tokenStr);
-        return createNonFungiblePostCondition(account, condition, assetString, uintCV(id));
+        const assetString = await this.getNFTAsset(tokenStr);
+        return makeStandardNonFungiblePostCondition(account, condition, assetString, uintCV(id));
     }
 
     async mintNFT(price: string | number, addr: string, callback: any = null){
@@ -184,7 +183,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 fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log(result);
         return result.value;
@@ -194,7 +193,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 fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         try{
             return result.value.value;
@@ -207,7 +206,7 @@ export class NftManager {
         const function_option : any =  getReadOptions(this.stackswap, contract, 'get-mint-pass-balance', [
             standardPrincipalCV(this.stackswap.getSenderAddress()),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         try{
             return result;
@@ -220,7 +219,7 @@ export class NftManager {
         const function_option : any =  getReadOptions(this.stackswap, contract, 'get-balance', [
             standardPrincipalCV(this.stackswap.getSenderAddress()),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         try{
             // // console.log('result_raw', result_raw);
             // const result = cvToValue(result_raw);
@@ -236,7 +235,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 fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log(result);
         return result.value;
@@ -246,7 +245,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 fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log(result);
         return result.value;
@@ -255,7 +254,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 fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         try{
             const result = cvToValue(result_raw);
             return result;
@@ -267,7 +266,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 fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         try{
             const result = cvToValue(result_raw);
             return result;
@@ -280,7 +279,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 fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(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 {
-  fetchCallReadOnlyFunction, contractPrincipalCV,
+  callReadOnlyFunction, 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 fetchCallReadOnlyFunction(options);
+    const result = await callReadOnlyFunction(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 fetchCallReadOnlyFunction(options);
+    const result = await callReadOnlyFunction(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,
-  fetchCallReadOnlyFunction,
+  callReadOnlyFunction,
   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 fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(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 fetchCallReadOnlyFunction(options);
+    const result = await callReadOnlyFunction(options);
     // // console.log(cvToValue(result).value);
     return cvToValue(result).value;
   }