@manahippo/aptos-wallet-adapter 0.4.11 → 0.4.13
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +8 -11
- package/dist/WalletAdapters/RiseWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/RiseWallet.js +1 -1
- package/dist/WalletAdapters/RiseWallet.js.map +1 -1
- package/dist/WalletAdapters/TokenPocketWallet.d.ts +61 -0
- package/dist/WalletAdapters/TokenPocketWallet.d.ts.map +1 -0
- package/dist/WalletAdapters/TokenPocketWallet.js +206 -0
- package/dist/WalletAdapters/TokenPocketWallet.js.map +1 -0
- package/dist/WalletAdapters/index.d.ts +1 -0
- package/dist/WalletAdapters/index.d.ts.map +1 -1
- package/dist/WalletAdapters/index.js +1 -0
- package/dist/WalletAdapters/index.js.map +1 -1
- package/dist/WalletProviders/WalletProvider.d.ts.map +1 -1
- package/dist/WalletProviders/WalletProvider.js +53 -53
- package/dist/WalletProviders/WalletProvider.js.map +1 -1
- package/dist/WalletProviders/useWallet.d.ts +2 -2
- package/dist/WalletProviders/useWallet.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/WalletAdapters/RiseWallet.ts +1 -1
- package/src/WalletAdapters/TokenPocketWallet.ts +280 -0
- package/src/WalletAdapters/index.ts +1 -0
- package/src/WalletProviders/WalletProvider.tsx +71 -67
- package/src/WalletProviders/useWallet.ts +2 -2
package/README.md
CHANGED
@@ -11,8 +11,9 @@ Supports:
|
|
11
11
|
- [Hippo web wallet](https://hippo-wallet-test.web.app/)
|
12
12
|
- [Pontem Wallet](https://pontem.network/pontem-wallet)
|
13
13
|
- [Spika wallet](https://spika.app)
|
14
|
-
- [Rise Wallet](https://
|
14
|
+
- [Rise Wallet](https://risewallet.io/)
|
15
15
|
- [Fletch wallet](http://fletchwallet.io/)
|
16
|
+
- [TokenPocket Wallet](https://tokenpocket.pro)
|
16
17
|
|
17
18
|
Working on (PR welcome):
|
18
19
|
|
@@ -57,6 +58,7 @@ import {
|
|
57
58
|
SpikaWalletAdapter,
|
58
59
|
RiseWalletAdapter,
|
59
60
|
FletchWalletAdapter
|
61
|
+
TokenPocketWalletAdapter
|
60
62
|
} from '@manahippo/aptos-wallet-adapter';
|
61
63
|
|
62
64
|
const wallets = [
|
@@ -69,6 +71,7 @@ const wallets = [
|
|
69
71
|
new SpikaWalletAdapter(),
|
70
72
|
new RiseWalletAdapter(),
|
71
73
|
new FletchWalletAdapter()
|
74
|
+
new TokenPocketWalletAdapter()
|
72
75
|
];
|
73
76
|
|
74
77
|
const App: React.FC = () => {
|
@@ -111,28 +114,22 @@ const { connected, account, network, ...rest } = useWallet();
|
|
111
114
|
*/
|
112
115
|
```
|
113
116
|
|
114
|
-
# Connect & Disconnect
|
117
|
+
# Connect & Disconnect (updated @ 18/10/2022)
|
115
118
|
|
116
119
|
```typescript
|
117
120
|
import { AptosWalletName, useWallet } from "@manahippo/aptos-wallet-adapter"
|
118
121
|
|
119
122
|
...
|
120
123
|
|
121
|
-
const { connect, disconnect, connected
|
124
|
+
const { connect, disconnect, connected } = useWallet();
|
122
125
|
|
123
|
-
|
124
|
-
useEffect(() => {
|
125
|
-
if (!autoConnect && currentWallet?.adapter) {
|
126
|
-
connect();
|
127
|
-
}
|
128
|
-
}, [autoConnect, currentWallet, connect]);
|
129
|
-
/** this is only required if you do not want auto connect wallet **/
|
126
|
+
/* No more manual connection required if you disable auto-connect mode while the previous select + connect will still work */
|
130
127
|
|
131
128
|
if (!connected) {
|
132
129
|
return (
|
133
130
|
<button
|
134
131
|
onClick={() => {
|
135
|
-
|
132
|
+
connect(walletName); // E.g. connecting to the Aptos official wallet
|
136
133
|
}}
|
137
134
|
>
|
138
135
|
Connect
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"RiseWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/RiseWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAW9C,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,WAAW,EAEX,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,WAAW;IACnB,OAAO,EAAE,cAAc,CAAC;IACxB,SAAS,EAAE,cAAc,CAAC;IAC1B,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5C,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;IAChC,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,wBAAwB,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,KAAK,CAAC,eAAe,CAAA;KAAE,CAAC,CAAC;IACrF,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACtE,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACvE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;CACjC;AAQD,eAAO,MAAM,cAAc,2BAA6C,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,EAAE,WAAW,CAAC;IAEvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,iBAAkB,SAAQ,iBAAiB;IACtD,IAAI,4BAAkB;IAEtB,GAAG,
|
1
|
+
{"version":3,"file":"RiseWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/RiseWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAW9C,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,WAAW,EAEX,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,WAAW;IACnB,OAAO,EAAE,cAAc,CAAC;IACxB,SAAS,EAAE,cAAc,CAAC;IAC1B,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5C,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;IAChC,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,wBAAwB,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,KAAK,CAAC,eAAe,CAAA;KAAE,CAAC,CAAC;IACrF,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACtE,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACvE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;CACjC;AAQD,eAAO,MAAM,cAAc,2BAA6C,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,EAAE,WAAW,CAAC;IAEvB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,iBAAkB,SAAQ,iBAAiB;IACtD,IAAI,4BAAkB;IAEtB,GAAG,SAA2B;IAE9B,IAAI,SAA2C;IAE/C,SAAS,CAAC,SAAS,EAAE,WAAW,GAAG,SAAS,CAAC;IAE7C,SAAS,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IAEzC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC;IAEvB,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAGJ;IAEnC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,uBAA4B;IAqB/B,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,OAAO,IAAI,WAAW,CAMzB;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;IA6DxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,WAAW,EAAE,KAAK,CAAC,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC;IAmB3E,wBAAwB,CAC5B,WAAW,EAAE,KAAK,CAAC,kBAAkB,GACpC,OAAO,CAAC;QAAE,IAAI,EAAE,KAAK,CAAC,eAAe,CAAA;KAAE,CAAC;IAmBrC,WAAW,CAAC,UAAU,EAAE,kBAAkB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAqBzE,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAahC,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;CAYvC"}
|
@@ -20,7 +20,7 @@ class RiseWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
20
20
|
timeout = 10000 } = {}) {
|
21
21
|
super();
|
22
22
|
this.name = exports.RiseWalletName;
|
23
|
-
this.url = 'https://
|
23
|
+
this.url = 'https://risewallet.io';
|
24
24
|
this.icon = 'https://static.risewallet.io/logo.png';
|
25
25
|
this._readyState = typeof window === 'undefined' || typeof document === 'undefined'
|
26
26
|
? BaseAdapter_1.WalletReadyState.Unsupported
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"RiseWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/RiseWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,wDAS4B;AAC5B,+CAUuB;AA0BV,QAAA,cAAc,GAAG,aAA0C,CAAC;AAQzE,MAAa,iBAAkB,SAAQ,+BAAiB;IA0BtD,YAAY;IACV,YAAY;IACZ,0CAA0C;IAC1C,OAAO,GAAG,KAAK,KACY,EAAE;QAC7B,KAAK,EAAE,CAAC;QA9BV,SAAI,GAAG,sBAAc,CAAC;QAEtB,QAAG,GAAG,
|
1
|
+
{"version":3,"file":"RiseWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/RiseWallet.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,61 @@
|
|
1
|
+
import { MaybeHexString } from 'aptos';
|
2
|
+
import { TransactionPayload, HexEncodedBytes } from 'aptos/src/generated';
|
3
|
+
import { AccountKeys, BaseWalletAdapter, NetworkInfo, SignMessagePayload, SignMessageResponse, WalletAdapterNetwork, WalletName, WalletReadyState } from './BaseAdapter';
|
4
|
+
interface TokenPocketAccount {
|
5
|
+
address: MaybeHexString;
|
6
|
+
publicKey: MaybeHexString;
|
7
|
+
}
|
8
|
+
interface ITokenPocketWallet {
|
9
|
+
isTokenPocket: boolean;
|
10
|
+
connect: () => Promise<TokenPocketAccount>;
|
11
|
+
account: () => Promise<TokenPocketAccount>;
|
12
|
+
isConnected: () => Promise<boolean>;
|
13
|
+
signAndSubmitTransaction(transaction: TransactionPayload, options?: any): Promise<{
|
14
|
+
hash: HexEncodedBytes;
|
15
|
+
}>;
|
16
|
+
network: () => Promise<WalletAdapterNetwork>;
|
17
|
+
getChainId: () => Promise<string>;
|
18
|
+
getNodeUrl: () => Promise<string>;
|
19
|
+
signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array>;
|
20
|
+
signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
|
21
|
+
disconnect(): Promise<void>;
|
22
|
+
onAccountChange: (listener: (newAddress: TokenPocketAccount) => void) => void;
|
23
|
+
onNetworkChange: (listener: (network: {
|
24
|
+
networkName: string;
|
25
|
+
}) => void) => void;
|
26
|
+
}
|
27
|
+
export declare const TokenPocketWalletName: WalletName<"TokenPocket">;
|
28
|
+
export interface TokenPocketWalletAdapterConfig {
|
29
|
+
provider?: ITokenPocketWallet;
|
30
|
+
timeout?: number;
|
31
|
+
}
|
32
|
+
export declare class TokenPocketWalletAdapter extends BaseWalletAdapter {
|
33
|
+
name: WalletName<"TokenPocket">;
|
34
|
+
url: string;
|
35
|
+
icon: string;
|
36
|
+
protected _provider: ITokenPocketWallet | undefined;
|
37
|
+
protected _network: WalletAdapterNetwork;
|
38
|
+
protected _chainId: string;
|
39
|
+
protected _api: string;
|
40
|
+
protected _timeout: number;
|
41
|
+
protected _readyState: WalletReadyState;
|
42
|
+
protected _connecting: boolean;
|
43
|
+
protected _wallet: any | null;
|
44
|
+
constructor({ timeout }?: TokenPocketWalletAdapterConfig);
|
45
|
+
get publicAccount(): AccountKeys;
|
46
|
+
get network(): NetworkInfo;
|
47
|
+
get connecting(): boolean;
|
48
|
+
get connected(): boolean;
|
49
|
+
get readyState(): WalletReadyState;
|
50
|
+
connect(): Promise<void>;
|
51
|
+
disconnect(): Promise<void>;
|
52
|
+
signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array>;
|
53
|
+
signAndSubmitTransaction(transaction: TransactionPayload, options?: any): Promise<{
|
54
|
+
hash: HexEncodedBytes;
|
55
|
+
}>;
|
56
|
+
signMessage(msgPayload: SignMessagePayload): Promise<SignMessageResponse>;
|
57
|
+
onNetworkChange(): Promise<void>;
|
58
|
+
onAccountChange(): Promise<void>;
|
59
|
+
}
|
60
|
+
export {};
|
61
|
+
//# sourceMappingURL=TokenPocketWallet.d.ts.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"TokenPocketWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/TokenPocketWallet.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,206 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
9
|
+
});
|
10
|
+
};
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
12
|
+
exports.TokenPocketWalletAdapter = exports.TokenPocketWalletName = void 0;
|
13
|
+
const errors_1 = require("../WalletProviders/errors");
|
14
|
+
const BaseAdapter_1 = require("./BaseAdapter");
|
15
|
+
exports.TokenPocketWalletName = 'TokenPocket';
|
16
|
+
class TokenPocketWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
17
|
+
constructor({
|
18
|
+
// provider,
|
19
|
+
// network = WalletAdapterNetwork.Mainnet,
|
20
|
+
timeout = 10000 } = {}) {
|
21
|
+
super();
|
22
|
+
this.name = exports.TokenPocketWalletName;
|
23
|
+
this.url = 'https://tokenpocket.pro';
|
24
|
+
this.icon = 'https://tp-statics.tokenpocket.pro/logo/tokenpocket.png';
|
25
|
+
this._readyState = typeof window === 'undefined' || typeof document === 'undefined'
|
26
|
+
? BaseAdapter_1.WalletReadyState.Unsupported
|
27
|
+
: BaseAdapter_1.WalletReadyState.NotDetected;
|
28
|
+
this._provider = typeof window !== 'undefined' ? window.aptos : undefined;
|
29
|
+
this._network = undefined;
|
30
|
+
this._timeout = timeout;
|
31
|
+
this._connecting = false;
|
32
|
+
this._wallet = null;
|
33
|
+
if (typeof window !== 'undefined' && this._readyState !== BaseAdapter_1.WalletReadyState.Unsupported) {
|
34
|
+
(0, BaseAdapter_1.scopePollingDetectionStrategy)(() => {
|
35
|
+
var _a;
|
36
|
+
if (window.aptos && ((_a = window.aptos) === null || _a === void 0 ? void 0 : _a.isTokenPocket)) {
|
37
|
+
this._readyState = BaseAdapter_1.WalletReadyState.Installed;
|
38
|
+
this.emit('readyStateChange', this._readyState);
|
39
|
+
return true;
|
40
|
+
}
|
41
|
+
return false;
|
42
|
+
});
|
43
|
+
}
|
44
|
+
}
|
45
|
+
get publicAccount() {
|
46
|
+
var _a, _b, _c;
|
47
|
+
return {
|
48
|
+
publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
|
49
|
+
address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
|
50
|
+
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
|
51
|
+
};
|
52
|
+
}
|
53
|
+
get network() {
|
54
|
+
return {
|
55
|
+
name: this._network,
|
56
|
+
api: this._api,
|
57
|
+
chainId: this._chainId
|
58
|
+
};
|
59
|
+
}
|
60
|
+
get connecting() {
|
61
|
+
return this._connecting;
|
62
|
+
}
|
63
|
+
get connected() {
|
64
|
+
var _a;
|
65
|
+
return !!((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.isConnected);
|
66
|
+
}
|
67
|
+
get readyState() {
|
68
|
+
return this._readyState;
|
69
|
+
}
|
70
|
+
connect() {
|
71
|
+
return __awaiter(this, void 0, void 0, function* () {
|
72
|
+
try {
|
73
|
+
if (this.connected || this.connecting)
|
74
|
+
return;
|
75
|
+
if (!(this._readyState === BaseAdapter_1.WalletReadyState.Loadable ||
|
76
|
+
this._readyState === BaseAdapter_1.WalletReadyState.Installed))
|
77
|
+
throw new errors_1.WalletNotReadyError();
|
78
|
+
this._connecting = true;
|
79
|
+
const provider = this._provider || window.aptos;
|
80
|
+
const isConnected = yield (provider === null || provider === void 0 ? void 0 : provider.isConnected());
|
81
|
+
if (isConnected) {
|
82
|
+
yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
|
83
|
+
}
|
84
|
+
const response = yield (provider === null || provider === void 0 ? void 0 : provider.connect());
|
85
|
+
if (!response) {
|
86
|
+
throw new errors_1.WalletNotConnectedError('No connect response');
|
87
|
+
}
|
88
|
+
this._wallet = {
|
89
|
+
address: response === null || response === void 0 ? void 0 : response.address,
|
90
|
+
publicKey: response === null || response === void 0 ? void 0 : response.publicKey,
|
91
|
+
isConnected: true
|
92
|
+
};
|
93
|
+
try {
|
94
|
+
const network = yield (provider === null || provider === void 0 ? void 0 : provider.network());
|
95
|
+
const chainId = yield (provider === null || provider === void 0 ? void 0 : provider.getChainId());
|
96
|
+
const api = yield (provider === null || provider === void 0 ? void 0 : provider.getNodeUrl());
|
97
|
+
this._network = network;
|
98
|
+
this._chainId = chainId;
|
99
|
+
this._api = api;
|
100
|
+
}
|
101
|
+
catch (error) {
|
102
|
+
const errMsg = error.message;
|
103
|
+
this.emit('error', new errors_1.WalletGetNetworkError(errMsg));
|
104
|
+
throw error;
|
105
|
+
}
|
106
|
+
this.emit('connect', this._wallet.address);
|
107
|
+
}
|
108
|
+
catch (error) {
|
109
|
+
this.emit('error', new Error(error));
|
110
|
+
throw error;
|
111
|
+
}
|
112
|
+
finally {
|
113
|
+
this._connecting = false;
|
114
|
+
}
|
115
|
+
});
|
116
|
+
}
|
117
|
+
disconnect() {
|
118
|
+
return __awaiter(this, void 0, void 0, function* () {
|
119
|
+
const wallet = this._wallet;
|
120
|
+
const provider = this._provider || window.aptos;
|
121
|
+
if (wallet) {
|
122
|
+
this._wallet = null;
|
123
|
+
try {
|
124
|
+
yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
|
125
|
+
}
|
126
|
+
catch (error) {
|
127
|
+
this.emit('error', new errors_1.WalletDisconnectionError(error === null || error === void 0 ? void 0 : error.message, error));
|
128
|
+
}
|
129
|
+
}
|
130
|
+
this.emit('disconnect');
|
131
|
+
});
|
132
|
+
}
|
133
|
+
signTransaction(transaction, options) {
|
134
|
+
return __awaiter(this, void 0, void 0, function* () {
|
135
|
+
try {
|
136
|
+
const wallet = this._wallet;
|
137
|
+
const provider = this._provider || window.aptos;
|
138
|
+
if (!wallet || !provider)
|
139
|
+
throw new errors_1.WalletNotConnectedError();
|
140
|
+
const response = yield provider.signTransaction(transaction, options);
|
141
|
+
if (!response) {
|
142
|
+
throw new Error('No response');
|
143
|
+
}
|
144
|
+
return response;
|
145
|
+
}
|
146
|
+
catch (error) {
|
147
|
+
this.emit('error', new errors_1.WalletSignTransactionError(error));
|
148
|
+
throw error;
|
149
|
+
}
|
150
|
+
});
|
151
|
+
}
|
152
|
+
signAndSubmitTransaction(transaction, options) {
|
153
|
+
return __awaiter(this, void 0, void 0, function* () {
|
154
|
+
try {
|
155
|
+
const wallet = this._wallet;
|
156
|
+
const provider = this._provider || window.aptos;
|
157
|
+
if (!wallet || !provider)
|
158
|
+
throw new errors_1.WalletNotConnectedError();
|
159
|
+
const response = yield provider.signAndSubmitTransaction(transaction, options);
|
160
|
+
if (!response) {
|
161
|
+
throw new Error('No response');
|
162
|
+
}
|
163
|
+
return response;
|
164
|
+
}
|
165
|
+
catch (error) {
|
166
|
+
this.emit('error', new errors_1.WalletSignAndSubmitMessageError(error));
|
167
|
+
throw error;
|
168
|
+
}
|
169
|
+
});
|
170
|
+
}
|
171
|
+
signMessage(msgPayload) {
|
172
|
+
return __awaiter(this, void 0, void 0, function* () {
|
173
|
+
try {
|
174
|
+
const wallet = this._wallet;
|
175
|
+
const provider = this._provider || window.aptos;
|
176
|
+
if (!wallet || !provider)
|
177
|
+
throw new errors_1.WalletNotConnectedError();
|
178
|
+
if (typeof msgPayload !== 'object' || !msgPayload.nonce) {
|
179
|
+
throw new errors_1.WalletSignMessageError('Invalid signMessage Payload');
|
180
|
+
}
|
181
|
+
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signMessage(msgPayload));
|
182
|
+
if (response) {
|
183
|
+
return response;
|
184
|
+
}
|
185
|
+
else {
|
186
|
+
throw new Error('Sign Message failed');
|
187
|
+
}
|
188
|
+
}
|
189
|
+
catch (error) {
|
190
|
+
const errMsg = error.message;
|
191
|
+
this.emit('error', new errors_1.WalletSignMessageError(errMsg));
|
192
|
+
throw error;
|
193
|
+
}
|
194
|
+
});
|
195
|
+
}
|
196
|
+
onNetworkChange() {
|
197
|
+
return __awaiter(this, void 0, void 0, function* () {
|
198
|
+
});
|
199
|
+
}
|
200
|
+
onAccountChange() {
|
201
|
+
return __awaiter(this, void 0, void 0, function* () {
|
202
|
+
});
|
203
|
+
}
|
204
|
+
}
|
205
|
+
exports.TokenPocketWalletAdapter = TokenPocketWalletAdapter;
|
206
|
+
//# sourceMappingURL=TokenPocketWallet.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"TokenPocketWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/TokenPocketWallet.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC"}
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,qBAAqB,CAAC"}
|
@@ -28,4 +28,5 @@ __exportStar(require("./HyperPayWallet"), exports);
|
|
28
28
|
__exportStar(require("./FletchWallet"), exports);
|
29
29
|
__exportStar(require("./AptosSnap"), exports);
|
30
30
|
__exportStar(require("./BitkeepWallet"), exports);
|
31
|
+
__exportStar(require("./TokenPocketWallet"), exports);
|
31
32
|
//# sourceMappingURL=index.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/WalletAdapters/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,gDAA8B;AAC9B,yDAAuC;AACvC,gDAA8B;AAC9B,kDAAgC;AAChC,iDAA+B;AAC/B,iDAA+B;AAC/B,kDAAgC;AAChC,+CAA6B;AAC7B,gDAA8B;AAC9B,mDAAiC;AACjC,iDAA+B;AAC/B,8CAA4B;AAC5B,kDAAgC"}
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/WalletAdapters/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,gDAA8B;AAC9B,yDAAuC;AACvC,gDAA8B;AAC9B,kDAAgC;AAChC,iDAA+B;AAC/B,iDAA+B;AAC/B,kDAAgC;AAChC,+CAA6B;AAC7B,gDAA8B;AAC9B,mDAAiC;AACjC,iDAA+B;AAC/B,8CAA4B;AAC5B,kDAAgC;AAChC,sDAAoC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"WalletProvider.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,SAAS,EAA4C,MAAM,OAAO,CAAC;AAEhF,OAAO,EACL,WAAW,EAIZ,MAAM,UAAU,CAAC;AAElB,OAAO,EAIL,aAAa,EAGd,MAAM,+BAA+B,CAAC;AAGvC,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAgBD,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,
|
1
|
+
{"version":3,"file":"WalletProvider.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,SAAS,EAA4C,MAAM,OAAO,CAAC;AAEhF,OAAO,EACL,WAAW,EAIZ,MAAM,UAAU,CAAC;AAElB,OAAO,EAIL,aAAa,EAGd,MAAM,+BAA+B,CAAC;AAGvC,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,SAAS,CAAC;IACpB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAgBD,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,CAgUlD,CAAC"}
|
@@ -39,19 +39,6 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
|
|
39
39
|
})));
|
40
40
|
// When the wallets change, start to listen for changes to their `readyState`
|
41
41
|
(0, react_1.useEffect)(() => {
|
42
|
-
// When the adapters change, wrap them to conform to the `Wallet` interface
|
43
|
-
setWallets((currentWallets) => adapters.map((wAdapter, index) => {
|
44
|
-
const currentWallet = currentWallets[index];
|
45
|
-
// If the wallet hasn't changed, return the same instance
|
46
|
-
return currentWallet &&
|
47
|
-
currentWallet.adapter === wAdapter &&
|
48
|
-
currentWallet.readyState === wAdapter.readyState
|
49
|
-
? currentWallet
|
50
|
-
: {
|
51
|
-
adapter: wAdapter,
|
52
|
-
readyState: wAdapter.readyState
|
53
|
-
};
|
54
|
-
}));
|
55
42
|
function handleReadyStateChange(wReadyState) {
|
56
43
|
setWallets((prevWallets) => {
|
57
44
|
const index = prevWallets.findIndex(({ adapter: wAdapter }) => wAdapter === this);
|
@@ -70,9 +57,11 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
|
|
70
57
|
}, [adapters]);
|
71
58
|
// When the selected wallet changes, initialize the state
|
72
59
|
(0, react_1.useEffect)(() => {
|
60
|
+
if (!autoConnect)
|
61
|
+
return;
|
73
62
|
const selectedWallet = wallets.find((wAdapter) => wAdapter.adapter.name === name);
|
74
63
|
if (selectedWallet) {
|
75
|
-
console.log('selectedWallets', selectedWallet);
|
64
|
+
// console.log('selectedWallets in autoConnect', selectedWallet);
|
76
65
|
setState({
|
77
66
|
wallet: selectedWallet,
|
78
67
|
adapter: selectedWallet.adapter,
|
@@ -84,7 +73,7 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
|
|
84
73
|
else {
|
85
74
|
setState(initialState);
|
86
75
|
}
|
87
|
-
}, [name, wallets]);
|
76
|
+
}, [name, wallets, autoConnect]);
|
88
77
|
// If the window is closing or reloading, ignore disconnect and error events from the adapter
|
89
78
|
(0, react_1.useEffect)(() => {
|
90
79
|
function listener() {
|
@@ -108,7 +97,7 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
|
|
108
97
|
const handleNetworkChange = (0, react_1.useCallback)(() => {
|
109
98
|
if (!adapter)
|
110
99
|
return;
|
111
|
-
console.log('adapter: handleNetworkChange', adapter.network);
|
100
|
+
// console.log('adapter: handleNetworkChange', adapter.network);
|
112
101
|
setState((state) => {
|
113
102
|
return Object.assign(Object.assign({}, state), { network: adapter.network });
|
114
103
|
});
|
@@ -117,7 +106,7 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
|
|
117
106
|
const handleAccountChange = (0, react_1.useCallback)(() => {
|
118
107
|
if (!adapter)
|
119
108
|
return;
|
120
|
-
console.log('adapter: handleAccountChange', adapter.publicAccount);
|
109
|
+
// console.log('adapter: handleAccountChange', adapter.publicAccount);
|
121
110
|
setState((state) => {
|
122
111
|
return Object.assign(Object.assign({}, state), { account: adapter.publicAccount });
|
123
112
|
});
|
@@ -125,8 +114,10 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
|
|
125
114
|
// Handle the adapter's disconnect event
|
126
115
|
const handleDisconnect = (0, react_1.useCallback)(() => {
|
127
116
|
// Clear the selected wallet unless the window is unloading
|
128
|
-
if (!isUnloading.current)
|
117
|
+
if (!isUnloading.current) {
|
129
118
|
setName(null);
|
119
|
+
setState(initialState);
|
120
|
+
}
|
130
121
|
}, [isUnloading, setName]);
|
131
122
|
// Handle the adapter's error event, and local errors
|
132
123
|
const handleError = (0, react_1.useCallback)((error) => {
|
@@ -172,51 +163,49 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
|
|
172
163
|
adapter === null || adapter === void 0 ? void 0 : adapter.disconnect();
|
173
164
|
};
|
174
165
|
}, [adapter]);
|
175
|
-
// If autoConnect is enabled, try to connect when the adapter changes and is ready
|
176
|
-
(0, react_1.useEffect)(() => {
|
177
|
-
if (isConnecting.current ||
|
178
|
-
connected ||
|
179
|
-
!autoConnect ||
|
180
|
-
!adapter ||
|
181
|
-
!(readyState === BaseAdapter_1.WalletReadyState.Installed || readyState === BaseAdapter_1.WalletReadyState.Loadable))
|
182
|
-
return;
|
183
|
-
(function () {
|
184
|
-
return __awaiter(this, void 0, void 0, function* () {
|
185
|
-
isConnecting.current = true;
|
186
|
-
setConnecting(true);
|
187
|
-
try {
|
188
|
-
yield adapter.connect();
|
189
|
-
}
|
190
|
-
catch (error) {
|
191
|
-
// Clear the selected wallet
|
192
|
-
setName(null);
|
193
|
-
// Don't throw error, but handleError will still be called
|
194
|
-
}
|
195
|
-
finally {
|
196
|
-
setConnecting(false);
|
197
|
-
isConnecting.current = false;
|
198
|
-
}
|
199
|
-
});
|
200
|
-
})();
|
201
|
-
}, [isConnecting, connected, autoConnect, adapter, readyState, setName]);
|
202
166
|
// Connect the adapter to the wallet
|
203
|
-
const connect = (0, react_1.useCallback)(() => __awaiter(void 0, void 0, void 0, function* () {
|
204
|
-
if (isConnecting.current || isDisconnecting.current || connected)
|
167
|
+
const connect = (0, react_1.useCallback)((walletName) => __awaiter(void 0, void 0, void 0, function* () {
|
168
|
+
if (isConnecting.current || isDisconnecting.current || connected || !walletName)
|
205
169
|
return;
|
206
|
-
|
170
|
+
let walletToConnect = initialState;
|
171
|
+
if (!adapter || walletName !== (adapter === null || adapter === void 0 ? void 0 : adapter.name)) {
|
172
|
+
const selectedWallet = wallets.find((wAdapter) => wAdapter.adapter.name === walletName);
|
173
|
+
if (selectedWallet) {
|
174
|
+
walletToConnect = {
|
175
|
+
wallet: selectedWallet,
|
176
|
+
adapter: selectedWallet.adapter,
|
177
|
+
connected: selectedWallet.adapter.connected,
|
178
|
+
account: selectedWallet.adapter.publicAccount,
|
179
|
+
network: selectedWallet.adapter.network
|
180
|
+
};
|
181
|
+
}
|
182
|
+
setState(walletToConnect);
|
183
|
+
setName(walletName);
|
184
|
+
}
|
185
|
+
else {
|
186
|
+
walletToConnect = {
|
187
|
+
wallet,
|
188
|
+
adapter,
|
189
|
+
connected,
|
190
|
+
account,
|
191
|
+
network
|
192
|
+
};
|
193
|
+
}
|
194
|
+
if (!walletToConnect.adapter)
|
207
195
|
throw handleError(new errors_1.WalletNotSelectedError());
|
208
|
-
if (!(readyState === BaseAdapter_1.WalletReadyState.Installed ||
|
196
|
+
if (!(walletToConnect.adapter.readyState === BaseAdapter_1.WalletReadyState.Installed ||
|
197
|
+
walletToConnect.adapter.readyState === BaseAdapter_1.WalletReadyState.Loadable)) {
|
209
198
|
// Clear the selected wallet
|
210
199
|
setName(null);
|
211
200
|
if (typeof window !== 'undefined') {
|
212
|
-
window.open(adapter.url, '_blank');
|
201
|
+
window.open(walletToConnect.adapter.url, '_blank');
|
213
202
|
}
|
214
203
|
throw handleError(new errors_1.WalletNotReadyError('Wallet Not Ready'));
|
215
204
|
}
|
216
205
|
isConnecting.current = true;
|
217
206
|
setConnecting(true);
|
218
207
|
try {
|
219
|
-
yield adapter.connect();
|
208
|
+
yield walletToConnect.adapter.connect();
|
220
209
|
}
|
221
210
|
catch (error) {
|
222
211
|
// Clear the selected wallet
|
@@ -228,7 +217,18 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
|
|
228
217
|
setConnecting(false);
|
229
218
|
isConnecting.current = false;
|
230
219
|
}
|
231
|
-
}), [
|
220
|
+
}), [connected, adapter, handleError, wallets, setName, wallet, account, network]);
|
221
|
+
// If autoConnect is enabled, try to connect when the adapter changes and is ready
|
222
|
+
(0, react_1.useEffect)(() => {
|
223
|
+
if (isConnecting.current ||
|
224
|
+
connected ||
|
225
|
+
!autoConnect ||
|
226
|
+
!name ||
|
227
|
+
!adapter ||
|
228
|
+
!(readyState === BaseAdapter_1.WalletReadyState.Installed || readyState === BaseAdapter_1.WalletReadyState.Loadable))
|
229
|
+
return;
|
230
|
+
connect(name);
|
231
|
+
}, [isConnecting, connected, autoConnect, name, connect, adapter, readyState]);
|
232
232
|
// Disconnect the adapter from the wallet
|
233
233
|
const disconnect = (0, react_1.useCallback)(() => __awaiter(void 0, void 0, void 0, function* () {
|
234
234
|
if (isDisconnecting.current)
|
@@ -282,7 +282,7 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
|
|
282
282
|
connecting,
|
283
283
|
disconnecting,
|
284
284
|
autoConnect,
|
285
|
-
select:
|
285
|
+
select: connect,
|
286
286
|
connect,
|
287
287
|
disconnect,
|
288
288
|
signAndSubmitTransaction,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,iCAAgF;AAEhF,qCAKkB;AAClB,8DAA2D;AAC3D,+DAOuC;AACvC,2CAAoD;AAUpD,MAAM,YAAY,GAMd;IACF,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,IAAI;IACb,SAAS,EAAE,KAAK;IAChB,OAAO,EAAE,IAAI;CACd,CAAC;AAEK,MAAM,cAAc,GAA4B,CAAC,EACtD,QAAQ,EACR,OAAO,EAAE,QAAQ,EACjB,WAAW,GAAG,KAAK,EACnB,OAAO,EACP,eAAe,GAAG,YAAY,EAC/B,EAAE,EAAE;IACH,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,iCAAe,EAAoB,eAAe,EAAE,IAAI,CAAC,CAAC;IAClF,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,QAAQ,CAAC,GAAG,IAAA,gBAAQ,EAAC,YAAY,CAAC,CAAC;IAC5F,MAAM,UAAU,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,KAAI,8BAAgB,CAAC,WAAW,CAAC;IACvE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IACpD,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IACnC,MAAM,eAAe,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,IAAA,cAAM,EAAC,KAAK,CAAC,CAAC;IAElC,qDAAqD;IACrD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,GAAG,EAAE,CAC1C,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACtB,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,IAAI,CAAC,UAAU;KAC5B,CAAC,CAAC,CACJ,CAAC;IAEF,6EAA6E;IAC7E,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,
|
1
|
+
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":"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"}
|
@@ -14,8 +14,8 @@ export interface WalletContextState {
|
|
14
14
|
connected: boolean;
|
15
15
|
disconnecting: boolean;
|
16
16
|
network: NetworkInfo;
|
17
|
-
select(walletName
|
18
|
-
connect(): Promise<void>;
|
17
|
+
select(walletName?: WalletName): Promise<void>;
|
18
|
+
connect(walletName?: WalletName): Promise<void>;
|
19
19
|
disconnect(): Promise<void>;
|
20
20
|
signAndSubmitTransaction(transaction: Types.TransactionPayload, options?: any): Promise<{
|
21
21
|
hash: Types.HexEncodedBytes;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useWallet.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,OAAO,EACL,WAAW,EACX,WAAW,EACX,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,UAAU,EACV,gBAAgB,EACjB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;
|
1
|
+
{"version":3,"file":"useWallet.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE9B,OAAO,EACL,WAAW,EACX,WAAW,EACX,kBAAkB,EAClB,mBAAmB,EACnB,aAAa,EACb,UAAU,EACV,gBAAgB,EACjB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,WAAW,MAAM;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;CAC9B;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,OAAO,CAAC;IACrB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,OAAO,CAAC,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,wBAAwB,CACtB,WAAW,EAAE,KAAK,CAAC,kBAAkB,EACrC,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,KAAK,CAAC,eAAe,CAAA;KAAE,CAAC,CAAC;IAC5C,eAAe,CAAC,WAAW,EAAE,KAAK,CAAC,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAC3F,WAAW,CACT,OAAO,EAAE,MAAM,GAAG,kBAAkB,GAAG,UAAU,GAChD,OAAO,CAAC,mBAAmB,GAAG,MAAM,CAAC,CAAC;CAC1C;AASD,eAAO,MAAM,aAAa,6CAEzB,CAAC;AAEF,wBAAgB,SAAS,IAAI,kBAAkB,CAE9C"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@manahippo/aptos-wallet-adapter",
|
3
|
-
"version": "0.4.
|
3
|
+
"version": "0.4.13",
|
4
4
|
"main": "dist/index.js",
|
5
5
|
"typings": "dist/index.d.ts",
|
6
6
|
"files": [
|
@@ -29,7 +29,7 @@
|
|
29
29
|
},
|
30
30
|
"dependencies": {
|
31
31
|
"@fewcha/web3": "0.1.32",
|
32
|
-
"@keystonehq/aptossnap-adapter": "^0.2.
|
32
|
+
"@keystonehq/aptossnap-adapter": "^0.2.8",
|
33
33
|
"eventemitter3": "^4.0.7",
|
34
34
|
"js-sha3": "^0.8.0"
|
35
35
|
}
|
@@ -56,7 +56,7 @@ export interface RiseWalletAdapterConfig {
|
|
56
56
|
export class RiseWalletAdapter extends BaseWalletAdapter {
|
57
57
|
name = RiseWalletName;
|
58
58
|
|
59
|
-
url = 'https://
|
59
|
+
url = 'https://risewallet.io';
|
60
60
|
|
61
61
|
icon = 'https://static.risewallet.io/logo.png';
|
62
62
|
|
@@ -0,0 +1,280 @@
|
|
1
|
+
import { MaybeHexString } from 'aptos';
|
2
|
+
import { TransactionPayload, HexEncodedBytes } from 'aptos/src/generated';
|
3
|
+
import {
|
4
|
+
WalletDisconnectionError,
|
5
|
+
WalletNotConnectedError,
|
6
|
+
WalletGetNetworkError,
|
7
|
+
WalletNotReadyError,
|
8
|
+
WalletSignAndSubmitMessageError,
|
9
|
+
WalletSignMessageError,
|
10
|
+
WalletSignTransactionError
|
11
|
+
} from '../WalletProviders/errors';
|
12
|
+
import {
|
13
|
+
AccountKeys,
|
14
|
+
BaseWalletAdapter,
|
15
|
+
NetworkInfo,
|
16
|
+
scopePollingDetectionStrategy,
|
17
|
+
SignMessagePayload,
|
18
|
+
SignMessageResponse,
|
19
|
+
WalletAdapterNetwork,
|
20
|
+
WalletName,
|
21
|
+
WalletReadyState
|
22
|
+
} from './BaseAdapter';
|
23
|
+
|
24
|
+
interface TokenPocketAccount {
|
25
|
+
address: MaybeHexString;
|
26
|
+
publicKey: MaybeHexString;
|
27
|
+
}
|
28
|
+
|
29
|
+
interface ITokenPocketWallet {
|
30
|
+
isTokenPocket: boolean;
|
31
|
+
connect: () => Promise<TokenPocketAccount>;
|
32
|
+
account: () => Promise<TokenPocketAccount>;
|
33
|
+
isConnected: () => Promise<boolean>;
|
34
|
+
signAndSubmitTransaction(
|
35
|
+
transaction: TransactionPayload,
|
36
|
+
options?: any
|
37
|
+
): Promise<{ hash: HexEncodedBytes }>;
|
38
|
+
network: () => Promise<WalletAdapterNetwork>;
|
39
|
+
getChainId: () => Promise<string>;
|
40
|
+
getNodeUrl: () => Promise<string>;
|
41
|
+
signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array>;
|
42
|
+
signMessage(message: SignMessagePayload): Promise<SignMessageResponse>;
|
43
|
+
disconnect(): Promise<void>;
|
44
|
+
onAccountChange: (listener: (newAddress: TokenPocketAccount) => void) => void;
|
45
|
+
onNetworkChange: (listener: (network: { networkName: string }) => void) => void;
|
46
|
+
}
|
47
|
+
|
48
|
+
interface TokenPocketWindow extends Window {
|
49
|
+
aptos?: ITokenPocketWallet;
|
50
|
+
}
|
51
|
+
|
52
|
+
declare const window: TokenPocketWindow;
|
53
|
+
|
54
|
+
export const TokenPocketWalletName = 'TokenPocket' as WalletName<'TokenPocket'>;
|
55
|
+
|
56
|
+
export interface TokenPocketWalletAdapterConfig {
|
57
|
+
provider?: ITokenPocketWallet;
|
58
|
+
// network?: WalletAdapterNetwork;
|
59
|
+
timeout?: number;
|
60
|
+
}
|
61
|
+
|
62
|
+
export class TokenPocketWalletAdapter extends BaseWalletAdapter {
|
63
|
+
name = TokenPocketWalletName;
|
64
|
+
|
65
|
+
url = 'https://tokenpocket.pro';
|
66
|
+
|
67
|
+
icon = 'https://tp-statics.tokenpocket.pro/logo/tokenpocket.png';
|
68
|
+
|
69
|
+
protected _provider: ITokenPocketWallet | undefined;
|
70
|
+
|
71
|
+
protected _network: WalletAdapterNetwork;
|
72
|
+
|
73
|
+
protected _chainId: string;
|
74
|
+
|
75
|
+
protected _api: string;
|
76
|
+
|
77
|
+
// protected _network: WalletAdapterNetwork;
|
78
|
+
protected _timeout: number;
|
79
|
+
|
80
|
+
protected _readyState: WalletReadyState =
|
81
|
+
typeof window === 'undefined' || typeof document === 'undefined'
|
82
|
+
? WalletReadyState.Unsupported
|
83
|
+
: WalletReadyState.NotDetected;
|
84
|
+
|
85
|
+
protected _connecting: boolean;
|
86
|
+
|
87
|
+
protected _wallet: any | null;
|
88
|
+
|
89
|
+
constructor({
|
90
|
+
// provider,
|
91
|
+
// network = WalletAdapterNetwork.Mainnet,
|
92
|
+
timeout = 10000
|
93
|
+
}: TokenPocketWalletAdapterConfig = {}) {
|
94
|
+
super();
|
95
|
+
|
96
|
+
this._provider = typeof window !== 'undefined' ? window.aptos : undefined;
|
97
|
+
this._network = undefined;
|
98
|
+
this._timeout = timeout;
|
99
|
+
this._connecting = false;
|
100
|
+
this._wallet = null;
|
101
|
+
|
102
|
+
if (typeof window !== 'undefined' && this._readyState !== WalletReadyState.Unsupported) {
|
103
|
+
scopePollingDetectionStrategy(() => {
|
104
|
+
if (window.aptos && window.aptos?.isTokenPocket) {
|
105
|
+
this._readyState = WalletReadyState.Installed;
|
106
|
+
this.emit('readyStateChange', this._readyState);
|
107
|
+
return true;
|
108
|
+
}
|
109
|
+
return false;
|
110
|
+
});
|
111
|
+
}
|
112
|
+
}
|
113
|
+
|
114
|
+
get publicAccount(): AccountKeys {
|
115
|
+
return {
|
116
|
+
publicKey: this._wallet?.publicKey || null,
|
117
|
+
address: this._wallet?.address || null,
|
118
|
+
authKey: this._wallet?.authKey || null
|
119
|
+
};
|
120
|
+
}
|
121
|
+
|
122
|
+
get network(): NetworkInfo {
|
123
|
+
return {
|
124
|
+
name: this._network,
|
125
|
+
api: this._api,
|
126
|
+
chainId: this._chainId
|
127
|
+
}
|
128
|
+
}
|
129
|
+
|
130
|
+
get connecting(): boolean {
|
131
|
+
return this._connecting;
|
132
|
+
}
|
133
|
+
|
134
|
+
get connected(): boolean {
|
135
|
+
return !!this._wallet?.isConnected;
|
136
|
+
}
|
137
|
+
|
138
|
+
get readyState(): WalletReadyState {
|
139
|
+
return this._readyState;
|
140
|
+
}
|
141
|
+
|
142
|
+
async connect(): Promise<void> {
|
143
|
+
try {
|
144
|
+
if (this.connected || this.connecting) return;
|
145
|
+
if (
|
146
|
+
!(
|
147
|
+
this._readyState === WalletReadyState.Loadable ||
|
148
|
+
this._readyState === WalletReadyState.Installed
|
149
|
+
)
|
150
|
+
)
|
151
|
+
throw new WalletNotReadyError();
|
152
|
+
this._connecting = true;
|
153
|
+
|
154
|
+
const provider = this._provider || window.aptos;
|
155
|
+
const isConnected = await provider?.isConnected();
|
156
|
+
if (isConnected) {
|
157
|
+
await provider?.disconnect();
|
158
|
+
}
|
159
|
+
const response = await provider?.connect();
|
160
|
+
|
161
|
+
if (!response) {
|
162
|
+
throw new WalletNotConnectedError('No connect response');
|
163
|
+
}
|
164
|
+
|
165
|
+
this._wallet = {
|
166
|
+
address: response?.address,
|
167
|
+
publicKey: response?.publicKey,
|
168
|
+
isConnected: true
|
169
|
+
};
|
170
|
+
|
171
|
+
try {
|
172
|
+
const network = await provider?.network();
|
173
|
+
const chainId = await provider?.getChainId();
|
174
|
+
const api = await provider?.getNodeUrl();
|
175
|
+
|
176
|
+
this._network = network;
|
177
|
+
this._chainId = chainId;
|
178
|
+
this._api = api;
|
179
|
+
} catch (error: any) {
|
180
|
+
const errMsg = error.message;
|
181
|
+
this.emit('error', new WalletGetNetworkError(errMsg));
|
182
|
+
throw error;
|
183
|
+
}
|
184
|
+
|
185
|
+
this.emit('connect', this._wallet.address);
|
186
|
+
} catch (error: any) {
|
187
|
+
this.emit('error', new Error(error));
|
188
|
+
throw error;
|
189
|
+
} finally {
|
190
|
+
this._connecting = false;
|
191
|
+
}
|
192
|
+
}
|
193
|
+
|
194
|
+
async disconnect(): Promise<void> {
|
195
|
+
const wallet = this._wallet;
|
196
|
+
const provider = this._provider || window.aptos;
|
197
|
+
if (wallet) {
|
198
|
+
this._wallet = null;
|
199
|
+
|
200
|
+
try {
|
201
|
+
await provider?.disconnect();
|
202
|
+
} catch (error: any) {
|
203
|
+
this.emit('error', new WalletDisconnectionError(error?.message, error));
|
204
|
+
}
|
205
|
+
}
|
206
|
+
|
207
|
+
this.emit('disconnect');
|
208
|
+
}
|
209
|
+
|
210
|
+
async signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array> {
|
211
|
+
try {
|
212
|
+
const wallet = this._wallet;
|
213
|
+
const provider = this._provider || window.aptos;
|
214
|
+
if (!wallet || !provider) throw new WalletNotConnectedError();
|
215
|
+
|
216
|
+
const response = await provider.signTransaction(transaction, options);
|
217
|
+
|
218
|
+
if (!response) {
|
219
|
+
throw new Error('No response');
|
220
|
+
}
|
221
|
+
return response;
|
222
|
+
} catch (error: any) {
|
223
|
+
this.emit('error', new WalletSignTransactionError(error));
|
224
|
+
throw error;
|
225
|
+
}
|
226
|
+
}
|
227
|
+
|
228
|
+
async signAndSubmitTransaction(
|
229
|
+
transaction: TransactionPayload,
|
230
|
+
options?: any
|
231
|
+
): Promise<{ hash: HexEncodedBytes }> {
|
232
|
+
try {
|
233
|
+
const wallet = this._wallet;
|
234
|
+
const provider = this._provider || window.aptos;
|
235
|
+
if (!wallet || !provider) throw new WalletNotConnectedError();
|
236
|
+
|
237
|
+
const response = await provider.signAndSubmitTransaction(transaction, options);
|
238
|
+
|
239
|
+
if (!response) {
|
240
|
+
throw new Error('No response');
|
241
|
+
}
|
242
|
+
return response as { hash: HexEncodedBytes };
|
243
|
+
} catch (error: any) {
|
244
|
+
this.emit('error', new WalletSignAndSubmitMessageError(error));
|
245
|
+
throw error;
|
246
|
+
}
|
247
|
+
}
|
248
|
+
|
249
|
+
async signMessage(msgPayload: SignMessagePayload): Promise<SignMessageResponse> {
|
250
|
+
try {
|
251
|
+
const wallet = this._wallet;
|
252
|
+
const provider = this._provider || window.aptos;
|
253
|
+
if (!wallet || !provider) throw new WalletNotConnectedError();
|
254
|
+
if (typeof msgPayload !== 'object' || !msgPayload.nonce) {
|
255
|
+
throw new WalletSignMessageError('Invalid signMessage Payload');
|
256
|
+
}
|
257
|
+
const response = await provider?.signMessage(msgPayload);
|
258
|
+
if (response) {
|
259
|
+
return response;
|
260
|
+
} else {
|
261
|
+
throw new Error('Sign Message failed');
|
262
|
+
}
|
263
|
+
} catch (error: any) {
|
264
|
+
const errMsg = error.message;
|
265
|
+
this.emit('error', new WalletSignMessageError(errMsg));
|
266
|
+
throw error;
|
267
|
+
}
|
268
|
+
}
|
269
|
+
|
270
|
+
|
271
|
+
async onNetworkChange(): Promise<void> {
|
272
|
+
|
273
|
+
}
|
274
|
+
|
275
|
+
async onAccountChange(): Promise<void> {
|
276
|
+
|
277
|
+
}
|
278
|
+
|
279
|
+
|
280
|
+
}
|
@@ -65,22 +65,6 @@ export const WalletProvider: FC<WalletProviderProps> = ({
|
|
65
65
|
|
66
66
|
// When the wallets change, start to listen for changes to their `readyState`
|
67
67
|
useEffect(() => {
|
68
|
-
// When the adapters change, wrap them to conform to the `Wallet` interface
|
69
|
-
setWallets((currentWallets) =>
|
70
|
-
adapters.map((wAdapter, index) => {
|
71
|
-
const currentWallet = currentWallets[index];
|
72
|
-
// If the wallet hasn't changed, return the same instance
|
73
|
-
return currentWallet &&
|
74
|
-
currentWallet.adapter === wAdapter &&
|
75
|
-
currentWallet.readyState === wAdapter.readyState
|
76
|
-
? currentWallet
|
77
|
-
: {
|
78
|
-
adapter: wAdapter,
|
79
|
-
readyState: wAdapter.readyState
|
80
|
-
};
|
81
|
-
})
|
82
|
-
);
|
83
|
-
|
84
68
|
function handleReadyStateChange(this: any, wReadyState: WalletReadyState) {
|
85
69
|
setWallets((prevWallets) => {
|
86
70
|
const index = prevWallets.findIndex(({ adapter: wAdapter }) => wAdapter === this);
|
@@ -106,9 +90,10 @@ export const WalletProvider: FC<WalletProviderProps> = ({
|
|
106
90
|
|
107
91
|
// When the selected wallet changes, initialize the state
|
108
92
|
useEffect(() => {
|
93
|
+
if (!autoConnect) return;
|
109
94
|
const selectedWallet = wallets.find((wAdapter) => wAdapter.adapter.name === name);
|
110
95
|
if (selectedWallet) {
|
111
|
-
console.log('selectedWallets', selectedWallet);
|
96
|
+
// console.log('selectedWallets in autoConnect', selectedWallet);
|
112
97
|
setState({
|
113
98
|
wallet: selectedWallet,
|
114
99
|
adapter: selectedWallet.adapter,
|
@@ -119,7 +104,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
|
|
119
104
|
} else {
|
120
105
|
setState(initialState);
|
121
106
|
}
|
122
|
-
}, [name, wallets]);
|
107
|
+
}, [name, wallets, autoConnect]);
|
123
108
|
|
124
109
|
// If the window is closing or reloading, ignore disconnect and error events from the adapter
|
125
110
|
useEffect(() => {
|
@@ -150,7 +135,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
|
|
150
135
|
// Handle the adapter's network event
|
151
136
|
const handleNetworkChange = useCallback(() => {
|
152
137
|
if (!adapter) return;
|
153
|
-
console.log('adapter: handleNetworkChange', adapter.network);
|
138
|
+
// console.log('adapter: handleNetworkChange', adapter.network);
|
154
139
|
setState((state) => {
|
155
140
|
return {
|
156
141
|
...state,
|
@@ -162,7 +147,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
|
|
162
147
|
// Handle the adapter's account event
|
163
148
|
const handleAccountChange = useCallback(() => {
|
164
149
|
if (!adapter) return;
|
165
|
-
console.log('adapter: handleAccountChange', adapter.publicAccount);
|
150
|
+
// console.log('adapter: handleAccountChange', adapter.publicAccount);
|
166
151
|
setState((state) => {
|
167
152
|
return {
|
168
153
|
...state,
|
@@ -174,7 +159,10 @@ export const WalletProvider: FC<WalletProviderProps> = ({
|
|
174
159
|
// Handle the adapter's disconnect event
|
175
160
|
const handleDisconnect = useCallback(() => {
|
176
161
|
// Clear the selected wallet unless the window is unloading
|
177
|
-
if (!isUnloading.current)
|
162
|
+
if (!isUnloading.current) {
|
163
|
+
setName(null);
|
164
|
+
setState(initialState);
|
165
|
+
}
|
178
166
|
}, [isUnloading, setName]);
|
179
167
|
|
180
168
|
// Handle the adapter's error event, and local errors
|
@@ -227,63 +215,79 @@ export const WalletProvider: FC<WalletProviderProps> = ({
|
|
227
215
|
};
|
228
216
|
}, [adapter]);
|
229
217
|
|
230
|
-
//
|
231
|
-
|
232
|
-
|
233
|
-
isConnecting.current ||
|
234
|
-
|
235
|
-
!
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
218
|
+
// Connect the adapter to the wallet
|
219
|
+
const connect = useCallback(
|
220
|
+
async (walletName?) => {
|
221
|
+
if (isConnecting.current || isDisconnecting.current || connected || !walletName) return;
|
222
|
+
let walletToConnect = initialState;
|
223
|
+
if (!adapter || walletName !== adapter?.name) {
|
224
|
+
const selectedWallet = wallets.find((wAdapter) => wAdapter.adapter.name === walletName);
|
225
|
+
if (selectedWallet) {
|
226
|
+
walletToConnect = {
|
227
|
+
wallet: selectedWallet,
|
228
|
+
adapter: selectedWallet.adapter,
|
229
|
+
connected: selectedWallet.adapter.connected,
|
230
|
+
account: selectedWallet.adapter.publicAccount,
|
231
|
+
network: selectedWallet.adapter.network
|
232
|
+
};
|
233
|
+
}
|
234
|
+
setState(walletToConnect);
|
235
|
+
setName(walletName);
|
236
|
+
} else {
|
237
|
+
walletToConnect = {
|
238
|
+
wallet,
|
239
|
+
adapter,
|
240
|
+
connected,
|
241
|
+
account,
|
242
|
+
network
|
243
|
+
};
|
244
|
+
}
|
245
|
+
if (!walletToConnect.adapter) throw handleError(new WalletNotSelectedError());
|
246
|
+
if (
|
247
|
+
!(
|
248
|
+
walletToConnect.adapter.readyState === WalletReadyState.Installed ||
|
249
|
+
walletToConnect.adapter.readyState === WalletReadyState.Loadable
|
250
|
+
)
|
251
|
+
) {
|
252
|
+
// Clear the selected wallet
|
253
|
+
setName(null);
|
240
254
|
|
241
|
-
|
255
|
+
if (typeof window !== 'undefined') {
|
256
|
+
window.open(walletToConnect.adapter.url, '_blank');
|
257
|
+
}
|
258
|
+
|
259
|
+
throw handleError(new WalletNotReadyError('Wallet Not Ready'));
|
260
|
+
}
|
242
261
|
isConnecting.current = true;
|
243
262
|
setConnecting(true);
|
244
263
|
try {
|
245
|
-
await adapter.connect();
|
264
|
+
await walletToConnect.adapter.connect();
|
246
265
|
} catch (error: any) {
|
247
266
|
// Clear the selected wallet
|
248
267
|
setName(null);
|
249
|
-
//
|
268
|
+
// Rethrow the error, and handleError will also be called
|
269
|
+
throw error;
|
250
270
|
} finally {
|
251
271
|
setConnecting(false);
|
252
272
|
isConnecting.current = false;
|
253
273
|
}
|
254
|
-
}
|
255
|
-
|
256
|
-
|
257
|
-
// Connect the adapter to the wallet
|
258
|
-
const connect = useCallback(async () => {
|
259
|
-
if (isConnecting.current || isDisconnecting.current || connected) return;
|
260
|
-
|
261
|
-
if (!adapter) throw handleError(new WalletNotSelectedError());
|
262
|
-
|
263
|
-
if (!(readyState === WalletReadyState.Installed || readyState === WalletReadyState.Loadable)) {
|
264
|
-
// Clear the selected wallet
|
265
|
-
setName(null);
|
266
|
-
|
267
|
-
if (typeof window !== 'undefined') {
|
268
|
-
window.open(adapter.url, '_blank');
|
269
|
-
}
|
274
|
+
},
|
275
|
+
[connected, adapter, handleError, wallets, setName, wallet, account, network]
|
276
|
+
);
|
270
277
|
|
271
|
-
|
272
|
-
|
273
|
-
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
|
284
|
-
isConnecting.current = false;
|
285
|
-
}
|
286
|
-
}, [isConnecting, isDisconnecting, connected, adapter, readyState, handleError, setName]);
|
278
|
+
// If autoConnect is enabled, try to connect when the adapter changes and is ready
|
279
|
+
useEffect(() => {
|
280
|
+
if (
|
281
|
+
isConnecting.current ||
|
282
|
+
connected ||
|
283
|
+
!autoConnect ||
|
284
|
+
!name ||
|
285
|
+
!adapter ||
|
286
|
+
!(readyState === WalletReadyState.Installed || readyState === WalletReadyState.Loadable)
|
287
|
+
)
|
288
|
+
return;
|
289
|
+
connect(name);
|
290
|
+
}, [isConnecting, connected, autoConnect, name, connect, adapter, readyState]);
|
287
291
|
|
288
292
|
// Disconnect the adapter from the wallet
|
289
293
|
const disconnect = useCallback(async () => {
|
@@ -344,7 +348,7 @@ export const WalletProvider: FC<WalletProviderProps> = ({
|
|
344
348
|
connecting,
|
345
349
|
disconnecting,
|
346
350
|
autoConnect,
|
347
|
-
select:
|
351
|
+
select: connect,
|
348
352
|
connect,
|
349
353
|
disconnect,
|
350
354
|
signAndSubmitTransaction,
|
@@ -24,8 +24,8 @@ export interface WalletContextState {
|
|
24
24
|
connected: boolean;
|
25
25
|
disconnecting: boolean;
|
26
26
|
network: NetworkInfo;
|
27
|
-
select(walletName
|
28
|
-
connect(): Promise<void>;
|
27
|
+
select(walletName?: WalletName): Promise<void>;
|
28
|
+
connect(walletName?: WalletName): Promise<void>;
|
29
29
|
disconnect(): Promise<void>;
|
30
30
|
signAndSubmitTransaction(
|
31
31
|
transaction: Types.TransactionPayload,
|