@manahippo/aptos-wallet-adapter 0.1.15 → 0.1.16
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FewchaWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAQvC,OAAa,EAAgB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,WAAW,EACX,iBAAiB,
|
|
1
|
+
{"version":3,"file":"FewchaWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAQvC,OAAa,EAAgB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,eAAO,MAAM,gBAAgB,6BAAiD,CAAC;AAU/E,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,mBAAoB,SAAQ,iBAAiB;IACxD,IAAI,8BAAoB;IAExB,GAAG,SAAyB;IAE5B,IAAI,SAAwE;IAE5E,SAAS,CAAC,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAGlD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAA8B;IAErE,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,mBAAwB;IA4C3B,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,gBAAgB,CAEjC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IA0BnF,wBAAwB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA0B7F"}
|
|
@@ -38,8 +38,7 @@ const errors_1 = require("../WalletProviders/errors");
|
|
|
38
38
|
const web3_1 = __importStar(require("@fewcha/web3"));
|
|
39
39
|
const BaseAdapter_1 = require("./BaseAdapter");
|
|
40
40
|
exports.FewchaWalletName = 'Fewcha Wallet';
|
|
41
|
-
const
|
|
42
|
-
const defaultWeb3 = new web3_1.default(new web3_1.Web3Provider(defaultNodeURL));
|
|
41
|
+
const defaultWeb3 = new web3_1.default(new web3_1.Web3Provider(window.fewcha));
|
|
43
42
|
class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
44
43
|
constructor({
|
|
45
44
|
// provider = WEBWALLET_URL,
|
|
@@ -58,11 +57,7 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
58
57
|
// this._readyState = WalletReadyState.Installed;
|
|
59
58
|
if (this._readyState !== BaseAdapter_1.WalletReadyState.Unsupported) {
|
|
60
59
|
(0, BaseAdapter_1.scopePollingDetectionStrategy)(() => {
|
|
61
|
-
|
|
62
|
-
if (wallet) {
|
|
63
|
-
const provider = new web3_1.Web3Provider(wallet);
|
|
64
|
-
const web3 = new web3_1.default(provider);
|
|
65
|
-
this._provider = web3.action;
|
|
60
|
+
if (window.fewcha) {
|
|
66
61
|
this._readyState = BaseAdapter_1.WalletReadyState.Installed;
|
|
67
62
|
this.emit('readyStateChange', this._readyState);
|
|
68
63
|
return true;
|
|
@@ -74,14 +69,16 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
74
69
|
var _a, _b;
|
|
75
70
|
const publicAccount = yield ((_a = this._provider) === null || _a === void 0 ? void 0 : _a.account());
|
|
76
71
|
const isConnected = yield ((_b = this._provider) === null || _b === void 0 ? void 0 : _b.isConnected());
|
|
77
|
-
console.log('loginnnn>>', publicAccount, publicAccount === null || publicAccount === void 0 ? void 0 : publicAccount.publicKey);
|
|
78
72
|
if ((publicAccount === null || publicAccount === void 0 ? void 0 : publicAccount.publicKey) && isConnected) {
|
|
79
73
|
this._wallet = Object.assign({ connected: isConnected }, publicAccount);
|
|
80
74
|
this.emit('connect', this._wallet.publicKey);
|
|
81
75
|
}
|
|
82
76
|
}));
|
|
83
77
|
window.addEventListener('aptos#transaction', (e) => {
|
|
84
|
-
|
|
78
|
+
var _a, _b;
|
|
79
|
+
if ((_a = e === null || e === void 0 ? void 0 : e.detail) === null || _a === void 0 ? void 0 : _a.tx) {
|
|
80
|
+
this.emit('success', (_b = e === null || e === void 0 ? void 0 : e.detail) === null || _b === void 0 ? void 0 : _b.tx);
|
|
81
|
+
}
|
|
85
82
|
});
|
|
86
83
|
window.addEventListener('aptos#disconnected', () => {
|
|
87
84
|
this.emit('disconnect');
|
|
@@ -106,6 +103,7 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
106
103
|
return this._readyState;
|
|
107
104
|
}
|
|
108
105
|
connect() {
|
|
106
|
+
var _a;
|
|
109
107
|
return __awaiter(this, void 0, void 0, function* () {
|
|
110
108
|
try {
|
|
111
109
|
if (this.connected || this.connecting)
|
|
@@ -115,6 +113,10 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
115
113
|
throw new errors_1.WalletNotReadyError();
|
|
116
114
|
this._connecting = true;
|
|
117
115
|
const provider = this._provider;
|
|
116
|
+
const isConnected = yield ((_a = this._provider) === null || _a === void 0 ? void 0 : _a.isConnected());
|
|
117
|
+
if (isConnected) {
|
|
118
|
+
yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
|
|
119
|
+
}
|
|
118
120
|
yield (provider === null || provider === void 0 ? void 0 : provider.connect());
|
|
119
121
|
}
|
|
120
122
|
catch (error) {
|
|
@@ -180,7 +182,9 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
180
182
|
this.once('success', resolve);
|
|
181
183
|
this.once('error', reject);
|
|
182
184
|
});
|
|
183
|
-
return
|
|
185
|
+
return {
|
|
186
|
+
hash: promise
|
|
187
|
+
};
|
|
184
188
|
}
|
|
185
189
|
catch (error) {
|
|
186
190
|
const errMsg = error instanceof Error ? error.message : error.response.data.message;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FewchaWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,6DAAsE;AACtE,sDAKmC;AACnC,qDAAoE;AACpE,+
|
|
1
|
+
{"version":3,"file":"FewchaWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@manahippo/aptos-wallet-adapter",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.16",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"typings": "dist/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -29,6 +29,6 @@
|
|
|
29
29
|
"typescript": "^4.7.4"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@fewcha/web3": "^0.1.
|
|
32
|
+
"@fewcha/web3": "^0.1.6"
|
|
33
33
|
}
|
|
34
34
|
}
|
|
@@ -14,7 +14,6 @@ import Web3, { Web3Provider, Web3ProviderType } from '@fewcha/web3';
|
|
|
14
14
|
import {
|
|
15
15
|
AccountKeys,
|
|
16
16
|
BaseWalletAdapter,
|
|
17
|
-
PublicKey,
|
|
18
17
|
scopePollingDetectionStrategy,
|
|
19
18
|
WalletName,
|
|
20
19
|
WalletReadyState
|
|
@@ -22,8 +21,13 @@ import {
|
|
|
22
21
|
|
|
23
22
|
export const FewchaWalletName = 'Fewcha Wallet' as WalletName<'Fewcha Wallet'>;
|
|
24
23
|
|
|
25
|
-
|
|
26
|
-
|
|
24
|
+
interface FewchaWindow extends Window {
|
|
25
|
+
fewcha: Web3ProviderType;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
declare const window: FewchaWindow;
|
|
29
|
+
|
|
30
|
+
const defaultWeb3 = new Web3(new Web3Provider(window.fewcha));
|
|
27
31
|
|
|
28
32
|
export interface FewchaAdapterConfig {
|
|
29
33
|
provider?: string;
|
|
@@ -65,12 +69,7 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
|
65
69
|
|
|
66
70
|
if (this._readyState !== WalletReadyState.Unsupported) {
|
|
67
71
|
scopePollingDetectionStrategy(() => {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
if (wallet) {
|
|
71
|
-
const provider = new Web3Provider(wallet);
|
|
72
|
-
const web3 = new Web3(provider);
|
|
73
|
-
this._provider = web3.action;
|
|
72
|
+
if (window.fewcha) {
|
|
74
73
|
this._readyState = WalletReadyState.Installed;
|
|
75
74
|
this.emit('readyStateChange', this._readyState);
|
|
76
75
|
return true;
|
|
@@ -82,7 +81,6 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
|
82
81
|
window.addEventListener('aptos#connected', async () => {
|
|
83
82
|
const publicAccount = await this._provider?.account();
|
|
84
83
|
const isConnected = await this._provider?.isConnected();
|
|
85
|
-
console.log('loginnnn>>', publicAccount, publicAccount?.publicKey);
|
|
86
84
|
if (publicAccount?.publicKey && isConnected) {
|
|
87
85
|
this._wallet = {
|
|
88
86
|
connected: isConnected,
|
|
@@ -92,8 +90,10 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
|
92
90
|
}
|
|
93
91
|
});
|
|
94
92
|
|
|
95
|
-
window.addEventListener('aptos#transaction', (e) => {
|
|
96
|
-
|
|
93
|
+
window.addEventListener('aptos#transaction', (e: any) => {
|
|
94
|
+
if (e?.detail?.tx) {
|
|
95
|
+
this.emit('success', e?.detail?.tx);
|
|
96
|
+
}
|
|
97
97
|
});
|
|
98
98
|
|
|
99
99
|
window.addEventListener('aptos#disconnected', () => {
|
|
@@ -134,6 +134,10 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
|
134
134
|
|
|
135
135
|
this._connecting = true;
|
|
136
136
|
const provider = this._provider;
|
|
137
|
+
const isConnected = await this._provider?.isConnected();
|
|
138
|
+
if (isConnected) {
|
|
139
|
+
await provider?.disconnect();
|
|
140
|
+
}
|
|
137
141
|
await provider?.connect();
|
|
138
142
|
} catch (error: any) {
|
|
139
143
|
this.emit('error', error);
|
|
@@ -197,7 +201,9 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
|
197
201
|
this.once('success', resolve);
|
|
198
202
|
this.once('error', reject);
|
|
199
203
|
});
|
|
200
|
-
return
|
|
204
|
+
return {
|
|
205
|
+
hash: promise
|
|
206
|
+
} as PendingTransaction;
|
|
201
207
|
} catch (error: any) {
|
|
202
208
|
const errMsg = error instanceof Error ? error.message : error.response.data.message;
|
|
203
209
|
throw new WalletSignTransactionError(errMsg);
|