stackswap-front-api-test-02 1.0.38 → 1.0.46

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

@@ -8,7 +8,7 @@ import {
 } from '@stacks/transactions';
 import BigNumber from 'bignumber.js';
 import {openContractCall} from '@stacks/connect';
-import {getPostConditionFromAsset, getReadOptions, getWriteOptions, num2decimal, numFormat_} from "../util";
+import {getPostConditionFromAsset, getReadOptions, getWriteOptions, num2decimal} from "../util";
 import {StackswapAPI} from "../../index";
 
 
@@ -18,10 +18,10 @@ export class Farm2Manager {
     constructor(stackswap: StackswapAPI) {
         this.stackswap = stackswap;
     }
-    
-    async getFarmingRound( bh: number) {
+
+    async getFarmingRound2(bh: number, farming_contract: string) {
         try {
-            const function_option = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'getRewardRound', [
+            const function_option = getReadOptions(this.stackswap, farming_contract, 'getRewardRound', [
                 uintCV(bh)
             ]);
             const result_raw = await callReadOnlyFunction(function_option);
@@ -33,9 +33,8 @@ export class Farm2Manager {
         }
     }
 
-
-    async getFarmingRoundFirstBlock( cycle: number) {
-        const function_option = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'getFirstBlockOfRound', [
+    async getFarmingRoundFirstBlock2(cycle: number, farming_contract: string) {
+        const function_option = getReadOptions(this.stackswap, farming_contract, 'getFirstBlockOfRound', [
             uintCV(cycle)
         ]);
         const result_raw = await callReadOnlyFunction(function_option);
@@ -44,10 +43,9 @@ export class Farm2Manager {
         return result;
     }
 
-
-    async isUserMigratable( pool_address: string) {
+    async isUserMigratable2(pool_address: string, farming_contract: string) {
         const address = pool_address.split('.');
-        const function_option = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'isUserMigratable', [
+        const function_option = getReadOptions(this.stackswap, farming_contract, 'isUserMigratable', [
             contractPrincipalCV(address[0], address[1]),
             standardPrincipalCV(this.stackswap.getSenderAddress()),
         ]);
@@ -61,29 +59,29 @@ export class Farm2Manager {
         }
     }
 
-    getPoolUSDPriceFarm(farm: any, farm_total: any, oracle_stx: any, oracle_stsw: any, oracle_lbtc: any) {
+    getPoolUSDPriceFarm(farm: any, farm_total: any, oracle_data: { oracle_stx: any, oracle_stsw: any, oracle_lbtc: any }) {
         // BigNumber.config({ DECIMAL_PLACES: 6});
         let tvl = 0;
         switch (farm.BASE) {
             case 'STX':
                 if (farm.token_x.symbol === farm.BASE) {
-                    tvl = (new BigNumber(farm.pair['balance-x'].value).multipliedBy(farm_total).dividedBy(farm.pair['shares-total'].value).dividedBy(new BigNumber(10 ** 12))).multipliedBy(2).multipliedBy(new BigNumber(oracle_stx)).toNumber();
+                    tvl = (new BigNumber(farm.pair['balance-x'].value).multipliedBy(farm_total).dividedBy(farm.pair['shares-total'].value).dividedBy(new BigNumber(10 ** 12))).multipliedBy(2).multipliedBy(new BigNumber(oracle_data.oracle_stx)).toNumber();
                 } else {
-                    tvl = (new BigNumber(farm.pair['balance-y'].value).multipliedBy(farm_total).dividedBy(farm.pair['shares-total'].value).dividedBy(new BigNumber(10 ** 12))).multipliedBy(2).multipliedBy(new BigNumber(oracle_stx)).toNumber();
+                    tvl = (new BigNumber(farm.pair['balance-y'].value).multipliedBy(farm_total).dividedBy(farm.pair['shares-total'].value).dividedBy(new BigNumber(10 ** 12))).multipliedBy(2).multipliedBy(new BigNumber(oracle_data.oracle_stx)).toNumber();
                 }
                 break;
             case 'STSW':
                 if (farm.token_x.symbol === farm.BASE) {
-                    tvl = (new BigNumber(farm.pair['balance-x'].value).multipliedBy(farm_total).dividedBy(farm.pair['shares-total'].value).dividedBy(new BigNumber(10 ** 12))).multipliedBy(2).multipliedBy(new BigNumber(oracle_stsw)).toNumber();
+                    tvl = (new BigNumber(farm.pair['balance-x'].value).multipliedBy(farm_total).dividedBy(farm.pair['shares-total'].value).dividedBy(new BigNumber(10 ** 12))).multipliedBy(2).multipliedBy(new BigNumber(oracle_data.oracle_stsw)).toNumber();
                 } else {
-                    tvl = (new BigNumber(farm.pair['balance-y'].value).multipliedBy(farm_total).dividedBy(farm.pair['shares-total'].value).dividedBy(new BigNumber(10 ** 12))).multipliedBy(2).multipliedBy(new BigNumber(oracle_stsw)).toNumber();
+                    tvl = (new BigNumber(farm.pair['balance-y'].value).multipliedBy(farm_total).dividedBy(farm.pair['shares-total'].value).dividedBy(new BigNumber(10 ** 12))).multipliedBy(2).multipliedBy(new BigNumber(oracle_data.oracle_stsw)).toNumber();
                 }
                 break;
             case 'lBTC':
                 if (farm.token_x.symbol === farm.BASE) {
-                    tvl = (new BigNumber(farm.pair['balance-x'].value).multipliedBy(farm_total).dividedBy(farm.pair['shares-total'].value).dividedBy(new BigNumber(10 ** 14))).multipliedBy(2).multipliedBy(new BigNumber(oracle_lbtc)).toNumber();
+                    tvl = (new BigNumber(farm.pair['balance-x'].value).multipliedBy(farm_total).dividedBy(farm.pair['shares-total'].value).dividedBy(new BigNumber(10 ** 14))).multipliedBy(2).multipliedBy(new BigNumber(oracle_data.oracle_lbtc)).toNumber();
                 } else {
-                    tvl = (new BigNumber(farm.pair['balance-y'].value).multipliedBy(farm_total).dividedBy(farm.pair['shares-total'].value).dividedBy(new BigNumber(10 ** 14))).multipliedBy(2).multipliedBy(new BigNumber(oracle_lbtc)).toNumber();
+                    tvl = (new BigNumber(farm.pair['balance-y'].value).multipliedBy(farm_total).dividedBy(farm.pair['shares-total'].value).dividedBy(new BigNumber(10 ** 14))).multipliedBy(2).multipliedBy(new BigNumber(oracle_data.oracle_lbtc)).toNumber();
                 }
                 break;
             default:
@@ -92,35 +90,35 @@ export class Farm2Manager {
         return tvl;
     }
 
-
-    async getFarming(pair: any, token_x: any, token_y: any, farm_total: any) {
-        // BigNumber.config({ DECIMAL_PLACES: 6});
-        const x_token_addr = token_x.addr;
-        // console.log(token_x.addr);
-        const y_token_addr = token_y.addr;
-        // console.log(token_y.addr);
-        let total_balacne = new BigNumber(-1);
-        if (x_token_addr === this.stackswap.config.BASE_WSTX_DATA().addr) {
-            total_balacne = (new BigNumber(pair['balance-x'].value).multipliedBy(farm_total).dividedBy(pair['shares-total'].value).dividedBy(new BigNumber(10 ** token_x.decimal))).multipliedBy(2);
-        } else if (y_token_addr === this.stackswap.config.BASE_WSTX_DATA().addr) {
-            total_balacne = (new BigNumber(pair['balance-y'].value).multipliedBy(farm_total).dividedBy(pair['shares-total'].value).dividedBy(new BigNumber(10 ** token_y.decimal))).multipliedBy(2);
-        }
-        // console.log('pool_stx_price', token_x.addr, token_y.addr,token_x.balance, token_y.balance,total_balacne.toNumber());
-        // console.log(pair["balance-x"].value, pair["balance-y"].value, total_balacne.toNumber());
-        return total_balacne;
-    }
-
-
-    async getFarmingStakerStatus( pool_address: string, cur_round: number) {
+    //
+    // async getFarming(pair: any ,token_x: any, token_y: any, farm_total: any){
+    //     // BigNumber.config({ DECIMAL_PLACES: 6});
+    //     const x_token_addr = token_x.addr;
+    //     // console.log(token_x.addr);
+    //     const y_token_addr = token_y.addr;
+    //     // console.log(token_y.addr);
+    //     let total_balacne = new BigNumber(-1);
+    //     if(x_token_addr === this.stackswap.config.BASE_WSTX_DATA().addr){
+    //         total_balacne =  (new BigNumber(pair['balance-x'].value).multipliedBy(farm_total).dividedBy(pair['shares-total'].value).dividedBy(new BigNumber(10 ** token_x.decimal))).multipliedBy(2);
+    //     }else if(y_token_addr === this.stackswap.config.BASE_WSTX_DATA().addr){
+    //         total_balacne =  (new BigNumber(pair['balance-y'].value).multipliedBy(farm_total).dividedBy(pair['shares-total'].value).dividedBy(new BigNumber(10 ** token_y.decimal))).multipliedBy(2);
+    //     }
+    //     // console.log('pool_stx_price', token_x.addr, token_y.addr,token_x.balance, token_y.balance,total_balacne.toNumber());
+    //     // console.log(pair["balance-x"].value, pair["balance-y"].value, total_balacne.toNumber());
+    //     return total_balacne;
+    // }
+
+    async getFarmingStakerStatus2(pool_address: string, cur_round: number, farming_contract: string) {
         const address = pool_address.split('.');
-        const function_option = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'getLPUserData', [
+        console.log('getFarmingStakerStatus', farming_contract);
+        const function_option = getReadOptions(this.stackswap, farming_contract, 'getLPUserData', [
             contractPrincipalCV(address[0], address[1]),
             standardPrincipalCV(this.stackswap.getSenderAddress()),
         ]);
         const result_raw = await callReadOnlyFunction(function_option);
         const result = cvToValue(result_raw);
         try {
-            // console.log('getFarmingStakerStatus', result);
+            console.log('getFarmingStakerStatus', result);
             const pooledToken = result.value.amountLP.value;
             const unclaimedList = [];
             const stakedList = []
@@ -134,15 +132,14 @@ export class Farm2Manager {
             // console.log({pooledToken, unclaimedList, stakedList});
             return {pooledToken, unclaimedList, stakedList};
         } catch (e) {
-            // console.log(e);
+            console.log(e);
             return {pooledToken: 0, unclaimedList: [], stakedList: []}
         }
     }
 
-
-    async getFarmingTotalStatusCycle( cycle: number) {
+    async getFarmingTotalStatusCycle2(cycle: number, farming_contract: string) {
         // console.log(cycle);
-        const function_option = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'getTotalRoundDataOrDefault', [
+        const function_option = getReadOptions(this.stackswap, farming_contract, 'getTotalRoundDataOrDefault', [
             uintCV(cycle),
         ]);
         const result_raw = await callReadOnlyFunction(function_option);
@@ -162,31 +159,9 @@ export class Farm2Manager {
         }
     }
 
-
-    /**
-     *
-     * @param this.stackswap
-     * @param pool_address
-     * @param cycle
-     *
-     * {
-     *     "type": "(tuple (amountLP uint) (weight uint))",
-     *     "value": {
-     *         "amountLP": {
-     *             "type": "uint",
-     *             "value": "122000000"
-     *         },
-     *         "weight": {
-     *             "type": "uint",
-     *             "value": "1"
-     *         }
-     *     }
-     * }
-     */
-
-    async getFarmingTotalPoolStatus( pool_address: string) {
+    async getFarmingTotalPoolStatus2(pool_address: string, farming_contract: string) {
         const address = pool_address.split('.');
-        const function_option = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'getLPTotalData', [
+        const function_option = getReadOptions(this.stackswap, farming_contract, 'getLPTotalData', [
             contractPrincipalCV(address[0], address[1]),
         ]);
         const result_raw = await callReadOnlyFunction(function_option);
@@ -200,23 +175,9 @@ export class Farm2Manager {
         }
     }
 
-    /**
-     *
-     * @param this.stackswap
-     * @param pool_address
-     * @param cycle
-     *
-     *     {
-     *       value: u0,
-     *       weight: u0,
-     *       amountLP: u0,
-     *       price: u0
-     *     }
-     */
-
-    async getFarmingTotalPoolStatusCycle( pool_address: string, cycle: number) {
+    async getFarmingTotalPoolStatusCycle2(pool_address: string, cycle: number, farming_contract: string) {
         const address = pool_address.split('.');
-        const function_option = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'getLPRoundData', [
+        const function_option = getReadOptions(this.stackswap, farming_contract, 'getLPRoundData', [
             contractPrincipalCV(address[0], address[1]),
             uintCV(cycle),
         ]);
@@ -230,11 +191,10 @@ export class Farm2Manager {
         }
     }
 
-
-    async getFarmingTotalValue( pool_address: string) {
+    async getFarmingTotalValue2(pool_address: string, farming_contract: string) {
         try {
             const address = pool_address.split('.');
-            const function_option = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'getLPTotalData', [
+            const function_option = getReadOptions(this.stackswap, farming_contract, 'getLPTotalData', [
                 contractPrincipalCV(address[0], address[1]),
             ]);
             const result_raw = await callReadOnlyFunction(function_option);
@@ -246,11 +206,9 @@ export class Farm2Manager {
         }
     }
 
-
-
-    async getFarmingUserRewardPerCycle( pool_address: string, cycle: number) {
+    async getFarmingUserRewardPerCycle2(pool_address: string, cycle: number, farming_contract: string) {
         const address = pool_address.split('.');
-        const function_option = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'getFarmingReward', [
+        const function_option = getReadOptions(this.stackswap, farming_contract, 'getFarmingReward', [
             contractPrincipalCV(address[0], address[1]),
             standardPrincipalCV(this.stackswap.getSenderAddress()),
             uintCV(cycle),
@@ -261,11 +219,9 @@ export class Farm2Manager {
         return result;
     }
 
-
-
-    async getFarmingUserRewardList( pool_address: string, unclaimed_list: any) {
+    async getFarmingUserRewardList2(pool_address: string, unclaimed_list: any, farming_contract: string) {
         const address = pool_address.split('.');
-        const function_option = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'getFarmingRewardFromList', [
+        const function_option = getReadOptions(this.stackswap, farming_contract, 'getFarmingRewardFromList', [
             standardPrincipalCV(this.stackswap.getSenderAddress()),
             contractPrincipalCV(address[0], address[1]),
             listCV(unclaimed_list),
@@ -277,9 +233,9 @@ export class Farm2Manager {
     }
 
 
-    async getFarmingRewardInfo( pool_address: string, cycle: number) {
+    async getFarmingRewardInfo2(pool_address: string, cycle: number, farming_contract: string) {
         const address = pool_address.split('.');
-        const function_option = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'getLPUserRoundData', [
+        const function_option = getReadOptions(this.stackswap, farming_contract, 'getLPUserRoundData', [
             contractPrincipalCV(address[0], address[1]),
             standardPrincipalCV(this.stackswap.getSenderAddress()),
             uintCV(cycle),
@@ -290,22 +246,20 @@ export class Farm2Manager {
         return result.value.returnLP.value;
     }
 
-
-    async migrateToVersion2( pool_address: string, callback: any = null) {
+    async migrateToVersion2(pool_address: string, farming_contract: string, callback: any) {
         const address = pool_address.split('.');
         // console.log(amountTokens);
-        const function_option = getWriteOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'migrateFromVersion1', [
+        const function_option = getWriteOptions(this.stackswap, farming_contract, 'migrateFromVersion1', [
             contractPrincipalCV(address[0], address[1]),
         ], [], callback);
         await openContractCall(function_option);
     }
 
-
-    async stakeFarmingContract( pool_address: string, amountTokens: string, lockPeriod: number, callback: any = null) {
+    async stakeFarmingContract2(pool_address: string, amountTokens: string, lockPeriod: number, callback: any, farming_contract: string) {
         const address = pool_address.split('.');
         // console.log(amountTokens);
         const amount = new BigNumber(amountTokens).multipliedBy(10 ** 6).toFixed(0).toString();
-        const function_option = getWriteOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'stakeTokens', [
+        const function_option = getWriteOptions(this.stackswap, farming_contract, 'stakeTokens', [
             uintCV(amount),
             contractPrincipalCV(address[0], address[1]),
             uintCV(lockPeriod),
@@ -314,10 +268,10 @@ export class Farm2Manager {
         await openContractCall(function_option);
     }
 
-    async getFarmBalance( token: any) {
+    async getFarmBalance2(token: any, farming_contract: string) {
         // console.log("getBalance", token)
         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())]);
+          [contractPrincipalCV(this.stackswap.config.STACKSWAP_ADDRESS(), farming_contract)]);
         try {
             const result = await callReadOnlyFunction(pair_details_options);
             return cvToValue(result).value;
@@ -326,13 +280,12 @@ export class Farm2Manager {
         }
     }
 
-
-    async claimFarmingContract( pool_address: string, cycle: number, amount_STSW: string, amount_LP: string, callback: any = null) {
+    async claimFarmingContract2(pool_address: string, cycle: number, amount_STSW: string, amount_LP: string, callback: any, farming_contract: string) {
         const address = pool_address.split('.');
         const post_condition = [];
-        post_condition.push(await getPostConditionFromAsset(this.stackswap, this.stackswap.config.STACKSWAP_ADDRESS() + '.' + this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), this.stackswap.config.BASE_STSW_DATA().addr, amount_STSW, FungibleConditionCode.Equal));
-        post_condition.push(await getPostConditionFromAsset(this.stackswap, this.stackswap.config.STACKSWAP_ADDRESS() + '.' + this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), pool_address, amount_LP, FungibleConditionCode.Equal));
-        const function_option = getWriteOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'claimStakingReward', [
+        post_condition.push(await getPostConditionFromAsset(this.stackswap, this.stackswap.config.STACKSWAP_ADDRESS() + '.' + farming_contract, this.stackswap.config.BASE_STSW_DATA().addr, amount_STSW, FungibleConditionCode.Equal));
+        post_condition.push(await getPostConditionFromAsset(this.stackswap, this.stackswap.config.STACKSWAP_ADDRESS() + '.' + farming_contract, pool_address, amount_LP, FungibleConditionCode.Equal));
+        const function_option = getWriteOptions(this.stackswap, farming_contract, 'claimStakingReward', [
             uintCV(cycle),
             contractPrincipalCV(address[0], address[1]),
             contractPrincipalCV(this.stackswap.config.STACKSWAP_ADDRESS(), this.stackswap.config.CONTRACT_NAME_ORACLE())
@@ -341,48 +294,46 @@ export class Farm2Manager {
     }
 
 
-    async unstakeFarmingContract( pool_address: string, cycle: number, amount_LP: string, callback: any = null) {
+    async unstakeFarmingContract2(pool_address: string, cycle: number, amount_LP: string, callback: any, farming_contract: string) {
         const address = pool_address.split('.');
         const post_condition = [];
-        // post_condition.push(await getPostConditionFromAsset(STACKSWAP_ADDRESS()+'.'+CONTRACT_NAME_STACKSWAP_FARMING(), BASE_STSW_DATA().addr, amount_STSW, FungibleConditionCode.Equal));
-        post_condition.push(await getPostConditionFromAsset(this.stackswap, this.stackswap.config.STACKSWAP_ADDRESS() + '.' + this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), pool_address, amount_LP, FungibleConditionCode.Equal));
-        const function_option = getWriteOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING(), 'unstake-from-farming', [
+        post_condition.push(await getPostConditionFromAsset(this.stackswap, this.stackswap.config.STACKSWAP_ADDRESS() + '.' + farming_contract, pool_address, amount_LP, FungibleConditionCode.Equal));
+        const function_option = getWriteOptions(this.stackswap, farming_contract, 'unstake-from-farming', [
             uintCV(cycle),
             contractPrincipalCV(address[0], address[1]),
         ], post_condition, callback);
         await openContractCall(function_option);
     }
 
-
-    async getCurrentFarmingRound() {
-        const bh:number = Number(await this.stackswap.getCurrentBlock());
-        return await this. getFarmingRound(bh);
+    async getCurrentFarmingRound2(farming_contract: string) {
+        const bh = await this.stackswap.getCurrentBlock();
+        return await this.getFarmingRound2(Number(bh), farming_contract);
     }
 
-
-    async getRewardBalanceFromFarming( pool_addr: string, unclaimed_list: any) {
+    async getRewardBalanceFromFarming2(pool_addr: string, unclaimed_list: any, farming_contract: string) {
         // let reward_balance = new BigNumber(0);
         const num_list = [];
         for (const unclaimed of unclaimed_list) {
             num_list.push(uintCV(unclaimed));
         }
         let reward_num = new BigNumber(0);
-
+        console.log(pool_addr, num_list, farming_contract)
         try {
             for (let i = 0; i < num_list.length; i += 4) {
-                // console.log(i, num_list.slice(i, i+4 < num_list.length ? i + 4 : num_list.length));
-                const result = await this.getFarmingUserRewardList(pool_addr, num_list.slice(i, i + 4 < num_list.length ? i + 4 : num_list.length));
+                console.log(pool_addr, num_list.slice(i, i + 4 < num_list.length ? i + 4 : num_list.length), farming_contract);
+                const result = await this.getFarmingUserRewardList2(pool_addr, num_list.slice(i, i + 4 < num_list.length ? i + 4 : num_list.length), farming_contract);
                 // rewardSum.value;
-                // console.log('temp result', result);
+                console.log('temp result', result.rewardSum.value);
                 reward_num = reward_num.plus(new BigNumber(result.rewardSum.value));
             }
-            return numFormat_(num2decimal(reward_num.toString(), 6));
+            return num2decimal(reward_num.toString(), 6);
         } catch (e) {
             // console.log(e);
-            return numFormat_(num2decimal(reward_num.toString(), 6));
+            return num2decimal(reward_num.toString(), 6);
         }
     }
-    
+
+
     getFarmingAPR(tvl: string, stsw_price: string, reward: string, weight: string) {
         // console.log('farmingAPR');
         // console.log({tvl, stsw_price, reward, weight})
@@ -404,4 +355,116 @@ export class Farm2Manager {
             return new_reward_apr.toFixed(3).toString();
         }
     }
+
+    async getFarmDataFromData(data: any) {
+        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})
+
+    }
+
+    async getEachFarmData(data: any, bh: string, oracle_data: { oracle_stx: any, oracle_stsw: any, oracle_lbtc: any }) {
+
+        const tvl_apr = new BigNumber(0);
+        const farms : any[] = [];
+        const farm_length: number = data.length;
+
+        for (let i = 0; i < data.length; i++) {
+            let farming_contract = '';
+            if (data[i].farm_group === 1) {
+                farming_contract = this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING2_1();
+            } else if (data[i].farm_group === 5) {
+                farming_contract = this.stackswap.config.CONTRACT_NAME_STACKSWAP_FARMING2_5();
+            }
+
+            const farm_round = await this.getCurrentFarmingRound2(farming_contract);
+            this.getFarmData(data[i], farm_round, bh, tvl_apr, farming_contract, oracle_data).then((value) => {
+                value.farm_group = data[i].farm_group;
+                value.farm_contract = farming_contract;
+                farms.push(value);
+
+                if (farms.length === farm_length) {
+                    const tvls = {'group1': '0', 'group5': '0'}
+                    for (const farm_temp of farms) {
+                        switch (farm_temp.farm_group) {
+                            case 1:
+                                tvls.group1 = new BigNumber(tvls.group1).plus(new BigNumber(this.getPoolUSDPriceFarm(farm_temp, farm_temp.total_locked_lp, oracle_data)).multipliedBy(farm_temp.weight)).toString();
+                                break;
+                            case 5:
+                                tvls.group5 = new BigNumber(tvls.group5).plus(new BigNumber(this.getPoolUSDPriceFarm(farm_temp, farm_temp.total_locked_lp, oracle_data)).multipliedBy(farm_temp.weight)).toString();
+                                break;
+                        }
+                    }
+                    console.log({tvls})
+                    for (const farm_temp of farms) {
+                        switch (farm_temp.farm_group) {
+                            case 1:
+                                farm_temp.APR = this.getFarmingAPR(tvls.group1, oracle_data.oracle_stsw, farm_temp.reward, farm_temp.weight);
+                                break;
+                            case 5:
+                                farm_temp.APR = this.getFarmingAPR(tvls.group5, oracle_data.oracle_stsw, farm_temp.reward, farm_temp.weight);
+                                break;
+                        }
+                        console.log(farm_temp.APR)
+                    }
+                }
+            })
+        }
+        return farms;
+    }
+
+    async getFarmData(farm: any, farm_round: any, block_height: string, tvl_apr: BigNumber, farming_contract: string, oracle_data: { oracle_stx: any, oracle_stsw: any, oracle_lbtc: any }) {
+        farm.valid = false;
+        farm.cur_round = farm_round;
+        farm.pair = (await this.stackswap.swapManager.findRouter(farm.token_x, farm.token_y, Number(block_height))).pair;
+        farm.pair.sharetoken = {balance: 0, addr: farm.pair['liquidity-token'].value};
+        farm.pair.price = (farm.pair['balance-y'].value / (10 ** farm.token_y.decimal)) / (farm.pair['balance-x'].value / (10 ** farm.token_x.decimal));
+        const farm_total_v2 = await this.getFarmBalance2(farm.pair.sharetoken, farming_contract);
+        const farm_total_v1 = await this.stackswap.farmManager.getFarmBalance(farm.pair.sharetoken);
+        farm.TVL = this.getPoolUSDPriceFarm(farm, new BigNumber(farm_total_v1).plus(farm_total_v2).toString(), oracle_data);
+        farm.total_locked_lp = new BigNumber(farm_total_v1).plus(farm_total_v2).toString();
+        const farm_temp_total_data = await this.getFarmingTotalStatusCycle2(farm_round, farming_contract);
+        farm.reward = farm_temp_total_data.reward;
+        const lpTotalData = await this.getFarmingTotalPoolStatus2(farm.token_swapr, farming_contract);
+        farm.weight = lpTotalData.weight;
+        tvl_apr = tvl_apr.plus(new BigNumber(this.getPoolUSDPriceFarm(farm, farm.total_locked_lp, oracle_data)).multipliedBy(farm.weight));
+        console.log(farming_contract, farm.TVL, tvl_apr);
+        farm.valid = true;
+
+        return farm;
+    }
+
+    async getFarmUserData(farm: any, farm_round: string, farming_contract: string, oracle_data: { oracle_stx: any, oracle_stsw: any, oracle_lbtc: any }){
+        farm.isMigratable = await this.isUserMigratable2(farm.pair['liquidity-token'].value, farming_contract); // 신규는 무조건 true
+        this.getFarmingStakerStatus2(farm.token_swapr, Number(farm_round), farming_contract).then((status_v2) => {
+            if (!farm.isMigratable) {
+                this.stackswap.farmManager.getFarmingStakerStatus(farm.token_swapr, Number(farm_round)).then((status_v1) => {
+                    farm.claimable_list = status_v2.unclaimedList.concat(status_v1.unclaimedList);
+                    farm.pooled_stsw = new BigNumber(status_v2.pooledToken).plus(status_v1.pooledToken).toString();
+                    farm.stakedList = status_v2.stakedList;
+                    farm.user_TVL = this.getPoolUSDPriceFarm(farm, farm.pooled_stsw, oracle_data);
+                    // console.log('migrated', status_v2, status_v1);
+                    this.getRewardBalanceFromFarming2(farm.token_swapr, status_v2.unclaimedList, farming_contract).then(reward_v2 => {
+                        this.stackswap.farmManager.getRewardBalanceFromFarming(farm.token_swapr, status_v1.unclaimedList).then(reward_v1 => {
+                              console.log({reward_v2})
+                              farm.total_reward = new BigNumber(reward_v2).plus(reward_v1).toString();
+                          }
+                        )
+                    });
+                });
+            } else {
+                console.log('not yet migrated', status_v2);
+                farm.claimable_list = status_v2.unclaimedList;
+                farm.pooled_stsw = status_v2.pooledToken;
+                farm.stakedList = status_v2.stakedList;
+                farm.user_TVL = this.getPoolUSDPriceFarm(farm, farm.pooled_stsw, oracle_data);
+                this.getRewardBalanceFromFarming2(farm.token_swapr, status_v2.unclaimedList, farming_contract).then(reward => {
+                    console.log({reward})
+                    farm.total_reward = reward;
+                });
+            }
+        });
+    }
 }

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

@@ -235,7 +235,7 @@ export class StakingManager {
     );
 
     const function_option : any = getWriteOptions(this.stackswap,
-      this.stackswap.config.CONTRACT_NAME_STACKSWAP_STACKING(),
+      this.stackswap.config.BASE_vSTSW_DATA().addr,
       'stake-tokens',[
         uintCV(invest_amt_bn),uintCV(period_month)],
       postConditions, callback
@@ -245,7 +245,7 @@ export class StakingManager {
 
   async txCooldownFromVSTSW(index:number, callback : any = null){
     const function_option : any = getWriteOptions(this.stackswap,
-      this.stackswap.config.CONTRACT_NAME_STACKSWAP_STACKING(),
+      this.stackswap.config.BASE_vSTSW_DATA().addr,
       'unstake-tokens', [uintCV(index)], [], callback);
     await openContractCall(function_option);
   }

package/src/stackswap/util.ts

@@ -159,11 +159,14 @@ export function decimal2integer(input:any, decimal:number = 6){
 
 export function numWithComma(input:any) {
     if(typeof (input) === 'string'){
-        return input.replace(/\B(?<!\.\d*)(?=(\d{3})+(?!\d))/g, ',');
+        return new BigNumber(input).toNumber().toLocaleString();
+        // return input.replace(/\B(?<!\.\d*)(?=(\d{3})+(?!\d))/g, ',');
     }else if(typeof (input) === 'number'){
-        return input.toString().replace(/\B(?<!\.\d*)(?=(\d{3})+(?!\d))/g, ',');
+        return new BigNumber(input).toNumber().toLocaleString();
+        // return input.toString().replace(/\B(?<!\.\d*)(?=(\d{3})+(?!\d))/g, ',');
     }else if(BigNumber.isBigNumber(input)){
-        return input.toString().replace(/\B(?<!\.\d*)(?=(\d{3})+(?!\d))/g, ',');
+        return input.toNumber().toLocaleString();
+        // return input.toString().replace(/\B(?<!\.\d*)(?=(\d{3})+(?!\d))/g, ',');
     }else{
         return 'ERROR';
     }
@@ -232,38 +235,3 @@ export function getAmountStringWithDecimal(amount: string, decimal: number) {
         return new BigNumber(10 ** decimal).multipliedBy(new BigNumber(amount)).toString();
     }
 }
-export function getDecimalStringfromString2(amount: string, decimal: number) {
-    const amount_bn = new BigNumber(amount);
-    const decimal_bn = new BigNumber(10**decimal);
-    BigNumber.config({ DECIMAL_PLACES: 3});
-    return (amount_bn.dividedBy(decimal_bn)).toFixed(0).toString();
-}
-
-export function getDecimalStringfromString(amount: string, decimal: number) {
-    const len_str = amount.length;
-    if ( len_str > decimal) {
-        const temp =amount.substr(0, len_str-decimal) + '.'+amount.substr(len_str-decimal, len_str).replace(/.0+$/, '')
-        if (temp === '0.') {
-            return '0';
-        } else{
-            if(temp.charAt(temp.length-1) === '.'){
-                return temp.substr(0, temp.length-1);
-            } else {
-                return temp;
-            }
-        }
-    } else {
-        const temp = '0'.repeat(decimal-len_str+1) + amount;
-        const temp2 = temp.substr(0, temp.length-decimal) + '.'+temp.substr(temp.length - decimal, temp.length).replace(/0+$/, '');
-
-        if (temp2 === '0.') {
-            return '0';
-        } else{
-            if(temp2.charAt(temp2.length-1) === '.'){
-                return temp2.substr(0, temp2.length-1);
-            } else {
-                return temp2;
-            }
-        }
-    }
-}