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

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

@@ -1,5 +1,5 @@
 import {
-  callReadOnlyFunction, contractPrincipalCV,
+  fetchCallReadOnlyFunction, 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 callReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-name', []));
+      const name_result = await fetchCallReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-name', []));
       // // console.log(cvToValue(name_result));
       let token_name = cvToValue(name_result).value;
 
-      const symbol_result = await callReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-symbol', []));
+      const symbol_result = await fetchCallReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-symbol', []));
       const token_symbol = cvToValue(symbol_result).value;
 
-      const decimal_result = await callReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-decimals', []));
+      const decimal_result = await fetchCallReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-decimals', []));
       const token_decimal = Number(cvToValue(decimal_result).value);
 
-      const uri_result = await callReadOnlyFunction( getReadOptions(this.stackswap, token_addr, 'get-token-uri', []));
+      const uri_result = await fetchCallReadOnlyFunction( 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 callReadOnlyFunction(pair_details_options);
+      const result = await fetchCallReadOnlyFunction(pair_details_options);
       return cvToValue(result).value;
     } catch (e) {
       return '0';

package/src/stackswap/util.ts

@@ -4,15 +4,16 @@ import {
     AnchorMode,
     ClarityValue,
     contractPrincipalCV,
-    createFungiblePostCondition,
-    createSTXPostCondition,
-    FungibleConditionCode,
+    FungibleConditionCode, FungiblePostCondition, NonFungibleConditionCode, NonFungiblePostCondition,
     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('.')) {
@@ -138,15 +139,6 @@ 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){
@@ -235,3 +227,72 @@ 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);
+    }
+}
+