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

package/dist/esm/stackswap/manager/token.manager.js

@@ -1,4 +1,4 @@
-import { callReadOnlyFunction, contractPrincipalCV, cvToValue, FungibleConditionCode, noneCV, standardPrincipalCV, uintCV } from "@stacks/transactions";
+import { fetchCallReadOnlyFunction, contractPrincipalCV, cvToValue, FungibleConditionCode, noneCV, standardPrincipalCV, uintCV } from "@stacks/transactions";
 import axios from "axios";
 import { openContractCall } from "@stacks/connect";
 import { getPostConditionFromAsset, getReadOptions, getWriteOptions, parseAddressToCV } from "../util";
@@ -80,13 +80,13 @@ export class TokenManager {
     }
     async getTokenData(token_addr) {
         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', []));
             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;
             let token_icon = 'https://app.stackswap.org/icon/blank.svg';
             try {
@@ -131,7 +131,7 @@ export class TokenManager {
     async getBalanceOf(token, address) {
         const pair_details_options = 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) {

package/dist/esm/stackswap/manager/token.manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.manager.js","sourceRoot":"","sources":["../../../../src/stackswap/manager/token.manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"token.manager.js","sourceRoot":"","sources":["../../../../src/stackswap/manager/token.manager.ts"],"names":[],"mappings":"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"}

package/dist/esm/stackswap/util.d.ts

@@ -2,7 +2,7 @@ import BigNumber from 'bignumber.js';
 import { AnchorMode, ClarityValue, FungibleConditionCode, PostConditionMode } from '@stacks/transactions';
 import { StackswapAPI } from "../index";
 import { LiquidityPool } from "./manager/pool.manager";
-export declare function parseAddressToCV(addr: string): import("@stacks/transactions/dist/clarity/types/principalCV").StandardPrincipalCV | import("@stacks/transactions/dist/clarity/types/principalCV").ContractPrincipalCV;
+export declare function parseAddressToCV(addr: string): import("@stacks/transactions").StandardPrincipalCV | import("@stacks/transactions").ContractPrincipalCV;
 export declare function getReadOptions(stackswap: StackswapAPI, contractName: string, functionName: string, functionArgs: ClarityValue[]): any;
 export declare function getWriteOptions(stackswap: StackswapAPI, contractName: string, functionName: string, functionArgs: any, postConditions?: any, callback?: any, conditionMode?: boolean): {
     contractAddress: string;
@@ -22,7 +22,7 @@ export declare function getWriteOptions(stackswap: StackswapAPI, contractName: s
     onFinish: (data: any) => void;
     onCancel: () => void;
 };
-export declare function getPostConditionFromAsset(stackswap: StackswapAPI, account: string, tokenStr: string, tokenAmount: any, condition: FungibleConditionCode): Promise<import("@stacks/transactions").STXPostCondition | import("@stacks/transactions").FungiblePostCondition>;
+export declare function getPostConditionFromAsset(stackswap: StackswapAPI, account: string, tokenStr: string, tokenAmount: any, condition: FungibleConditionCode): Promise<import("@stacks/transactions").StxPostCondition | import("@stacks/transactions").FungiblePostCondition>;
 export declare function num2decimal(input: any, decimal: number): BigNumber;
 export declare function decimal2integer(input: any, decimal?: number): string;
 export declare function numWithComma(input: any, decimal: number): string;

package/dist/esm/stackswap/util.js

@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { AnchorMode, contractPrincipalCV, createFungiblePostCondition, createSTXPostCondition, PostConditionMode, standardPrincipalCV } from '@stacks/transactions';
+import { AnchorMode, contractPrincipalCV, FungibleConditionCode, PostConditionMode, standardPrincipalCV, Pc } from '@stacks/transactions';
 import axios from 'axios';
 export function parseAddressToCV(addr) {
     if (addr.includes('.')) {
@@ -120,11 +120,29 @@ async function getFTAsset(stackswap, tokenStr) {
 }
 export async function getPostConditionFromAsset(stackswap, account, tokenStr, tokenAmount, condition) {
     const assetString = await getFTAsset(stackswap, tokenStr);
+    const amount = BigInt(tokenAmount.toString());
+    const buildPostCondition = (pc) => {
+        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') {
-        return createSTXPostCondition(account, condition, tokenAmount);
+        return buildPostCondition(pc).ustx();
     }
     else {
-        return createFungiblePostCondition(account, condition, tokenAmount, assetString);
+        const [contractId, tokenName] = assetString.split('::');
+        return buildPostCondition(pc).ft(contractId, tokenName);
     }
 }
 export function num2decimal(input, decimal) {

package/dist/esm/stackswap/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/stackswap/util.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,OAAO,EACH,UAAU,EAEV,mBAAmB,EAAE,2BAA2B,EAAE,sBAAsB,EAExE,iBAAiB,EACjB,mBAAmB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,MAAM,UAAU,gBAAgB,CAAC,IAAY;IACzC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACpB,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAChD,OAAO,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;KACrD;SAAM;QACH,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC;KACpC;AACL,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,SAAuB,EAAE,YAAoB,EAAE,YAAoB,EAAE,YAA4B;IAC5H,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAC;QAC3B,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9C,OAAO;YACH,eAAe,EAAE,aAAa,CAAC,CAAC,CAAC;YACjC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC;YAC9B,YAAY;YACZ,YAAY;YACZ,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,aAAa,EAAE,SAAS,CAAC,gBAAgB,EAAE;SAC9C,CAAC;KACL;SAAM;QACH,OAAO;YACH,eAAe,EAAE,SAAS,CAAC,MAAM,CAAC,iBAAiB,EAAE;YACrD,YAAY;YACZ,YAAY;YACZ,YAAY;YACZ,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,aAAa,EAAE,SAAS,CAAC,gBAAgB,EAAE;SAC9C,CAAC;KACL;AACL,CAAC;AAID,MAAM,UAAU,eAAe,CAAC,SAAuB,EAAE,YAAoB,EAAE,YAAoB,EAAE,YAAiB,EAAE,iBAAsB,EAAE,EAAE,WAAgB,IAAI,EAAE,gBAAyB,KAAK;IAClM,IAAK,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAC;QAC5B,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9C,OAAQ;YACJ,eAAe,EAAE,aAAa,CAAC,CAAC,CAAC;YACjC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC;YAC9B,YAAY;YACZ,YAAY;YACZ,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,aAAa,EAAE,SAAS,CAAC,gBAAgB,EAAE;YAC3C,iBAAiB,EAAE,aAAa,CAAA,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAA,CAAC,CAAC,iBAAiB,CAAC,IAAI;YACjF,cAAc;YACd,UAAU,EAAG;gBACT,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,qBAAqB;aACvD;YACD,UAAU,EAAE,UAAU,CAAC,GAAG;YAC1B,SAAS,EAAE,KAAK;YAChB,QAAQ,EAAG,CAAC,IAAS,EAAE,EAAE;gBAErB,IAAI;oBACA,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBACxB;gBAAC,OAAO,CAAC,EAAE;oBACR,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;iBAErB;YACL,CAAC;YACD,QAAQ,EAAG,GAAG,EAAE;gBACZ,IAAG;oBACC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;iBAC9B;gBAAC,OAAO,CAAC,EAAE;oBACR,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;iBACrB;YACL,CAAC;SACJ,CAAC;KACL;SAAM;QACH,OAAQ;YACJ,eAAe,EAAE,SAAS,CAAC,MAAM,CAAC,iBAAiB,EAAE;YACrD,YAAY;YACZ,YAAY;YACZ,YAAY;YACZ,OAAO,EAAE,SAAS,CAAC,OAAO;YAC1B,aAAa,EAAE,SAAS,CAAC,gBAAgB,EAAE;YAC3C,iBAAiB,EAAE,aAAa,CAAA,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAA,CAAC,CAAC,iBAAiB,CAAC,IAAI;YACjF,cAAc;YACd,UAAU,EAAG;gBACT,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,qBAAqB;aACvD;YACD,UAAU,EAAE,UAAU,CAAC,GAAG;YAC1B,SAAS,EAAE,KAAK;YAChB,QAAQ,EAAG,CAAC,IAAS,EAAE,EAAE;gBAErB,IAAI;oBACA,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBACxB;gBAAC,OAAO,CAAC,EAAE;oBACR,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;iBAErB;YACL,CAAC;YACD,QAAQ,EAAG,GAAG,EAAE;gBACZ,IAAG;oBACC,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;iBAC9B;gBAAC,OAAO,CAAC,EAAE;oBACR,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;iBACrB;YACL,CAAC;SACJ,CAAC;KACL;AAEL,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,SAAuB,EAAE,QAAgB;IAE/D,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACvC,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,0BAA0B,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IACjH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEpC,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;QAE1C,OAAO,QAAQ,GAAG,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAChE;SAAM,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;QACjD,OAAO,MAAM,CAAC;KACjB;SAAM;QAGH,OAAO,QAAQ,GAAG,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;KAChE;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,SAAuB,EAAE,OAAe,EAAE,QAAgB,EAAE,WAAgB,EAAE,SAAgC;IAC1J,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC1D,IAAI,WAAW,KAAK,MAAM,EAAE;QAExB,OAAO,sBAAsB,CAAC,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;KAClE;SAAM;QACH,OAAO,2BAA2B,CAAC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;KACpF;AACL,CAAC;AAGD,MAAM,UAAU,WAAW,CAAC,KAAS,EAAE,OAAc;IACjD,OAAO,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,OAAO,CAAC,CAAC;AAC3D,CAAC;AACD,MAAM,UAAU,eAAe,CAAC,KAAS,EAAE,UAAiB,CAAC;IACzD,OAAO,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,IAAI,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC;AAGD,MAAM,UAAU,YAAY,CAAC,KAAS,EAAE,OAAc;IAClD,IAAG,OAAO,CAAC,KAAK,CAAC,KAAK,QAAQ,EAAC;QAC3B,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,qBAAqB,EAAE,OAAO,EAAE,CAAC,CAAC;KAExG;SAAK,IAAG,OAAO,CAAC,KAAK,CAAC,KAAK,QAAQ,EAAC;QACjC,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,qBAAqB,EAAE,OAAO,EAAE,CAAC,CAAC;KAExG;SAAK,IAAG,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,EAAC;QAClC,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,qBAAqB,EAAE,OAAO,EAAE,CAAC,CAAC;KAEzF;SAAI;QACD,OAAO,OAAO,CAAC;KAClB;AACL,CAAC;AAID,MAAM,UAAU,UAAU,CAAE,KAAS,EAAE,UAAiB,CAAC;IACrD,MAAM,QAAQ,GAAG,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;IACtC,IAAG,QAAQ,CAAC,SAAS,EAAE,EAAC;QACpB,OAAO,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;KACpC;SACG;QACA,OAAO,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;KAM9D;AACL,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAmB,EAAE,SAAiB,IAAI,EAAE,SAAkB,IAAI;IAE5F,IAAI;QACA,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QAE3D,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QAC3D,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QACvE,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QACvE,IAAI,GAAG,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAChG,IAAG,MAAM,IAAI,IAAI,EAAC;YACd,GAAG,GAAG,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;SAC1B;QACD,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YAEhC,OAAO,EAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,EAAC,CAAC;SACvC;QACD,MAAM,GAAG,GAAG,CAAC,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACvG,MAAM,aAAa,GAAG,CAAC,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,GAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAChL,MAAM,kBAAkB,GAAG,aAAa,CAAC,QAAQ,EAAE,CAAA;QACnD,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;QAEvF,IAAG,MAAM,IAAI,IAAI,EAAC;YACd,OAAO,EAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,kBAAkB,EAAC,CAAC;SACtD;QACD,OAAO,EAAC,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,kBAAkB,EAAC,CAAC;KAC3D;IAAC,OAAO,CAAC,EAAE;QACR,OAAO,EAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,EAAC,CAAC;KACvC;AACL,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,MAAc,EAAE,OAAe;IACtE,SAAS,CAAC,MAAM,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAA;IACxC,IAAG;QACC,OAAO,IAAI,SAAS,CAAC,EAAE,IAAI,OAAO,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;KACvE;IAAC,OAAO,CAAC,EAAE;QACR,OAAO,IAAI,SAAS,CAAC,EAAE,IAAI,OAAO,CAAC,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;KACtF;AACL,CAAC;AACD,MAAM,UAAU,0BAA0B,CAAC,MAAc,EAAE,OAAe;IAEtE,IAAG;QACC,OAAO,IAAI,SAAS,CAAC,EAAE,IAAI,OAAO,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;KACvE;IAAC,OAAO,CAAC,EAAE;QACR,OAAO,IAAI,SAAS,CAAC,EAAE,IAAI,OAAO,CAAC,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;KACtF;AACL,CAAC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/stackswap/util.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -14,7 +14,6 @@ import { PoolManager } from "./stackswap/manager/pool.manager";
 import { PoxlManager } from "./stackswap/manager/poxl.manager";
 import { StakingManager } from "./stackswap/manager/staking.manager";
 import { SwapManager } from "./stackswap/manager/swap.manager";
-import { UserSession } from "@stacks/connect";
 import { LBTCStakingManager } from "./stackswap/manager/lbtcstaking.manager";
 import { GroupFarmManager } from "./stackswap/manager/groupfarm.manager";
 import { BridgeManager } from "./stackswap/manager/bridge.manager";
@@ -90,7 +89,7 @@ export declare class StackswapMainnetAPI implements StackswapAPI {
     }>;
     getQualifiedAddress(address: string): string;
     walletConnect(callback: (err: any, result: any) => void): void;
-    walletConnect2(userSession: UserSession, callback: (err: any, result: any) => void): void;
+    walletConnect2(_userSession: any, callback: (err: any, result: any) => void): void;
     getConnectedWallet(callback: (err: any, result: any) => void): void;
     signOut(callback: (err: any, result: any) => void): void;
     isConnected(): boolean;

package/dist/index.js

@@ -43,7 +43,7 @@ class StackswapMainnetAPI {
         };
         this.fixedSenderAddress = fixedSenderAddress;
         this.config = new config_1.StackswapMainetConfig(farm_end_cycle, fixedSTSWAPIAddress, networkAddress);
-        this.network = new network_1.StacksMainnet({ url: api_url ? api_url : this.config.STACKS_API_URL() });
+        this.network = { ...network_1.STACKS_MAINNET, client: { baseUrl: api_url ? api_url : this.config.STACKS_API_URL() } };
         this.senderAdderss = this.config.NULL_ADDRESS();
         this.getConnectedWallet(((_err, _result) => {
         }));
@@ -77,72 +77,47 @@ class StackswapMainnetAPI {
         return this.config.STACKSWAP_ADDRESS() + '.' + address;
     }
     walletConnect(callback) {
-        try {
-            const appConfig = new connect_1.AppConfig(['store_write', 'publish_data']);
-            const userSession = new connect_1.UserSession({ appConfig });
-            (0, connect_1.showConnect)({
-                userSession,
-                appDetails: {
-                    name: 'Stackswap',
-                    icon: 'https://app.stackswap.org/favicon.ico',
-                },
-                redirectTo: '/',
-                onFinish: () => {
-                    const profile = userSession.loadUserData().profile.stxAddress;
-                    if (this.config.isMainnet()) {
-                        this.senderAdderss = profile.mainnet;
-                    }
-                    else {
-                        this.senderAdderss = profile.testnet;
-                    }
-                    this.connected = true;
-                    callback(null, this.senderAdderss);
-                },
-            });
-        }
-        catch (e) {
+        (0, connect_1.connect)()
+            .then((result) => {
+            const stxAddresses = result.addresses.filter(a => a.address.startsWith('SP') || a.address.startsWith('ST'));
+            const address = this.config.isMainnet()
+                ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
+                : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
+            if (address) {
+                this.senderAdderss = address;
+                this.connected = true;
+                callback(null, this.senderAdderss);
+            }
+            else {
+                callback(new Error('No STX address found'), null);
+            }
+        })
+            .catch((e) => {
             callback(e, null);
-        }
+        });
     }
-    walletConnect2(userSession, callback) {
-        try {
-            (0, connect_1.showConnect)({
-                appDetails: {
-                    name: 'Stackswap',
-                    icon: 'https://app.stackswap.org/favicon.ico',
-                },
-                redirectTo: '/',
-                onFinish: () => {
-                    const profile = userSession.loadUserData().profile.stxAddress;
-                    if (this.config.isMainnet()) {
-                        this.senderAdderss = profile.mainnet;
-                    }
-                    else {
-                        this.senderAdderss = profile.testnet;
-                    }
-                    this.connected = true;
-                    callback(null, this.senderAdderss);
-                },
-                userSession
-            });
-        }
-        catch (e) {
-            callback(e, null);
-        }
+    walletConnect2(_userSession, callback) {
+        this.walletConnect(callback);
     }
     getConnectedWallet(callback) {
         try {
-            const appConfig = new connect_1.AppConfig(['store_write', 'publish_data']);
-            const userSession = new connect_1.UserSession({ appConfig });
-            const profile = userSession.loadUserData().profile.stxAddress;
-            if (this.config.isMainnet()) {
-                this.senderAdderss = profile.mainnet;
+            const storage = (0, connect_1.getLocalStorage)();
+            if (!storage || !storage.addresses?.stx?.length) {
+                callback(new Error('No connected wallet'), null);
+                return;
+            }
+            const stxAddresses = storage.addresses.stx;
+            const address = this.config.isMainnet()
+                ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
+                : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
+            if (address) {
+                this.senderAdderss = address;
+                this.connected = true;
+                callback(null, this.senderAdderss);
             }
             else {
-                this.senderAdderss = profile.testnet;
+                callback(new Error('No STX address found'), null);
             }
-            this.connected = true;
-            callback(null, this.senderAdderss);
         }
         catch (e) {
             callback(e, null);
@@ -150,9 +125,9 @@ class StackswapMainnetAPI {
     }
     signOut(callback) {
         try {
-            const appConfig = new connect_1.AppConfig(['store_write', 'publish_data']);
-            const userSession = new connect_1.UserSession({ appConfig });
-            userSession.signUserOut();
+            (0, connect_1.disconnect)();
+            this.connected = false;
+            this.senderAdderss = '';
             callback(null, 'success');
         }
         catch (e) {
@@ -161,17 +136,23 @@ class StackswapMainnetAPI {
     }
     isConnected() {
         try {
-            const appConfig = new connect_1.AppConfig(['store_write', 'publish_data']);
-            const userSession = new connect_1.UserSession({ appConfig });
-            const profile = userSession.loadUserData().profile.stxAddress;
-            if (this.config.isMainnet()) {
-                this.senderAdderss = profile.mainnet;
+            if (!(0, connect_1.isConnected)()) {
+                return false;
             }
-            else {
-                this.senderAdderss = profile.testnet;
+            const storage = (0, connect_1.getLocalStorage)();
+            if (!storage || !storage.addresses?.stx?.length) {
+                return false;
             }
-            this.connected = true;
-            return true;
+            const stxAddresses = storage.addresses.stx;
+            const address = this.config.isMainnet()
+                ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
+                : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
+            if (address) {
+                this.senderAdderss = address;
+                this.connected = true;
+                return true;
+            }
+            return false;
         }
         catch (e) {
             return false;
@@ -183,7 +164,7 @@ class StackswapTestnetAPI extends StackswapMainnetAPI {
     constructor(farm_end_cycle = '99999', fixedSenderAddress = null, api_url) {
         super(farm_end_cycle, fixedSenderAddress, api_url);
         this.config = new config_1.StackswapTestnetConfig(farm_end_cycle);
-        this.network = new network_1.StacksTestnet();
+        this.network = network_1.STACKS_TESTNET;
     }
 }
 exports.StackswapTestnetAPI = StackswapTestnetAPI;
@@ -191,7 +172,7 @@ class StackswapDevnetAPI extends StackswapMainnetAPI {
     constructor(farm_end_cycle = '99999', fixedSenderAddress = null, api_url) {
         super(farm_end_cycle, fixedSenderAddress, api_url);
         this.config = new config_1.StackswapDevnetConfig(farm_end_cycle);
-        this.network = new network_1.StacksMocknet();
+        this.network = network_1.STACKS_MOCKNET;
     }
 }
 exports.StackswapDevnetAPI = StackswapDevnetAPI;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA2F;AAC3F,kDAA0B;AAC1B,+CAK4B;AAC5B,qEAA+D;AAC/D,iEAA2D;AAC3D,mEAA6D;AAC7D,qEAA+D;AAC/D,+EAAyE;AACzE,6EAAuE;AACvE,mEAA6D;AAC7D,2EAAqE;AACrE,2EAAqE;AACrE,qEAA+D;AAC/D,mEAA6D;AAC7D,mEAA6D;AAC7D,yEAAmE;AACnE,mEAA6D;AAC7D,6CAAoE;AACpE,iFAA2E;AAC3E,6EAAuE;AACvE,uEAAiE;AACjE,qEAA+D;AAkC/D,MAAa,mBAAmB;IA0B9B,YAAY,iBAAyB,EAAE,EAAE,qBAAkC,IAAI,EAAE,OAAqB,EAAE,sBAAmC,IAAI,EAAE,iBAA8B,IAAI;QArBnL,cAAS,GAAa,KAAK,CAAC;QAoD5B,yBAAoB,GAAsB,KAAK,IAAI,EAAE;YACnD,MAAM,UAAU,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,UAAU,CAAC,CAAC;YAC9E,OAAO,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC;QACvC,CAAC,CAAA;QAED,uBAAkB,GAAsB,KAAK,IAAI,EAAE;YACjD,MAAM,UAAU,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;YAE9E,OAAO,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC;QAC3C,CAAC,CAAA;QAED,oBAAe,GAAuB,KAAK,IAAI,EAAE;YAE/C,MAAM,UAAU,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,UAAU,CAAC,CAAC;YAC9E,OAAO,UAAU,CAAC,IAAI,CAAC,iBAAiB,CAAC;QAC3C,CAAC,CAAC;QA7CA,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAE7C,IAAI,CAAC,MAAM,GAAG,IAAI,8BAAqB,CAAC,cAAc,EAAE,mBAAmB,EAAE,cAAc,CAAC,CAAC;QAC7F,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAa,CAAC,EAAC,GAAG,EAAE,OAAO,CAAA,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,EAAC,CAAC,CAAC;QACzF,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QAChD,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QAC3C,CAAC,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,UAAU,GAAG,IAAI,wBAAU,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,iBAAiB,GAAG,IAAI,sCAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,gBAAgB,GAAG,IAAI,oCAAgB,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,eAAe,GAAG,IAAI,kCAAe,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,eAAe,GAAG,IAAI,kCAAe,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,YAAY,GAAG,IAAI,4BAAY,CAAC,IAAI,CAAC,CAAC;QAC3C,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,cAAc,GAAG,IAAI,gCAAc,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,CAAC,kBAAkB,GAAG,IAAI,wCAAkB,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,CAAC,gBAAgB,GAAG,IAAI,oCAAgB,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,aAAa,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,kBAAkB,CAAA,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;IAC/E,CAAC;IAmBD,KAAK,CAAC,gBAAgB;QACpB,MAAM,UAAU,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,UAAU,CAAC,CAAC;QAC9E,OAAO,EAAC,YAAY,EAAG,UAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,iBAAiB,EAAG,UAAU,CAAC,IAAI,CAAC,iBAAiB,EAAE,mBAAmB,EAAG,UAAU,CAAC,IAAI,CAAC,aAAa,EAAC,CAAC;IACxK,CAAC;IAED,mBAAmB,CAAC,OAAe;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,GAAG,GAAG,GAAG,OAAO,CAAC;IACzD,CAAC;IAED,aAAa,CAAC,QAAyC;QACrD,IAAI;YACF,MAAM,SAAS,GAAG,IAAI,mBAAS,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;YACjE,MAAM,WAAW,GAAG,IAAI,qBAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YACnD,IAAA,qBAAW,EAAC;gBACV,WAAW;gBACX,UAAU,EAAE;oBACV,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,uCAAuC;iBAC9C;gBACD,UAAU,EAAE,GAAG;gBACf,QAAQ,EAAE,GAAG,EAAE;oBACb,MAAM,OAAO,GAAG,WAAW,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;oBAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAC;wBAC1B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;qBACtC;yBAAM;wBACL,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;qBACtC;oBACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;oBAEtB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;gBACrC,CAAC;aACF,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;SACnB;IACH,CAAC;IAGD,cAAc,CAAC,WAAwB,EAAE,QAAyC;QAChF,IAAI;YACF,IAAA,qBAAW,EAAC;gBACV,UAAU,EAAE;oBACV,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,uCAAuC;iBAC9C;gBACD,UAAU,EAAE,GAAG;gBACf,QAAQ,EAAE,GAAG,EAAE;oBACb,MAAM,OAAO,GAAG,WAAW,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;oBAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAC;wBAC1B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;qBACtC;yBAAM;wBACL,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;qBACtC;oBACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;oBAEtB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;gBACrC,CAAC;gBACD,WAAW;aACZ,CAAC,CAAC;SACJ;QAAC,OAAO,CAAC,EAAE;YACV,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;SACnB;IACH,CAAC;IAGD,kBAAkB,CAAC,QAAyC;QAC1D,IAAI;YACF,MAAM,SAAS,GAAG,IAAI,mBAAS,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;YACjE,MAAM,WAAW,GAAG,IAAI,qBAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YACnD,MAAM,OAAO,GAAG,WAAW,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;YAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAC;gBAC1B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;aACtC;iBAAM;gBACL,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;aACtC;YACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YAEtB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;SACpC;QAAC,OAAO,CAAC,EAAE;YACV,QAAQ,CAAE,CAAC,EAAE,IAAI,CAAC,CAAC;SACpB;IACH,CAAC;IAED,OAAO,CAAC,QAAyC;QAC/C,IAAI;YACF,MAAM,SAAS,GAAG,IAAI,mBAAS,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;YACjE,MAAM,WAAW,GAAG,IAAI,qBAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YACnD,WAAW,CAAC,WAAW,EAAE,CAAC;YAE1B,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;SAC3B;QAAC,OAAO,CAAC,EAAE;YACV,QAAQ,CAAE,CAAC,EAAE,IAAI,CAAC,CAAC;SACpB;IACH,CAAC;IAED,WAAW;QACT,IAAI;YACF,MAAM,SAAS,GAAG,IAAI,mBAAS,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;YACjE,MAAM,WAAW,GAAG,IAAI,qBAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;YACnD,MAAM,OAAO,GAAG,WAAW,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;YAC9D,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAC;gBAC1B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;aACtC;iBAAM;gBACL,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC;aACtC;YACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,KAAK,CAAC;SACd;IACH,CAAC;CAEF;AA3LD,kDA2LC;AAED,MAAa,mBAAoB,SAAQ,mBAAmB;IAE1D,YAAY,iBAAyB,OAAO,EAAE,qBAAkC,IAAI,EAAE,OAAqB;QACzG,KAAK,CAAC,cAAc,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,GAAG,IAAI,+BAAsB,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAa,EAAE,CAAC;IACrC,CAAC;CAEF;AARD,kDAQC;AAGD,MAAa,kBAAmB,SAAQ,mBAAmB;IAEzD,YAAY,iBAAyB,OAAO,EAAE,qBAAkC,IAAI,EAAE,OAAqB;QACzG,KAAK,CAAC,cAAc,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,MAAM,GAAG,IAAI,8BAAqB,CAAC,cAAc,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAa,EAAE,CAAC;IACrC,CAAC;CAEF;AARD,gDAQC;AAED,MAAa,kBAAmB,SAAQ,mBAAmB;IAEzD,YAAY,MAAuB,EAAE,iBAAyB,OAAO,EAAE,qBAAkC,IAAI,EAAE,OAAqB;QAClI,KAAK,CAAC,cAAc,EAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CAEF;AAPD,gDAOC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}