stackswap-front-api-test-02 1.3.0 → 1.3.2

package/src/index.ts

@@ -1,4 +1,4 @@
-import {StacksMainnet, StacksMocknet, StacksNetwork, StacksTestnet} from "@stacks/network";
+import {STACKS_MAINNET, STACKS_MOCKNET, StacksNetwork, STACKS_TESTNET} from "@stacks/network";
 import axios from "axios";
 import {
   StackswapConfig,
@@ -20,7 +20,7 @@ import {PoolManager} from "./stackswap/manager/pool.manager";
 import {PoxlManager} from "./stackswap/manager/poxl.manager";
 import {StakingManager} from "./stackswap/manager/staking.manager";
 import {SwapManager} from "./stackswap/manager/swap.manager";
-import {AppConfig, showConnect, UserSession} from "@stacks/connect";
+import {connect, disconnect, isConnected as isWalletConnected, getLocalStorage} from "@stacks/connect";
 import {LBTCStakingManager} from "./stackswap/manager/lbtcstaking.manager";
 import {GroupFarmManager} from "./stackswap/manager/groupfarm.manager";
 import {BridgeManager} from "./stackswap/manager/bridge.manager";
@@ -88,7 +88,7 @@ export class StackswapMainnetAPI implements StackswapAPI{
     this.fixedSenderAddress = fixedSenderAddress;
 
     this.config = new StackswapMainetConfig(farm_end_cycle, fixedSTSWAPIAddress, networkAddress);
-    this.network = new StacksMainnet({url: api_url? api_url : this.config.STACKS_API_URL()});
+    this.network = { ...STACKS_MAINNET, client: { baseUrl: api_url? api_url : this.config.STACKS_API_URL() } };
     this.senderAdderss = this.config.NULL_ADDRESS();
     this.getConnectedWallet(((_err, _result) => {
     }));
@@ -143,103 +143,97 @@ export class StackswapMainnetAPI implements StackswapAPI{
   }
 
   walletConnect(callback: (err: any, result: any) => void): void {
-    try {
-      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',
-        },
-        redirectTo: '/',
-        onFinish: () => {
-          const profile = userSession.loadUserData().profile.stxAddress;
-          if (this.config.isMainnet()){
-            this.senderAdderss = profile.mainnet;
-          } else {
-            this.senderAdderss = profile.testnet;
-          }
+    connect()
+      .then((result) => {
+        // STX addresses start with 'SP' (mainnet) or 'ST' (testnet)
+        const stxAddresses = result.addresses.filter(a =>
+          a.address.startsWith('SP') || a.address.startsWith('ST')
+        );
+        const address = this.config.isMainnet()
+          ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
+          : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
+
+        if (address) {
+          this.senderAdderss = address;
           this.connected = true;
-
           callback(null, this.senderAdderss);
-        },
+        } else {
+          callback(new Error('No STX address found'), null);
+        }
+      })
+      .catch((e) => {
+        callback(e, null);
       });
-    } catch (e) {
-      callback(e, null);
-    }
   }
 
 
-  walletConnect2(userSession: UserSession, callback: (err: any, result: any) => void): void {
-    try {
-      showConnect({
-        appDetails: {
-          name: 'Stackswap',
-          icon: 'https://app.stackswap.org/favicon.ico',
-        },
-        redirectTo: '/',
-        onFinish: () => {
-          const profile = userSession.loadUserData().profile.stxAddress;
-          if (this.config.isMainnet()){
-            this.senderAdderss = profile.mainnet;
-          } else {
-            this.senderAdderss = profile.testnet;
-          }
-          this.connected = true;
-
-          callback(null, this.senderAdderss);
-        },
-        userSession
-      });
-    } catch (e) {
-      callback(e, null);
-    }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  walletConnect2(_userSession: any, callback: (err: any, result: any) => void): void {
+    // Note: userSession is deprecated in @stacks/connect v8, using new connect() API
+    this.walletConnect(callback);
   }
 
 
   getConnectedWallet(callback: (err: any, result: any) => void): void {
     try {
-      const appConfig = new AppConfig(['store_write', 'publish_data']);
-      const userSession = new UserSession({ appConfig });
-      const profile = userSession.loadUserData().profile.stxAddress;
-      if (this.config.isMainnet()){
-        this.senderAdderss = profile.mainnet;
-      } else {
-        this.senderAdderss = profile.testnet;
+      const storage = getLocalStorage();
+      if (!storage || !storage.addresses?.stx?.length) {
+        callback(new Error('No connected wallet'), null);
+        return;
       }
-      this.connected = true;
 
-      callback(null, this.senderAdderss);
+      const stxAddresses = storage.addresses.stx;
+      // SP = mainnet, ST = testnet
+      const address = this.config.isMainnet()
+        ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
+        : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
+
+      if (address) {
+        this.senderAdderss = address;
+        this.connected = true;
+        callback(null, this.senderAdderss);
+      } else {
+        callback(new Error('No STX address found'), null);
+      }
     } catch (e) {
-      callback( e, null);
+      callback(e, null);
     }
   }
 
   signOut(callback: (err: any, result: any) => void): void {
     try {
-      const appConfig = new AppConfig(['store_write', 'publish_data']);
-      const userSession = new UserSession({ appConfig });
-      userSession.signUserOut();
-
+      disconnect();
+      this.connected = false;
+      this.senderAdderss = '';
       callback(null, 'success');
     } catch (e) {
-      callback( e, null);
+      callback(e, null);
     }
   }
 
   isConnected(): boolean {
     try {
-      const appConfig = new AppConfig(['store_write', 'publish_data']);
-      const userSession = new UserSession({ appConfig });
-      const profile = userSession.loadUserData().profile.stxAddress;
-      if (this.config.isMainnet()){
-        this.senderAdderss = profile.mainnet;
-      } else {
-        this.senderAdderss = profile.testnet;
+      if (!isWalletConnected()) {
+        return false;
       }
-      this.connected = true;
-      return true;
+
+      const storage = getLocalStorage();
+      if (!storage || !storage.addresses?.stx?.length) {
+        return false;
+      }
+
+      const stxAddresses = storage.addresses.stx;
+      // SP = mainnet, ST = testnet
+      const address = this.config.isMainnet()
+        ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
+        : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
+
+      if (address) {
+        this.senderAdderss = address;
+        this.connected = true;
+        return true;
+      }
+      return false;
     } catch (e) {
       return false;
     }
@@ -252,7 +246,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 = new StacksTestnet();
+    this.network = STACKS_TESTNET;
   }
 
 }
@@ -263,7 +257,7 @@ export class StackswapDevnetAPI 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 StackswapDevnetConfig(farm_end_cycle);
-    this.network = new StacksMocknet();
+    this.network = STACKS_MOCKNET;
   }
 
 }

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

@@ -1,6 +1,6 @@
 
 import {
-  callReadOnlyFunction,
+  fetchCallReadOnlyFunction,
   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 callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(options);
+      const result = await fetchCallReadOnlyFunction(options);
       // console.log('getOrderInfoWallet_To', cvToValue(result));
       return  cvToValue(result);
     } catch (e) {

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

@@ -1,6 +1,6 @@
 
 import {
-    callReadOnlyFunction,
+    fetchCallReadOnlyFunction,
     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 callReadOnlyFunction(function_option);
+            const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(pair_details_options);
+            const result = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+            const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         try{
             const result = cvToValue(result_raw);
             // // console.log(result);

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

@@ -1,5 +1,5 @@
 import {
-    callReadOnlyFunction,
+    fetchCallReadOnlyFunction,
     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 callReadOnlyFunction(function_option);
+            const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+            const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+            const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+            const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(pair_details_options);
+            const result = await fetchCallReadOnlyFunction(pair_details_options);
             return cvToValue(result).value;
         } catch (e) {
             return 0;

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

@@ -1,5 +1,5 @@
 import {
-    callReadOnlyFunction,
+    fetchCallReadOnlyFunction,
     contractPrincipalCV,
     cvToValue, FungibleConditionCode,
     listCV,
@@ -88,7 +88,7 @@ export class Farm3Manager {
             contractPrincipalCV(address[0], address[1]),
             standardPrincipalCV(this.stackswap.getSenderAddress()),
         ]);
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         try {
             /*
@@ -164,7 +164,7 @@ export class Farm3Manager {
             uintCV(cycle),
             uintCV(group),
         ]);
-        const result_raw = await callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+            const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+        const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(pair_details_options);
+            const result = await fetchCallReadOnlyFunction(pair_details_options);
             return cvToValue(result).value;
         } catch (e) {
             return 0;

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

@@ -1,5 +1,5 @@
 import {
-  callReadOnlyFunction,
+  fetchCallReadOnlyFunction,
   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 callReadOnlyFunction(function_option);
+      const result_raw = await fetchCallReadOnlyFunction(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 callReadOnlyFunction(function_option);
+    const result_raw = await fetchCallReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     // // // console.log("TTT", cvToValue(result_raw))
     return [result['vote-count'].value, result.returned.value];