stackswap-front-api-test-02 1.2.112 → 1.3.1

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

@@ -3,10 +3,11 @@ import BigNumber from 'bignumber.js';
 import {
     AnchorMode,
     ClarityValue,
-    contractPrincipalCV, createFungiblePostCondition, createSTXPostCondition,
+    contractPrincipalCV,
     FungibleConditionCode,
     PostConditionMode,
-    standardPrincipalCV
+    standardPrincipalCV,
+    Pc
 } from '@stacks/transactions';
 import axios from 'axios';
 import {StackswapAPI} from "../index";
@@ -138,11 +139,32 @@ 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);
+    const amount = BigInt(tokenAmount.toString());
+
+    // Map FungibleConditionCode to Pc builder methods
+    const buildPostCondition = (pc: ReturnType<typeof Pc.principal>) => {
+        switch (condition) {
+            case FungibleConditionCode.Equal:
+                return pc.willSendEq(amount);
+            case FungibleConditionCode.Greater:
+                return pc.willSendGt(amount);
+            case FungibleConditionCode.GreaterEqual:
+                return pc.willSendGte(amount);
+            case FungibleConditionCode.Less:
+                return pc.willSendLt(amount);
+            case FungibleConditionCode.LessEqual:
+            default:
+                return pc.willSendLte(amount);
+        }
+    };
+
+    const pc = Pc.principal(account);
     if (assetString === 'wstx') {
-        // console.log('tokenamount',tokenAmount.toNumber());
-        return createSTXPostCondition(account, condition, tokenAmount);
+        return buildPostCondition(pc).ustx();
     } else {
-        return createFungiblePostCondition(account, condition, tokenAmount, assetString);
+        // assetString format: "SP...contractAddress.contractName::tokenName"
+        const [contractId, tokenName] = assetString.split('::');
+        return buildPostCondition(pc).ft(contractId as `${string}.${string}`, tokenName);
     }
 }