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

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

@@ -1,10 +1,10 @@
 import {
-    callReadOnlyFunction,
+    fetchCallReadOnlyFunction,
     contractPrincipalCV,
     cvToValue,
     FungibleConditionCode,
-    listCV, makeContractNonFungiblePostCondition, makeStandardNonFungiblePostCondition,
-    NonFungibleConditionCode,
+    listCV,
+    Pc,
     standardPrincipalCV,
     uintCV,
 } from '@stacks/transactions';
@@ -35,7 +35,7 @@ export class GroupFarmManager {
     async getFarmCounts() {
         const pair_details_options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_ONE_STEP_GROUP_FARM(), 'get-farm-counts', []);
         try {
-            const result = cvToValue(await callReadOnlyFunction(pair_details_options)).value;
+            const result = cvToValue(await fetchCallReadOnlyFunction(pair_details_options)).value;
             return result;
         } catch (e) {
             return('');
@@ -49,7 +49,7 @@ export class GroupFarmManager {
         }
         const pair_details_options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_ONE_STEP_GROUP_FARM(), 'get-farms', [listCV(listTemp)]);
         try {
-            const result = cvToValue(await callReadOnlyFunction(pair_details_options)).value;
+            const result = cvToValue(await fetchCallReadOnlyFunction(pair_details_options)).value;
             // console.log('farmLists', result);
             return result;
         } catch (e) {
@@ -60,7 +60,7 @@ export class GroupFarmManager {
     async getAllDatas(farming_contract: string) {
         const function_option = getReadOptions(this.stackswap, farming_contract, 'getAllDatas', [
         ]);
-        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;
@@ -68,7 +68,7 @@ export class GroupFarmManager {
     async getRewardData(farming_contract: string) {
         const function_option = getReadOptions(this.stackswap, farming_contract, 'getAllRewardData', [
         ]);
-        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;
@@ -79,7 +79,7 @@ export class GroupFarmManager {
             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;
@@ -98,7 +98,7 @@ export class GroupFarmManager {
         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;
@@ -112,7 +112,7 @@ export class GroupFarmManager {
             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);
@@ -140,7 +140,7 @@ export class GroupFarmManager {
         const function_option = getReadOptions(this.stackswap, farming_contract, 'getTotalData', [
             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 {
@@ -157,7 +157,7 @@ export class GroupFarmManager {
             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 {
@@ -174,7 +174,7 @@ export class GroupFarmManager {
                 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);
             // // console.log('get_farming_total',result.value);
             return result.value;
@@ -188,7 +188,7 @@ export class GroupFarmManager {
             const function_option = getReadOptions(this.stackswap, farming_contract, 'getUserNFTData', [
                 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('get_farming_total',result.value);
             return result.value;
@@ -222,7 +222,7 @@ export class GroupFarmManager {
             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;
@@ -235,7 +235,7 @@ export class GroupFarmManager {
             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('getFarmingUserRewardTotal', result);
         return result;
@@ -245,7 +245,7 @@ export class GroupFarmManager {
         const function_option = getReadOptions(this.stackswap, farming_contract, 'getNFTFarmingReward', [
             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('getFarmingUserRewardTotal', result);
         return result;
@@ -258,7 +258,7 @@ export class GroupFarmManager {
             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;
@@ -269,7 +269,7 @@ export class GroupFarmManager {
         const pair_details_options: any = getReadOptions(this.stackswap, token.addr, 'get-balance',
           [contractPrincipalCV(this.stackswap.config.STACKSWAP_ADDRESS(), farming_contract)]);
         try {
-            const result = await callReadOnlyFunction(pair_details_options);
+            const result = await fetchCallReadOnlyFunction(pair_details_options);
             return cvToValue(result).value;
         } catch (e) {
             return 0;
@@ -342,15 +342,15 @@ export class GroupFarmManager {
         await openContractCall(function_option);
     }
 
-    async getNFTAsset(tokenStr: string){
+    async getNFTAsset(tokenStr: string): Promise<`${string}.${string}::${string}`> {
         // // console.log(tokenStr);
         const token_addr = tokenStr.split('.');
         const url = this.stackswap.config.STACKS_API_URL() + '/v2/contracts/interface/' + token_addr[0] + '/' + token_addr[1];
         const result = await axios.get(url);
         if (result.data.non_fungible_tokens.length === 1) {
-            return tokenStr + '::' + result.data.non_fungible_tokens[0].name as any;
+            return (tokenStr + '::' + result.data.non_fungible_tokens[0].name) as `${string}.${string}::${string}`;
         } else {
-            return tokenStr + '::' + result.data.non_fungible_tokens[0].name as any;
+            return (tokenStr + '::' + result.data.non_fungible_tokens[0].name) as `${string}.${string}::${string}`;
         }
     }
 
@@ -364,13 +364,13 @@ export class GroupFarmManager {
         for (const gold of goldList) {
             gold_list.push(uintCV(gold))
             post_condition.push(
-              makeStandardNonFungiblePostCondition(this.stackswap.getSenderAddress(), NonFungibleConditionCode.Sends, gold_asset_string, uintCV(gold)),
+              Pc.principal(this.stackswap.getSenderAddress()).willSendAsset().nft(gold_asset_string, uintCV(gold)),
             )
         }
         for (const silver of silverList) {
             silver_list.push(uintCV(silver))
             post_condition.push(
-              makeStandardNonFungiblePostCondition(this.stackswap.getSenderAddress(), NonFungibleConditionCode.Sends, silver_asset_string, uintCV(silver)),
+              Pc.principal(this.stackswap.getSenderAddress()).willSendAsset().nft(silver_asset_string, uintCV(silver)),
             )
         }
         const function_option = getWriteOptions(this.stackswap, farming_contract, 'stakeNFTs', [
@@ -387,7 +387,7 @@ export class GroupFarmManager {
         for (const gold of rewardList.returnNFTS.value) {
             // console.log(gold);
             post_condition.push(
-              makeContractNonFungiblePostCondition(farming_contract.split('.')[0],farming_contract.split('.')[1], NonFungibleConditionCode.Sends, gold_asset_string, uintCV(gold.value)),
+              Pc.principal(farming_contract).willSendAsset().nft(gold_asset_string, uintCV(gold.value)),
             )
         }
         if(rewardToken1 !== Token.getBaseTokens(this.stackswap, BaseToken.NULL).addr){

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

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