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

package/src/stackswap/manager/pool.manager.ts

@@ -1,4 +1,4 @@
-import {fetchCallReadOnlyFunction, cvToValue} from "@stacks/transactions";
+import {callReadOnlyFunction, cvToValue} from "@stacks/transactions";
 import BigNumber from "bignumber.js";
 import axios from "axios";
 import {StackswapAPI} from "../../index";
@@ -167,11 +167,11 @@ export class PoolManager {
     const pair_details_options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_SWAP(), 'get-pair-details',
       [ parseAddressToCV(token_x.addr), parseAddressToCV(token_y.addr) ]);
     try {
-      const result = await fetchCallReadOnlyFunction(pair_details_options);
+      const result = await callReadOnlyFunction(pair_details_options);
       // @ts-ignore
       // // console.log(result);
       // // console.log(cvToValue(result));
-      const result2 = await fetchCallReadOnlyFunction(getReadOptions(this.stackswap, cvToValue(result)['liquidity-token'].value, 'get-lp-data', []));
+      const result2 = await callReadOnlyFunction(getReadOptions(this.stackswap, cvToValue(result)['liquidity-token'].value, 'get-lp-data', []));
       // // console.log('cv-to-value',cvToValue(result2)['value']);
       // // console.log(cvToValue(result2).value);
       return LiquidityPool.parsePoolsFromServerData(cvToValue(result2).value, token_x, token_y, true);
@@ -186,9 +186,9 @@ export class PoolManager {
     const pair_details_options : any = getReadOptions(this.stackswap, swap_contract, 'get-pair-details',
       [ parseAddressToCV(token_x.addr), parseAddressToCV(token_y.addr) ]);
     try {
-      const result = await fetchCallReadOnlyFunction(pair_details_options);
+      const result = await callReadOnlyFunction(pair_details_options);
       // @ts-ignore
-      const result2 = await fetchCallReadOnlyFunction(getReadOptions(this.stackswap, cvToValue(result)['liquidity-token'].value, 'get-lp-data', []));
+      const result2 = await callReadOnlyFunction(getReadOptions(this.stackswap, cvToValue(result)['liquidity-token'].value, 'get-lp-data', []));
       // // console.log('cv-to-value',cvToValue(result2)['value']);
       // // console.log(cvToValue(result2).value);
       return LiquidityPool.parsePoolsFromServerData(cvToValue(result2).value, token_x, token_y, true);

package/src/stackswap/manager/poxl.manager.ts

@@ -2,7 +2,7 @@ import axios from "axios";
 import {openContractCall} from "@stacks/connect";
 import {decimal2integer, getPostConditionFromAsset, getReadOptions, getWriteOptions} from "../util";
 import {
-  fetchCallReadOnlyFunction,
+  callReadOnlyFunction,
   cvToValue,
   FungibleConditionCode,
   noneCV,
@@ -46,7 +46,7 @@ export class PoxlManager {
     await openContractCall(options);
   }
   async getRandomInt( contract_address: string, input: number) {
-    await fetchCallReadOnlyFunction( getReadOptions(this.stackswap, contract_address, 'get-random-uint-at-block', [uintCV(input)]));
+    await callReadOnlyFunction( getReadOptions(this.stackswap, contract_address, 'get-random-uint-at-block', [uintCV(input)]));
     // @ts-ignore
     // // console.log(result['value'].value.toString());
   }
@@ -88,7 +88,7 @@ export class PoxlManager {
       standardPrincipalCV(this.stackswap.getSenderAddress()),
       uintCV(block),
     ]);
-    const result = await fetchCallReadOnlyFunction(options);
+    const result = await callReadOnlyFunction(options);
     // // console.log(cvToValue(result));
     return cvToValue(result);
   }

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

@@ -1,6 +1,6 @@
 
 import {
-  fetchCallReadOnlyFunction,
+  callReadOnlyFunction,
   contractPrincipalCV,
   cvToValue,
   FungibleConditionCode, listCV,
@@ -26,7 +26,7 @@ export class StakingManager {
       '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);
     return result;
   }
@@ -36,7 +36,7 @@ export class StakingManager {
     const pair_details_options : any = getReadOptions(source, this.stackswap.config.BASE_STSW_DATA().addr, 'get-balance',
       [contractPrincipalCV(this.stackswap.config.STACKSWAP_ADDRESS(),this.stackswap.config.BASE_vSTSW_DATA().addr.split('.')[1])]);
     try {
-      const result = await fetchCallReadOnlyFunction(pair_details_options);
+      const result = await callReadOnlyFunction(pair_details_options);
       // // console.log(cvToValue(result));
       return  cvToValue(result).value;
     } catch (e) {
@@ -53,7 +53,7 @@ export class StakingManager {
       const options : any = getReadOptions(source, this.stackswap.config.CONTRACT_NAME_STACKSWAP_STSW_STACKING_DATA_V2(), 'get-staker', [
         standardPrincipalCV(this.stackswap.getSenderAddress()),
       ]);
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // // console.log('reward', round, cvToValue(result));
 
       const unclaimedList = [];
@@ -77,7 +77,7 @@ export class StakingManager {
       const options = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_STSW_STACKING_LOGIC_V2(), 'get-reward-cycle', [
         uintCV(block),
       ]);
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // // console.log(cvToValue(result));
       return cvToValue(result).value;
     } catch (e) {
@@ -92,7 +92,7 @@ export class StakingManager {
       const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_STSW_STACKING_DATA_V2(), 'get-staking-stats-at-cycle', [
         uintCV(round),
       ]);
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // // console.log('reward', round, cvToValue(result));
       const res = cvToValue(result).value;
       // // console.log('getRoundData', res);
@@ -107,7 +107,7 @@ export class StakingManager {
       const options : any = getReadOptions(this.stackswap, this.stackswap.config.CONTRACT_NAME_STACKSWAP_STSW_STACKING_DATA_V2(), 'get-staking-stats-at-cycle-or-default', [
         uintCV(round),
       ]);
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // // console.log('reward', round, cvToValue(result));
       const res = cvToValue(result).value;
       // console.log('getRoundData', res);
@@ -124,7 +124,7 @@ export class StakingManager {
         standardPrincipalCV(user),
       ]);
       // // console.log(cvToValue(result));ss
-      const result = await fetchCallReadOnlyFunction(options);
+      const result = await callReadOnlyFunction(options);
       // // console.log(cvToValue(result));
       const res = cvToValue(result).value;
       return {amount: res.amountSTSW.value, value: res.amountvSTSW.value};
@@ -135,8 +135,8 @@ export class StakingManager {
   }
 
    async getCurrentStakingRound(contract_address: string) {
-    const bh = await this.stackswap.getCurrentBlock();
-    return await this.getStakingRound(contract_address, bh);
+    const bh = await this.stackswap.getCurrentBlocks();
+    return await this.getStakingRound(contract_address, bh.tenure_block_height);
   }
 
   async getRewardRoundID(offset: number) {
@@ -188,7 +188,7 @@ export class StakingManager {
         standardPrincipalCV(this.stackswap.getSenderAddress()),
         uintCV(round_id)
       ]);
-    const result_raw = await fetchCallReadOnlyFunction(function_option);
+    const result_raw = await callReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     // // console.log("reward", round_id, result, result_raw)
     return Number(result);
@@ -222,7 +222,7 @@ export class StakingManager {
     address[0], address[1];
     const function_option : any = getReadOptions(this.stackswap, this.stackswap.config.BASE_vSTSW_DATA().addr,
       'get-user-count',[standardPrincipalCV(this.stackswap.getSenderAddress()) ]);
-    const result_raw = await fetchCallReadOnlyFunction(function_option);
+    const result_raw = await callReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     if(result == null){return 0}
     // tslint:disable-next-line:radix
@@ -231,7 +231,7 @@ export class StakingManager {
 
   async getStakingBalanceFromVSTSW_V2(){
     const function_option : any = getReadOptions(this.stackswap, this.stackswap.config.BASE_vSTSW_DATA().addr,'get-user-count',[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("V2", result)
     if(result == null){return 0}
@@ -252,7 +252,7 @@ export class StakingManager {
         standardPrincipalCV(this.stackswap.getSenderAddress()),
         uintCV(i)]
       );
-      const result_raw = await fetchCallReadOnlyFunction(function_option);
+      const result_raw = await callReadOnlyFunction(function_option);
       const result = cvToValue(result_raw);
       if ( !result.value.returned.value ){
         res_dict[i] = result;
@@ -272,7 +272,7 @@ export class StakingManager {
         standardPrincipalCV(this.stackswap.getSenderAddress()),
         uintCV(i)]
       );
-      const result_raw = await fetchCallReadOnlyFunction(function_option);
+      const result_raw = await callReadOnlyFunction(function_option);
       const result = cvToValue(result_raw);
       if(result.value.returned.value === false){
         // tslint:disable-next-line:radix
@@ -373,7 +373,7 @@ export class StakingManager {
         standardPrincipalCV(this.stackswap.getSenderAddress()),
         listCV(reward_list),
       ]);
-    const result_raw = await fetchCallReadOnlyFunction(function_option);
+    const result_raw = await callReadOnlyFunction(function_option);
     const result = cvToValue(result_raw);
     // // console.log("reward", result.rewardSum.value, result_raw)
     return result.rewardSum.value;

package/src/stackswap/manager/token.manager.ts

@@ -1,5 +1,5 @@
 import {
-  fetchCallReadOnlyFunction, contractPrincipalCV,
+  callReadOnlyFunction, contractPrincipalCV,
   cvToValue,
   FungibleConditionCode, noneCV,
   standardPrincipalCV,
@@ -107,17 +107,17 @@ export class TokenManager {
   async getTokenData( token_addr: string) : Promise<Token | null> {
     // // console.log('finding '+ tokenstr);
     try {
-      const name_result = await fetchCallReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-name', []));
+      const name_result = await callReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-name', []));
       // // console.log(cvToValue(name_result));
       let token_name = cvToValue(name_result).value;
 
-      const symbol_result = await fetchCallReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-symbol', []));
+      const symbol_result = await callReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-symbol', []));
       const token_symbol = cvToValue(symbol_result).value;
 
-      const decimal_result = await fetchCallReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-decimals', []));
+      const decimal_result = await callReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-decimals', []));
       const token_decimal = Number(cvToValue(decimal_result).value);
 
-      const uri_result = await fetchCallReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-token-uri', []));
+      const uri_result = await callReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-token-uri', []));
       const token_uri = cvToValue(uri_result).value.value;
       // console.log('uri', cvToValue(uri_result));
       // console.log('uri v v', cvToValue(uri_result).value.value);
@@ -168,7 +168,7 @@ export class TokenManager {
     const pair_details_options : any = getReadOptions(this.stackswap, token.addr, 'get-balance',
       [parseAddressToCV(address) ]);
     try {
-      const result = await fetchCallReadOnlyFunction(pair_details_options);
+      const result = await callReadOnlyFunction(pair_details_options);
       return cvToValue(result).value;
     } catch (e) {
       return '0';

package/src/stackswap/util.ts

@@ -3,17 +3,14 @@ import BigNumber from 'bignumber.js';
 import {
     AnchorMode,
     ClarityValue,
-    contractPrincipalCV,
-    FungibleConditionCode, FungiblePostCondition, NonFungibleConditionCode, NonFungiblePostCondition,
+    contractPrincipalCV, createFungiblePostCondition, createSTXPostCondition,
+    FungibleConditionCode,
     PostConditionMode,
     standardPrincipalCV
 } from '@stacks/transactions';
 import axios from 'axios';
 import {StackswapAPI} from "../index";
 import {LiquidityPool} from "./manager/pool.manager";
-import {AssetString} from "@stacks/transactions/dist/types";
-import {NonFungibleComparator} from "@stacks/transactions/dist/postcondition-types";
-import {FungibleComparator, StxPostCondition} from "@stacks/transactions/src/postcondition-types";
 
 export function parseAddressToCV(addr: string){
     if (addr.includes('.')) {
@@ -139,6 +136,15 @@ async function getFTAsset(stackswap: StackswapAPI, tokenStr: string) {
     }
 }
 
+export async function getPostConditionFromAsset(stackswap: StackswapAPI, account: string, tokenStr: string, tokenAmount: any, condition: FungibleConditionCode) {
+    const assetString = await getFTAsset(stackswap, tokenStr);
+    if (assetString === 'wstx') {
+        // console.log('tokenamount',tokenAmount.toNumber());
+        return createSTXPostCondition(account, condition, tokenAmount);
+    } else {
+        return createFungiblePostCondition(account, condition, tokenAmount, assetString);
+    }
+}
 
 
 export function num2decimal(input:any, decimal:number){
@@ -227,72 +233,43 @@ export function getAmountStringWithDecimal(amount: string, decimal: number) {
         return new BigNumber(10 ** decimal).multipliedBy(new BigNumber(amount)).toString();
     }
 }
-
-export function createNonFungiblePostCondition(account: string, condition: NonFungibleConditionCode, assetString: AssetString, assetIdCV: ClarityValue) : NonFungiblePostCondition {
-    let conditionComparator: NonFungibleComparator = 'sent';
-    switch (condition) {
-        case NonFungibleConditionCode.Sends:
-            conditionComparator = 'sent';
-            break
-        case NonFungibleConditionCode.DoesNotSend:
-            conditionComparator = 'not-sent';
-            break
-    }
-    return {
-        type: 'nft-postcondition',
-        address: account,
-        condition: conditionComparator,
-        asset: assetString,
-        assetId: assetIdCV,
-    };
-}
-
-export function createFungiblePostCondition(account: any, condition: FungibleComparator, assetString: AssetString, amount: string | bigint | number): FungiblePostCondition {
-    return {
-        type: 'ft-postcondition',
-        address: account,
-        condition: condition,
-        asset: assetString,
-        amount: amount,
-    };
-
-}
-
-export function createSTXPostCondition(account: any, condition: FungibleComparator, amount: string | bigint | number): StxPostCondition {
-    return {
-        type: 'stx-postcondition',
-        address: account,
-        condition: condition,
-        amount: amount,
-    };
-
-}
-
-export async function getPostConditionFromAsset(stackswap: StackswapAPI, account: string, tokenStr: string, tokenAmount: any, condition: FungibleConditionCode) {
-    let conditionComparator: FungibleComparator = 'eq';
-    switch (condition) {
-        case FungibleConditionCode.Equal:
-            conditionComparator = 'eq';
-            break
-        case FungibleConditionCode.LessEqual:
-            conditionComparator = 'lte';
-            break
-        case FungibleConditionCode.GreaterEqual:
-            conditionComparator = 'gte';
-            break
-        case FungibleConditionCode.Greater:
-            conditionComparator = 'gt';
-            break
-        case FungibleConditionCode.Less:
-            conditionComparator = 'lt';
-            break
-    }
-    const assetString = await getFTAsset(stackswap, tokenStr);
-    if (assetString === 'wstx') {
-        // console.log('tokenamount',tokenAmount.toNumber());
-        return createSTXPostCondition(account, conditionComparator, tokenAmount);
-    } else {
-        return createFungiblePostCondition(account, conditionComparator, tokenAmount, assetString);
-    }
-}
-
+//
+// export function createNonFungiblePostCondition(account: string, condition: NonFungibleConditionCode, assetString: AssetString, assetIdCV: ClarityValue) : NonFungiblePostCondition {
+//     let conditionComparator: NonFungibleComparator = 'sent';
+//     switch (condition) {
+//         case NonFungibleConditionCode.Sends:
+//             conditionComparator = 'sent';
+//             break
+//         case NonFungibleConditionCode.DoesNotSend:
+//             conditionComparator = 'not-sent';
+//             break
+//     }
+//     return {
+//         type: 'nft-postcondition',
+//         address: account,
+//         condition: conditionComparator,
+//         asset: assetString,
+//         assetId: assetIdCV,
+//     };
+// }
+//
+// export function createFungiblePostCondition(account: any, condition: FungibleComparator, assetString: AssetString, amount: string | bigint | number): FungiblePostCondition {
+//     return {
+//         type: 'ft-postcondition',
+//         address: account,
+//         condition: condition,
+//         asset: assetString,
+//         amount: amount,
+//     };
+//
+// }
+//
+// export function createSTXPostCondition(account: any, condition: FungibleComparator, amount: string | bigint | number): StxPostCondition {
+//     return {
+//         type: 'stx-postcondition',
+//         address: account,
+//         condition: condition,
+//         amount: amount,
+//     };
+//
+// }