stackswap-front-api-test-02 1.3.1 → 1.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/index.d.ts +1 -2
- package/dist/esm/index.js +63 -71
- package/dist/esm/index.js.map +1 -1
- package/dist/index.d.ts +1 -2
- package/dist/index.js +62 -70
- package/dist/index.js.map +1 -1
- package/dist/index.umd.js +2 -2
- package/package.json +1 -1
- package/src/index.ts +84 -71
package/dist/esm/index.d.ts
CHANGED
|
@@ -14,7 +14,6 @@ import { PoolManager } from "./stackswap/manager/pool.manager";
|
|
|
14
14
|
import { PoxlManager } from "./stackswap/manager/poxl.manager";
|
|
15
15
|
import { StakingManager } from "./stackswap/manager/staking.manager";
|
|
16
16
|
import { SwapManager } from "./stackswap/manager/swap.manager";
|
|
17
|
-
import { UserSession } from "@stacks/connect";
|
|
18
17
|
import { LBTCStakingManager } from "./stackswap/manager/lbtcstaking.manager";
|
|
19
18
|
import { GroupFarmManager } from "./stackswap/manager/groupfarm.manager";
|
|
20
19
|
import { BridgeManager } from "./stackswap/manager/bridge.manager";
|
|
@@ -90,7 +89,7 @@ export declare class StackswapMainnetAPI implements StackswapAPI {
|
|
|
90
89
|
}>;
|
|
91
90
|
getQualifiedAddress(address: string): string;
|
|
92
91
|
walletConnect(callback: (err: any, result: any) => void): void;
|
|
93
|
-
walletConnect2(
|
|
92
|
+
walletConnect2(_userSession: any, callback: (err: any, result: any) => void): void;
|
|
94
93
|
getConnectedWallet(callback: (err: any, result: any) => void): void;
|
|
95
94
|
signOut(callback: (err: any, result: any) => void): void;
|
|
96
95
|
isConnected(): boolean;
|
package/dist/esm/index.js
CHANGED
|
@@ -15,7 +15,7 @@ import { PoolManager } from "./stackswap/manager/pool.manager";
|
|
|
15
15
|
import { PoxlManager } from "./stackswap/manager/poxl.manager";
|
|
16
16
|
import { StakingManager } from "./stackswap/manager/staking.manager";
|
|
17
17
|
import { SwapManager } from "./stackswap/manager/swap.manager";
|
|
18
|
-
import {
|
|
18
|
+
import { connect, disconnect, isConnected as isWalletConnected, getLocalStorage } from "@stacks/connect";
|
|
19
19
|
import { LBTCStakingManager } from "./stackswap/manager/lbtcstaking.manager";
|
|
20
20
|
import { GroupFarmManager } from "./stackswap/manager/groupfarm.manager";
|
|
21
21
|
import { BridgeManager } from "./stackswap/manager/bridge.manager";
|
|
@@ -71,72 +71,51 @@ export class StackswapMainnetAPI {
|
|
|
71
71
|
return this.config.STACKSWAP_ADDRESS() + '.' + address;
|
|
72
72
|
}
|
|
73
73
|
walletConnect(callback) {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
},
|
|
95
|
-
});
|
|
96
|
-
}
|
|
97
|
-
catch (e) {
|
|
74
|
+
connect()
|
|
75
|
+
.then((result) => {
|
|
76
|
+
console.log('[walletConnect] connect() raw result:', JSON.stringify(result, null, 2));
|
|
77
|
+
const stxAddresses = result.addresses.filter(a => a.address.startsWith('SP') || a.address.startsWith('ST'));
|
|
78
|
+
console.log('[walletConnect] STX addresses found:', stxAddresses);
|
|
79
|
+
console.log('[walletConnect] isMainnet:', this.config.isMainnet());
|
|
80
|
+
const address = this.config.isMainnet()
|
|
81
|
+
? stxAddresses.find(a => a.address.startsWith('SP'))?.address
|
|
82
|
+
: stxAddresses.find(a => a.address.startsWith('ST'))?.address;
|
|
83
|
+
console.log('[walletConnect] Selected address:', address);
|
|
84
|
+
if (address) {
|
|
85
|
+
this.senderAdderss = address;
|
|
86
|
+
this.connected = true;
|
|
87
|
+
callback(null, this.senderAdderss);
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
callback(new Error('No STX address found'), null);
|
|
91
|
+
}
|
|
92
|
+
})
|
|
93
|
+
.catch((e) => {
|
|
98
94
|
callback(e, null);
|
|
99
|
-
}
|
|
95
|
+
});
|
|
100
96
|
}
|
|
101
|
-
walletConnect2(
|
|
102
|
-
|
|
103
|
-
showConnect({
|
|
104
|
-
appDetails: {
|
|
105
|
-
name: 'Stackswap',
|
|
106
|
-
icon: 'https://app.stackswap.org/favicon.ico',
|
|
107
|
-
},
|
|
108
|
-
redirectTo: '/',
|
|
109
|
-
onFinish: () => {
|
|
110
|
-
const profile = userSession.loadUserData().profile.stxAddress;
|
|
111
|
-
if (this.config.isMainnet()) {
|
|
112
|
-
this.senderAdderss = profile.mainnet;
|
|
113
|
-
}
|
|
114
|
-
else {
|
|
115
|
-
this.senderAdderss = profile.testnet;
|
|
116
|
-
}
|
|
117
|
-
this.connected = true;
|
|
118
|
-
callback(null, this.senderAdderss);
|
|
119
|
-
},
|
|
120
|
-
userSession
|
|
121
|
-
});
|
|
122
|
-
}
|
|
123
|
-
catch (e) {
|
|
124
|
-
callback(e, null);
|
|
125
|
-
}
|
|
97
|
+
walletConnect2(_userSession, callback) {
|
|
98
|
+
this.walletConnect(callback);
|
|
126
99
|
}
|
|
127
100
|
getConnectedWallet(callback) {
|
|
128
101
|
try {
|
|
129
|
-
const
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
102
|
+
const storage = getLocalStorage();
|
|
103
|
+
if (!storage || !storage.addresses?.stx?.length) {
|
|
104
|
+
callback(new Error('No connected wallet'), null);
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
const stxAddresses = storage.addresses.stx;
|
|
108
|
+
const address = this.config.isMainnet()
|
|
109
|
+
? stxAddresses.find(a => a.address.startsWith('SP'))?.address
|
|
110
|
+
: stxAddresses.find(a => a.address.startsWith('ST'))?.address;
|
|
111
|
+
if (address) {
|
|
112
|
+
this.senderAdderss = address;
|
|
113
|
+
this.connected = true;
|
|
114
|
+
callback(null, this.senderAdderss);
|
|
134
115
|
}
|
|
135
116
|
else {
|
|
136
|
-
|
|
117
|
+
callback(new Error('No STX address found'), null);
|
|
137
118
|
}
|
|
138
|
-
this.connected = true;
|
|
139
|
-
callback(null, this.senderAdderss);
|
|
140
119
|
}
|
|
141
120
|
catch (e) {
|
|
142
121
|
callback(e, null);
|
|
@@ -144,9 +123,9 @@ export class StackswapMainnetAPI {
|
|
|
144
123
|
}
|
|
145
124
|
signOut(callback) {
|
|
146
125
|
try {
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
126
|
+
disconnect();
|
|
127
|
+
this.connected = false;
|
|
128
|
+
this.senderAdderss = '';
|
|
150
129
|
callback(null, 'success');
|
|
151
130
|
}
|
|
152
131
|
catch (e) {
|
|
@@ -155,19 +134,32 @@ export class StackswapMainnetAPI {
|
|
|
155
134
|
}
|
|
156
135
|
isConnected() {
|
|
157
136
|
try {
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
if (this.config.isMainnet()) {
|
|
162
|
-
this.senderAdderss = profile.mainnet;
|
|
137
|
+
console.log('[isConnected] isWalletConnected():', isWalletConnected());
|
|
138
|
+
if (!isWalletConnected()) {
|
|
139
|
+
return false;
|
|
163
140
|
}
|
|
164
|
-
|
|
165
|
-
|
|
141
|
+
const storage = getLocalStorage();
|
|
142
|
+
console.log('[isConnected] getLocalStorage():', JSON.stringify(storage, null, 2));
|
|
143
|
+
if (!storage || !storage.addresses?.stx?.length) {
|
|
144
|
+
console.log('[isConnected] No storage or no STX addresses');
|
|
145
|
+
return false;
|
|
166
146
|
}
|
|
167
|
-
|
|
168
|
-
|
|
147
|
+
const stxAddresses = storage.addresses.stx;
|
|
148
|
+
console.log('[isConnected] STX addresses:', stxAddresses);
|
|
149
|
+
console.log('[isConnected] isMainnet:', this.config.isMainnet());
|
|
150
|
+
const address = this.config.isMainnet()
|
|
151
|
+
? stxAddresses.find(a => a.address.startsWith('SP'))?.address
|
|
152
|
+
: stxAddresses.find(a => a.address.startsWith('ST'))?.address;
|
|
153
|
+
console.log('[isConnected] Selected address:', address);
|
|
154
|
+
if (address) {
|
|
155
|
+
this.senderAdderss = address;
|
|
156
|
+
this.connected = true;
|
|
157
|
+
return true;
|
|
158
|
+
}
|
|
159
|
+
return false;
|
|
169
160
|
}
|
|
170
161
|
catch (e) {
|
|
162
|
+
console.log('[isConnected] Error:', e);
|
|
171
163
|
return false;
|
|
172
164
|
}
|
|
173
165
|
}
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,cAAc,EAAiB,cAAc,EAAC,MAAM,iBAAiB,CAAC;AAC9F,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAEL,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAC,UAAU,EAAC,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAC,iBAAiB,EAAC,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAC,gBAAgB,EAAC,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAC,eAAe,EAAC,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAC,eAAe,EAAC,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAC,cAAc,EAAC,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -14,7 +14,6 @@ import { PoolManager } from "./stackswap/manager/pool.manager";
|
|
|
14
14
|
import { PoxlManager } from "./stackswap/manager/poxl.manager";
|
|
15
15
|
import { StakingManager } from "./stackswap/manager/staking.manager";
|
|
16
16
|
import { SwapManager } from "./stackswap/manager/swap.manager";
|
|
17
|
-
import { UserSession } from "@stacks/connect";
|
|
18
17
|
import { LBTCStakingManager } from "./stackswap/manager/lbtcstaking.manager";
|
|
19
18
|
import { GroupFarmManager } from "./stackswap/manager/groupfarm.manager";
|
|
20
19
|
import { BridgeManager } from "./stackswap/manager/bridge.manager";
|
|
@@ -90,7 +89,7 @@ export declare class StackswapMainnetAPI implements StackswapAPI {
|
|
|
90
89
|
}>;
|
|
91
90
|
getQualifiedAddress(address: string): string;
|
|
92
91
|
walletConnect(callback: (err: any, result: any) => void): void;
|
|
93
|
-
walletConnect2(
|
|
92
|
+
walletConnect2(_userSession: any, callback: (err: any, result: any) => void): void;
|
|
94
93
|
getConnectedWallet(callback: (err: any, result: any) => void): void;
|
|
95
94
|
signOut(callback: (err: any, result: any) => void): void;
|
|
96
95
|
isConnected(): boolean;
|
package/dist/index.js
CHANGED
|
@@ -77,72 +77,51 @@ class StackswapMainnetAPI {
|
|
|
77
77
|
return this.config.STACKSWAP_ADDRESS() + '.' + address;
|
|
78
78
|
}
|
|
79
79
|
walletConnect(callback) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
(
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
},
|
|
101
|
-
});
|
|
102
|
-
}
|
|
103
|
-
catch (e) {
|
|
80
|
+
(0, connect_1.connect)()
|
|
81
|
+
.then((result) => {
|
|
82
|
+
console.log('[walletConnect] connect() raw result:', JSON.stringify(result, null, 2));
|
|
83
|
+
const stxAddresses = result.addresses.filter(a => a.address.startsWith('SP') || a.address.startsWith('ST'));
|
|
84
|
+
console.log('[walletConnect] STX addresses found:', stxAddresses);
|
|
85
|
+
console.log('[walletConnect] isMainnet:', this.config.isMainnet());
|
|
86
|
+
const address = this.config.isMainnet()
|
|
87
|
+
? stxAddresses.find(a => a.address.startsWith('SP'))?.address
|
|
88
|
+
: stxAddresses.find(a => a.address.startsWith('ST'))?.address;
|
|
89
|
+
console.log('[walletConnect] Selected address:', address);
|
|
90
|
+
if (address) {
|
|
91
|
+
this.senderAdderss = address;
|
|
92
|
+
this.connected = true;
|
|
93
|
+
callback(null, this.senderAdderss);
|
|
94
|
+
}
|
|
95
|
+
else {
|
|
96
|
+
callback(new Error('No STX address found'), null);
|
|
97
|
+
}
|
|
98
|
+
})
|
|
99
|
+
.catch((e) => {
|
|
104
100
|
callback(e, null);
|
|
105
|
-
}
|
|
101
|
+
});
|
|
106
102
|
}
|
|
107
|
-
walletConnect2(
|
|
108
|
-
|
|
109
|
-
(0, connect_1.showConnect)({
|
|
110
|
-
appDetails: {
|
|
111
|
-
name: 'Stackswap',
|
|
112
|
-
icon: 'https://app.stackswap.org/favicon.ico',
|
|
113
|
-
},
|
|
114
|
-
redirectTo: '/',
|
|
115
|
-
onFinish: () => {
|
|
116
|
-
const profile = userSession.loadUserData().profile.stxAddress;
|
|
117
|
-
if (this.config.isMainnet()) {
|
|
118
|
-
this.senderAdderss = profile.mainnet;
|
|
119
|
-
}
|
|
120
|
-
else {
|
|
121
|
-
this.senderAdderss = profile.testnet;
|
|
122
|
-
}
|
|
123
|
-
this.connected = true;
|
|
124
|
-
callback(null, this.senderAdderss);
|
|
125
|
-
},
|
|
126
|
-
userSession
|
|
127
|
-
});
|
|
128
|
-
}
|
|
129
|
-
catch (e) {
|
|
130
|
-
callback(e, null);
|
|
131
|
-
}
|
|
103
|
+
walletConnect2(_userSession, callback) {
|
|
104
|
+
this.walletConnect(callback);
|
|
132
105
|
}
|
|
133
106
|
getConnectedWallet(callback) {
|
|
134
107
|
try {
|
|
135
|
-
const
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
108
|
+
const storage = (0, connect_1.getLocalStorage)();
|
|
109
|
+
if (!storage || !storage.addresses?.stx?.length) {
|
|
110
|
+
callback(new Error('No connected wallet'), null);
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
const stxAddresses = storage.addresses.stx;
|
|
114
|
+
const address = this.config.isMainnet()
|
|
115
|
+
? stxAddresses.find(a => a.address.startsWith('SP'))?.address
|
|
116
|
+
: stxAddresses.find(a => a.address.startsWith('ST'))?.address;
|
|
117
|
+
if (address) {
|
|
118
|
+
this.senderAdderss = address;
|
|
119
|
+
this.connected = true;
|
|
120
|
+
callback(null, this.senderAdderss);
|
|
140
121
|
}
|
|
141
122
|
else {
|
|
142
|
-
|
|
123
|
+
callback(new Error('No STX address found'), null);
|
|
143
124
|
}
|
|
144
|
-
this.connected = true;
|
|
145
|
-
callback(null, this.senderAdderss);
|
|
146
125
|
}
|
|
147
126
|
catch (e) {
|
|
148
127
|
callback(e, null);
|
|
@@ -150,9 +129,9 @@ class StackswapMainnetAPI {
|
|
|
150
129
|
}
|
|
151
130
|
signOut(callback) {
|
|
152
131
|
try {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
132
|
+
(0, connect_1.disconnect)();
|
|
133
|
+
this.connected = false;
|
|
134
|
+
this.senderAdderss = '';
|
|
156
135
|
callback(null, 'success');
|
|
157
136
|
}
|
|
158
137
|
catch (e) {
|
|
@@ -161,19 +140,32 @@ class StackswapMainnetAPI {
|
|
|
161
140
|
}
|
|
162
141
|
isConnected() {
|
|
163
142
|
try {
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
if (this.config.isMainnet()) {
|
|
168
|
-
this.senderAdderss = profile.mainnet;
|
|
143
|
+
console.log('[isConnected] isWalletConnected():', (0, connect_1.isConnected)());
|
|
144
|
+
if (!(0, connect_1.isConnected)()) {
|
|
145
|
+
return false;
|
|
169
146
|
}
|
|
170
|
-
|
|
171
|
-
|
|
147
|
+
const storage = (0, connect_1.getLocalStorage)();
|
|
148
|
+
console.log('[isConnected] getLocalStorage():', JSON.stringify(storage, null, 2));
|
|
149
|
+
if (!storage || !storage.addresses?.stx?.length) {
|
|
150
|
+
console.log('[isConnected] No storage or no STX addresses');
|
|
151
|
+
return false;
|
|
172
152
|
}
|
|
173
|
-
|
|
174
|
-
|
|
153
|
+
const stxAddresses = storage.addresses.stx;
|
|
154
|
+
console.log('[isConnected] STX addresses:', stxAddresses);
|
|
155
|
+
console.log('[isConnected] isMainnet:', this.config.isMainnet());
|
|
156
|
+
const address = this.config.isMainnet()
|
|
157
|
+
? stxAddresses.find(a => a.address.startsWith('SP'))?.address
|
|
158
|
+
: stxAddresses.find(a => a.address.startsWith('ST'))?.address;
|
|
159
|
+
console.log('[isConnected] Selected address:', address);
|
|
160
|
+
if (address) {
|
|
161
|
+
this.senderAdderss = address;
|
|
162
|
+
this.connected = true;
|
|
163
|
+
return true;
|
|
164
|
+
}
|
|
165
|
+
return false;
|
|
175
166
|
}
|
|
176
167
|
catch (e) {
|
|
168
|
+
console.log('[isConnected] Error:', e);
|
|
177
169
|
return false;
|
|
178
170
|
}
|
|
179
171
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,6CAA8F;AAC9F,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,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|