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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackswap-front-api-test-02",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "",
   "scripts": {
     "start": "tsc -b tsconfig.build.json --watch --verbose",

package/src/index.ts

@@ -20,7 +20,7 @@ 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 {AppConfig, showConnect, UserSession} from "@stacks/connect";
+import {connect, disconnect, isConnected as isWalletConnected, getLocalStorage} from "@stacks/connect";
 import {LBTCStakingManager} from "./stackswap/manager/lbtcstaking.manager";
 import {GroupFarmManager} from "./stackswap/manager/groupfarm.manager";
 import {BridgeManager} from "./stackswap/manager/bridge.manager";
@@ -143,104 +143,117 @@ export class StackswapMainnetAPI implements StackswapAPI{
   }
 
   walletConnect(callback: (err: any, result: any) => void): void {
-    try {
-      const appConfig = new AppConfig(['store_write', 'publish_data']);
-      const userSession = new UserSession({ appConfig });
-      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;
+    connect()
+      .then((result) => {
+        // DEBUG: Log connect() result to understand address selection
+        console.log('[walletConnect] connect() raw result:', JSON.stringify(result, null, 2));
 
-          callback(null, this.senderAdderss);
-        },
-      });
-    } catch (e) {
-      callback(e, null);
-    }
-  }
+        // STX addresses start with 'SP' (mainnet) or 'ST' (testnet)
+        const stxAddresses = result.addresses.filter(a =>
+          a.address.startsWith('SP') || a.address.startsWith('ST')
+        );
 
+        console.log('[walletConnect] STX addresses found:', stxAddresses);
+        console.log('[walletConnect] isMainnet:', this.config.isMainnet());
 
-  walletConnect2(userSession: UserSession, callback: (err: any, result: any) => void): void {
-    try {
-      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;
+        const address = this.config.isMainnet()
+          ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
+          : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
+
+        console.log('[walletConnect] Selected address:', address);
 
+        if (address) {
+          this.senderAdderss = address;
+          this.connected = true;
           callback(null, this.senderAdderss);
-        },
-        userSession
+        } else {
+          callback(new Error('No STX address found'), null);
+        }
+      })
+      .catch((e) => {
+        callback(e, null);
       });
-    } catch (e) {
-      callback(e, null);
-    }
+  }
+
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  walletConnect2(_userSession: any, callback: (err: any, result: any) => void): void {
+    // Note: userSession is deprecated in @stacks/connect v8, using new connect() API
+    this.walletConnect(callback);
   }
 
 
   getConnectedWallet(callback: (err: any, result: any) => void): void {
     try {
-      const appConfig = new AppConfig(['store_write', 'publish_data']);
-      const userSession = new UserSession({ appConfig });
-      const profile = userSession.loadUserData().profile.stxAddress;
-      if (this.config.isMainnet()){
-        this.senderAdderss = profile.mainnet;
-      } else {
-        this.senderAdderss = profile.testnet;
+      const storage = getLocalStorage();
+      if (!storage || !storage.addresses?.stx?.length) {
+        callback(new Error('No connected wallet'), null);
+        return;
       }
-      this.connected = true;
 
-      callback(null, this.senderAdderss);
+      const stxAddresses = storage.addresses.stx;
+      // SP = mainnet, ST = testnet
+      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);
+      callback(e, null);
     }
   }
 
   signOut(callback: (err: any, result: any) => void): void {
     try {
-      const appConfig = new AppConfig(['store_write', 'publish_data']);
-      const userSession = new UserSession({ appConfig });
-      userSession.signUserOut();
-
+      disconnect();
+      this.connected = false;
+      this.senderAdderss = '';
       callback(null, 'success');
     } catch (e) {
-      callback( e, null);
+      callback(e, null);
     }
   }
 
   isConnected(): boolean {
     try {
-      const appConfig = new AppConfig(['store_write', 'publish_data']);
-      const userSession = new UserSession({ appConfig });
-      const profile = userSession.loadUserData().profile.stxAddress;
-      if (this.config.isMainnet()){
-        this.senderAdderss = profile.mainnet;
-      } else {
-        this.senderAdderss = profile.testnet;
+      console.log('[isConnected] isWalletConnected():', isWalletConnected());
+      if (!isWalletConnected()) {
+        return false;
       }
-      this.connected = true;
-      return true;
+
+      const storage = getLocalStorage();
+      console.log('[isConnected] getLocalStorage():', JSON.stringify(storage, null, 2));
+
+      if (!storage || !storage.addresses?.stx?.length) {
+        console.log('[isConnected] No storage or no STX addresses');
+        return false;
+      }
+
+      const stxAddresses = storage.addresses.stx;
+      console.log('[isConnected] STX addresses:', stxAddresses);
+      console.log('[isConnected] isMainnet:', this.config.isMainnet());
+
+      // SP = mainnet, ST = testnet
+      const address = this.config.isMainnet()
+        ? stxAddresses.find(a => a.address.startsWith('SP'))?.address
+        : stxAddresses.find(a => a.address.startsWith('ST'))?.address;
+
+      console.log('[isConnected] Selected address:', address);
+
+      if (address) {
+        this.senderAdderss = address;
+        this.connected = true;
+        return true;
+      }
+      return false;
     } catch (e) {
+      console.log('[isConnected] Error:', e);
       return false;
     }
   }