stackswap-front-api-test-02 1.0.116 → 1.0.119

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

@@ -2,12 +2,12 @@ import {
   getAmountStringWithDecimal,
   getAmountWithDecimalString,
   getPostConditionFromAsset, getReadOptions,
-  getWriteOptions
+  getWriteOptions, parseAddressToCV
 } from "../util";
 import {
   callReadOnlyFunction, contractPrincipalCV,
   cvToValue,
-  FungibleConditionCode,
+  FungibleConditionCode, listCV,
   stringAsciiCV,
   stringUtf8CV,
   uintCV
@@ -77,6 +77,17 @@ export class LaunchpadManager {
     }
   }
 
+  async getTemplatetFarmList() {
+    const pair_details_options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_ONE_STEP_GROUP_FARM(), 'get-group-farm-list', []);
+    try {
+      const result = cvToValue(await callReadOnlyFunction(pair_details_options)).value;
+
+      return result[this.getRandomIntNum(0, result.length-1)].value;
+    } catch (e) {
+      return('');
+    }
+  }
+
   async mintSIPContractCall(soft_token: string, liquidity_token: string, data : any, callback: any = null) {
     const token_y_addr = soft_token.split('.');
     const pair_addr = liquidity_token.split('.');
@@ -261,4 +272,36 @@ export class LaunchpadManager {
       ], post_condition, callback);
     openContractCall(options);
   }
+
+  async createGroupContractCall(data : any, callback: any = null) {
+    // const token_y_addr = city_token.split('.');
+    // const pair_addr = liquidity_token.split('.');
+    const post_condition: any = [];
+    // post_condition.push(await getPostConditionFromAsset(this.stackswap,this.stackswap.getSenderAddress(), this.stackswap.config.BASE_STSW_DATA().addr, getAmountWithDecimalString(data.initial_amount_x, 6), FungibleConditionCode.Equal));
+    // post_condition.push(await getPostConditionFromAsset(this.stackswap, this.stackswap.getSenderAddress(), city_token, 0, FungibleConditionCode.GreaterEqual));
+    const options = getWriteOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_ONE_STEP_GROUP_FARM(),
+      'create-pair-new-city-token-with-stsw',
+      [
+        parseAddressToCV(data.templateFarm),
+        stringAsciiCV( data.name),
+        stringUtf8CV( data.uri),
+        parseAddressToCV(data.project_token),
+        parseAddressToCV(data.project_lp_token),
+        uintCV(data.lp_lock_amount),
+        parseAddressToCV(data.reward_token_1_in),
+        parseAddressToCV(data.reward_token_2_in),
+        parseAddressToCV(data.reward_token_3_in),
+        parseAddressToCV(data.reward_token_4_in),
+        listCV([uintCV(data.reward1List[0]),uintCV(data.reward1List[1]),uintCV(data.reward1List[2]),uintCV(data.reward1List[3]),]),
+        listCV([uintCV(data.reward2List[0]),uintCV(data.reward2List[1]),uintCV(data.reward2List[2]),uintCV(data.reward2List[3]),]),
+        listCV([uintCV(data.reward3List[0]),uintCV(data.reward3List[1]),uintCV(data.reward3List[2]),uintCV(data.reward3List[3]),]),
+        uintCV(data.first_farming_block_in),
+        uintCV(data.reward_round_length_in),
+        uintCV(data.max_farming_rounds_in),
+        uintCV(data.nft_end_block_in),
+        uintCV(data.nft_count_limit_in),
+        uintCV(data.nft_count_takes_in),
+      ], post_condition, callback,true);
+    openContractCall(options);
+  }
 }

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

@@ -256,7 +256,7 @@ export class LBTCStakingManager {
 
     const tvl_lbtc = await this.stackswap.tokenManager.getBalanceOf(Token.getBaseTokens(this.stackswap, BaseToken.lBTC), this.stackswap.config.STACKSWAP_ADDRESS()+'.'+this.stackswap.config.CONTRACT_NAME_STACKSWAP_LBTC_STACKING());
 
-    const apr_bn = new BigNumber(1).dividedBy(new BigNumber(tvl_apr).plus(1)).multipliedBy(round_reward).multipliedBy(10**4).multipliedBy(oracle_stsw).dividedBy(oracle_lbtc);
+    const apr_bn = new BigNumber(round_reward).multipliedBy(10**4).multipliedBy(oracle_stsw).dividedBy(new BigNumber(tvl_apr).plus(1)).dividedBy(oracle_lbtc);
     const max_apr = numFormat_(apr_bn.multipliedBy(8).toString(),3);
     const min_apr = numFormat_(apr_bn.toString(),3);
     const tvl_usd = numFormat_(new BigNumber(tvl_lbtc).multipliedBy(oracle_lbtc).div(10**8).toString(),2);