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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackswap-front-api-test-02",
-  "version": "1.2.11",
+  "version": "1.2.13",
   "description": "",
   "scripts": {
     "start": "tsc -b tsconfig.build.json --watch --verbose",
@@ -18,9 +18,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@stacks/connect": "^7.8.0",
-    "@stacks/transactions": "^7.0.0",
-    "@stacks/network": "^7.0.0",
+    "@stacks/connect": "^7.7.1",
+    "@stacks/transactions": "^6.16.1",
+    "@stacks/network": "^6.16.1",
     "axios": "^1.7.7",
     "bignumber.js": "^9.0.1"
   },

package/src/index.ts

@@ -1,4 +1,4 @@
-import {STACKS_MAINNET, STACKS_MOCKNET, STACKS_TESTNET, StacksNetwork} from "@stacks/network";
+import {StacksMainnet, StacksMocknet, StacksNetwork, StacksTestnet} from "@stacks/network";
 import axios from "axios";
 import {
   StackswapConfig,
@@ -52,7 +52,7 @@ export interface StackswapAPI {
   getSenderAddress: () => string;
   getQualifiedAddress: (address: string) => string;
   getCurrentBlock: () => Promise<string>;
-  getCurrentBlocks: () => Promise<{ block_height : string, burn_block_height: string }>;
+  getCurrentBlocks: () => Promise<{ block_height : string, burn_block_height: string, tenure_block_height: string }>;
   walletConnect: (callback: (arg: any) => void) => void;
   getConnectedWallet: (callback: (arg: any) => void) => void;
   signOut: (callback: (arg: any) => void) => void;
@@ -88,9 +88,7 @@ export class StackswapMainnetAPI implements StackswapAPI{
     this.fixedSenderAddress = fixedSenderAddress;
 
     this.config = new StackswapMainetConfig(farm_end_cycle, fixedSTSWAPIAddress, networkAddress);
-    this.network = STACKS_MAINNET;
-    this.network.client.baseUrl = api_url? api_url : this.config.STACKS_API_URL();
-      // new StacksMainnet({url: api_url? api_url : this.config.STACKS_API_URL()});
+    this.network = new StacksMainnet({url: api_url? api_url : this.config.STACKS_API_URL()});
     this.senderAdderss = this.config.NULL_ADDRESS();
     this.getConnectedWallet(((_err, _result) => {
     }));
@@ -149,6 +147,7 @@ export class StackswapMainnetAPI implements StackswapAPI{
       const appConfig = new AppConfig(['store_write', 'publish_data']);
       const userSession = new UserSession({ appConfig });
       showConnect({
+        userSession,
         appDetails: {
           name: 'Stackswap',
           icon: 'https://app.stackswap.org/favicon.ico',
@@ -253,7 +252,7 @@ export class StackswapTestnetAPI extends StackswapMainnetAPI {
   constructor(farm_end_cycle: string = '99999', fixedSenderAddress: string|null = null, api_url: string| null) {
     super(farm_end_cycle, fixedSenderAddress, api_url);
     this.config = new StackswapTestnetConfig(farm_end_cycle);
-    this.network = STACKS_TESTNET;
+    this.network = new StacksTestnet();
   }
 
 }
@@ -261,12 +260,12 @@ export class StackswapTestnetAPI extends StackswapMainnetAPI {
 
 export class StackswapDevnetAPI extends StackswapMainnetAPI {
 
-  constructor(farm_end_cycle: string = '99999', fixedSenderAddress: string | null = null, api_url: string | null) {
+  constructor(farm_end_cycle: string = '99999', fixedSenderAddress: string|null = null, api_url: string| null) {
     super(farm_end_cycle, fixedSenderAddress, api_url);
     this.config = new StackswapDevnetConfig(farm_end_cycle);
-    this.network = STACKS_MOCKNET;
-
+    this.network = new StacksMocknet();
   }
+
 }
 
 export class StackswapConfigAPI extends StackswapMainnetAPI {

package/src/stackswap/manager/bridge.manager.ts

@@ -1,6 +1,6 @@
 
 import {
-  fetchCallReadOnlyFunction,
+  callReadOnlyFunction,
   cvToValue, falseCV,
   FungibleConditionCode, listCV,
   stringAsciiCV, trueCV,
@@ -25,7 +25,7 @@ export class BridgeManager {
     const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_BRIDGE(), 'get-voters',
       []);
     try {
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       const temp2 = [];
       for (const cvToValueElement of cvToValue(result)) {
         temp2.push(cvToValueElement.value);
@@ -43,7 +43,7 @@ export class BridgeManager {
     const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_BRIDGE(), 'getVoteRes',
       []);
     try {
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // console.log('getVoteRes', cvToValue(result));
       return  cvToValue(result);
     } catch (e) {
@@ -58,7 +58,7 @@ export class BridgeManager {
     const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_BRIDGE(), 'GetFee',
       []);
     try {
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // console.log('GetFee', cvToValue(result));
       return  cvToValue(result);
     } catch (e) {
@@ -72,7 +72,7 @@ export class BridgeManager {
     const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_BRIDGE(), 'getETHToken',
       [parseAddressToCV(token)]);
     try {
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // console.log('getETHToken', cvToValue(result));
       return  cvToValue(result);
     } catch (e) {
@@ -86,7 +86,7 @@ export class BridgeManager {
     const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_BRIDGE(), 'getOrderIDInfo_From',
       [uintCV(id)]);
     try {
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // console.log('getOrderIDInfo_From', cvToValue(result));
       return  cvToValue(result);
     } catch (e) {
@@ -101,7 +101,7 @@ export class BridgeManager {
     const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_BRIDGE(), 'getOrderIDInfo_To',
       [uintCV(id)]);
     try {
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // console.log('getOrderIDInfo_To', cvToValue(result));
       return  cvToValue(result);
     } catch (e) {
@@ -115,7 +115,7 @@ export class BridgeManager {
     const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_BRIDGE(), 'getOrderInfo_To',
       [parseAddressToCV(token), uintCV(round)]);
     try {
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // console.log('getOrderInfoWallet_From', cvToValue(result));
       return  cvToValue(result);
     } catch (e) {
@@ -130,7 +130,7 @@ export class BridgeManager {
     const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_BRIDGE(), 'getOrderInfo_From',
       [parseAddressToCV(token), uintCV(round)]);
     try {
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // console.log('getOrderInfoWallet_To', cvToValue(result));
       return  cvToValue(result);
     } catch (e) {
@@ -144,7 +144,7 @@ export class BridgeManager {
     const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_BRIDGE(), 'getWithdrawInfo_Wallet',
       [parseAddressToCV(this.stackswap.getSenderAddress()),parseAddressToCV(token), uintCV(round)]);
     try {
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // console.log('getOrderInfoWallet_From', cvToValue(result));
       return  cvToValue(result);
     } catch (e) {
@@ -159,7 +159,7 @@ export class BridgeManager {
     const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_BRIDGE(), 'getDepositInfo_Wallet',
       [parseAddressToCV(this.stackswap.getSenderAddress()), parseAddressToCV(token), uintCV(round)]);
     try {
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // console.log('getOrderInfoWallet_To', cvToValue(result));
       return  cvToValue(result);
     } catch (e) {

package/src/stackswap/manager/farm.manager.ts

@@ -1,6 +1,6 @@
 
 import {
-    fetchCallReadOnlyFunction,
+    callReadOnlyFunction,
     contractPrincipalCV,
     cvToValue, FungibleConditionCode,
     listCV,
@@ -47,7 +47,7 @@ export class FarmManager {
             const function_option =  getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'get-reward-cycle', [
                 uintCV(bh)
             ]);
-            const result_raw = await fetchCallReadOnlyFunction(function_option);
+            const result_raw = await callReadOnlyFunction(function_option);
             const result = cvToValue(result_raw);
             return result.value;
         } catch (e) {
@@ -59,7 +59,7 @@ export class FarmManager {
         const function_option =  getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), '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);
         // // console.log(result);
         return result;
@@ -71,7 +71,7 @@ export class FarmManager {
             standardPrincipalCV(this.stackswap.getSenderAddress()),
             contractPrincipalCV(address[0],address[1]),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         try{
             // // console.log('getFarmingStakerStatus', result);
@@ -97,7 +97,7 @@ export class FarmManager {
         const pair_details_options : any = getReadOptions(this.stackswap, token.addr, 'get-balance',
           [contractPrincipalCV(this.stackswap.config.STACKSWAP_ADDRESS(), this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING()) ]);
         try {
-            const result = await fetchCallReadOnlyFunction(pair_details_options);
+            const result = await callReadOnlyFunction(pair_details_options);
             return cvToValue(result).value;
         } catch (e) {
             return 0;
@@ -126,7 +126,7 @@ export class FarmManager {
         const function_option =  getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'get-staking-stats-at-cycle', [
             uintCV(cycle),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log(result.value.amountUstx.value);
         try{
@@ -142,7 +142,7 @@ export class FarmManager {
             const function_option =  getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'get-farm-info', [
                 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('get_farming_total',result.value);
             return result.value;
@@ -159,7 +159,7 @@ export class FarmManager {
             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(result_raw);
         return result;
@@ -171,7 +171,7 @@ export class FarmManager {
             standardPrincipalCV(this.stackswap.getSenderAddress()),
             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('getFarmingUserRewardTotal', result);
         return result;
@@ -185,7 +185,7 @@ export class FarmManager {
             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;
@@ -198,7 +198,7 @@ export class FarmManager {
             standardPrincipalCV(this.stackswap.getSenderAddress()),
             contractPrincipalCV(address[0],address[1]),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         try{
             const result = cvToValue(result_raw);
             // // console.log(result);
@@ -248,8 +248,8 @@ export class FarmManager {
 
 
     async getCurrentFarmingRound() {
-        const bh = await this.stackswap.getCurrentBlock();
-        return await this.getFarmingRound(bh);
+        const bh = await this.stackswap.getCurrentBlocks();
+        return await this.getFarmingRound(bh.tenure_block_height);
     }
 
 
@@ -315,11 +315,11 @@ export class FarmManager {
         const oracle_stsw = (await this.stackswap.lbtcManager.getPrice('STSW'))['last-price'].value;
         const oracle_stx = (await this.stackswap.lbtcManager.getPrice('STX'))['last-price'].value;
         // const oracle_lbtc = (await this.stackswap.lbtcManager.getPrice('lBTC'))['last-price'].value;
-        const bh = await this.stackswap.getCurrentBlock();
+        const bh = await this.stackswap.getCurrentBlocks();
 
         const usd_stx = new BigNumber(oracle_stx).dividedBy(10**6).toNumber();
         const stsw_stx = new BigNumber(oracle_stsw).dividedBy(oracle_stx).toNumber();
-        const cur_round = await this.getFarmingRound(bh);
+        const cur_round = await this.getFarmingRound(bh.tenure_block_height);
         const farms: any[] = [];
         data.forEach((farm: any) => {
             if (farm.farm_group === 1) {

package/src/stackswap/manager/farm2.manager.ts

@@ -1,5 +1,5 @@
 import {
-    fetchCallReadOnlyFunction,
+    callReadOnlyFunction,
     contractPrincipalCV,
     cvToValue, FungibleConditionCode,
     listCV,
@@ -29,7 +29,7 @@ export class Farm2Manager {
             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;
@@ -42,7 +42,7 @@ export class Farm2Manager {
         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;
@@ -55,7 +55,7 @@ export class Farm2Manager {
             standardPrincipalCV(this.stackswap.getSenderAddress()),
         ]);
         try {
-            const result_raw = await fetchCallReadOnlyFunction(function_option);
+            const result_raw = await callReadOnlyFunction(function_option);
             const result = cvToValue(result_raw);
             // // console.log('migrate' , result);
             return result;
@@ -102,7 +102,7 @@ export class Farm2Manager {
             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);
@@ -129,7 +129,7 @@ export class Farm2Manager {
         const function_option = getReadOptions(this.stackswap, farming_contract, 'getTotalRoundDataOrDefault', [
             uintCV(cycle),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log('FARMING TOTAL', result);
         try {
@@ -151,7 +151,7 @@ export class Farm2Manager {
         const function_option = getReadOptions(this.stackswap, farming_contract, 'getLPTotalData', [
             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 {
@@ -168,7 +168,7 @@ export class Farm2Manager {
             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 {
@@ -189,7 +189,7 @@ export class Farm2Manager {
             const function_option = getReadOptions(this.stackswap, farming_contract, 'getLPTotalData', [
                 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('get_farming_total',result.value);
             return result.value;
@@ -205,7 +205,7 @@ export class Farm2Manager {
             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;
@@ -218,7 +218,7 @@ export class Farm2Manager {
             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;
@@ -231,7 +231,7 @@ export class Farm2Manager {
             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(result);
         return result.value.returnLP.value;
@@ -246,7 +246,7 @@ export class Farm2Manager {
                 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(result);
             return result.value;
@@ -291,7 +291,7 @@ export class Farm2Manager {
         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;
@@ -341,8 +341,8 @@ export class Farm2Manager {
     }
 
     async getCurrentFarmingRound2(farming_contract: string) {
-        const bh = await this.stackswap.getCurrentBlock();
-        return await this.getFarmingRound2(Number(bh), farming_contract);
+        const bh = await this.stackswap.getCurrentBlocks();
+        return await this.getFarmingRound2(Number(bh.tenure_block_height), farming_contract);
     }
 
     async getRewardBalanceFromFarming2(pool_addr: string, unclaimed_list: any, farming_contract: string) {
@@ -395,8 +395,8 @@ export class Farm2Manager {
         const oracle_stsw = (await this.stackswap.lbtcManager.getPrice('STSW'))['last-price'].value;
         const oracle_stx = (await this.stackswap.lbtcManager.getPrice('STX'))['last-price'].value;
         const oracle_lbtc = (await this.stackswap.lbtcManager.getPrice('lBTC'))['last-price'].value;
-        const bh = await this.stackswap.getCurrentBlock();
-        return await this.getEachFarmData(data, bh, {oracle_stsw, oracle_lbtc, oracle_stx}, type, callback)
+        const bh = await this.stackswap.getCurrentBlocks();
+        return await this.getEachFarmData(data, bh.tenure_block_height, {oracle_stsw, oracle_lbtc, oracle_stx}, type, callback)
     }
 
     checkAndSetFarmAPR(farms : any, farm_length: number, oracle_data: any){

package/src/stackswap/manager/farm3.manager.ts

@@ -1,5 +1,5 @@
 import {
-    fetchCallReadOnlyFunction,
+    callReadOnlyFunction,
     contractPrincipalCV,
     cvToValue, FungibleConditionCode,
     listCV,
@@ -34,8 +34,8 @@ export class Farm3Manager {
 
 
     async getCurrentFarmingRound3() {
-        const bh = await this.stackswap.getCurrentBlock();
-        return await this.getFarmingRound3(Number(bh));
+        const bh = await this.stackswap.getCurrentBlocks();
+        return await this.getFarmingRound3(Number(bh.tenure_block_height));
     }
 
     async getFarmingRoundFirstBlock3(cycle: number) {
@@ -88,7 +88,7 @@ export class Farm3Manager {
             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 {
             /*
@@ -122,7 +122,7 @@ export class Farm3Manager {
             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 {
             /*
@@ -164,7 +164,7 @@ export class Farm3Manager {
             uintCV(cycle),
             uintCV(group),
         ]);
-        const result_raw = await fetchCallReadOnlyFunction(function_option);
+        const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         // // console.log('FARMING TOTAL', result);
         try {
@@ -186,7 +186,7 @@ export class Farm3Manager {
         const function_option = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING_DATA_3(), 'getLPOrDefault', [
             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 {
@@ -202,7 +202,7 @@ export class Farm3Manager {
             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 {
@@ -229,7 +229,7 @@ export class Farm3Manager {
                 // contractPrincipalCV(address[0], address[1]),
                 uintCV(group)
             ]);
-            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.CurRewardAmt.value;
@@ -244,7 +244,7 @@ export class Farm3Manager {
             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, pool_address, this.stackswap.getSenderAddress(), cycle);
         return result;
@@ -262,7 +262,7 @@ export class Farm3Manager {
             pool_address,
             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;
@@ -273,7 +273,7 @@ export class Farm3Manager {
         const pair_details_options: any = getReadOptions(this.stackswap, token.addr, 'get-balance',
           [contractPrincipalCV(this.stackswap.config.STACKSWAP_ADDRESS(), this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING_DATA_3())]);
         try {
-            const result = await fetchCallReadOnlyFunction(pair_details_options);
+            const result = await callReadOnlyFunction(pair_details_options);
             return cvToValue(result).value;
         } catch (e) {
             return 0;
@@ -408,8 +408,8 @@ export class Farm3Manager {
         const oracle_stsw = (await this.stackswap.lbtcManager.getPrice('STSW'))['last-price'].value;
         const oracle_stx = (await this.stackswap.lbtcManager.getPrice('STX'))['last-price'].value;
         const oracle_lbtc = (await this.stackswap.lbtcManager.getPrice('lBTC'))['last-price'].value;
-        const bh = await this.stackswap.getCurrentBlock();
-        return await this.getEachFarmData(data, bh, {oracle_stsw, oracle_lbtc, oracle_stx}, type, callback)
+        const bh = await this.stackswap.getCurrentBlocks();
+        return await this.getEachFarmData(data, bh.tenure_block_height, {oracle_stsw, oracle_lbtc, oracle_stx}, type, callback)
     }
 
     checkAndSetFarmAPR(farms : any, farm_length: number, oracle_data: any){

package/src/stackswap/manager/governance.manager.ts

@@ -1,5 +1,5 @@
 import {
-  fetchCallReadOnlyFunction,
+  callReadOnlyFunction,
   cvToValue,
   FungibleConditionCode, listCV,
   standardPrincipalCV,
@@ -31,7 +31,7 @@ export class GovernanceManager {
         args.push(listCV(arg2))
       }
       const function_option : any = getReadOptions(this.stackswap, governance.name,'get-proposals',args);
-      const result_raw = await fetchCallReadOnlyFunction(function_option);
+      const result_raw = await callReadOnlyFunction(function_option);
 
       const result = cvToValue(result_raw);
 
@@ -55,7 +55,7 @@ export class GovernanceManager {
         uintCV(proposal_id),
         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("TTT", cvToValue(result_raw))
     return [result['vote-count'].value, result.returned.value];