@manahippo/aptos-wallet-adapter 0.3.7 → 0.4.0
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +13 -4
- package/dist/WalletAdapters/AptosWallet.d.ts +4 -4
- package/dist/WalletAdapters/AptosWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/AptosWallet.js +4 -4
- package/dist/WalletAdapters/AptosWallet.js.map +1 -1
- package/dist/WalletAdapters/FewchaWallet.d.ts +2 -2
- package/dist/WalletAdapters/FewchaWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/FewchaWallet.js +6 -5
- package/dist/WalletAdapters/FewchaWallet.js.map +1 -1
- package/dist/WalletAdapters/MartianWallet.d.ts +3 -3
- package/dist/WalletAdapters/MartianWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/MartianWallet.js +4 -4
- package/dist/WalletAdapters/MartianWallet.js.map +1 -1
- package/dist/WalletAdapters/SpikaWallet.d.ts +4 -4
- package/dist/WalletAdapters/SpikaWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/SpikaWallet.js +9 -8
- package/dist/WalletAdapters/SpikaWallet.js.map +1 -1
- package/dist/WalletProviders/WalletProvider.d.ts.map +1 -1
- package/dist/WalletProviders/WalletProvider.js +33 -33
- package/dist/WalletProviders/WalletProvider.js.map +1 -1
- package/dist/WalletProviders/useWallet.d.ts +1 -1
- package/dist/WalletProviders/useWallet.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/WalletAdapters/AptosWallet.ts +8 -6
- package/src/WalletAdapters/FewchaWallet.ts +7 -5
- package/src/WalletAdapters/MartianWallet.ts +6 -5
- package/src/WalletAdapters/SpikaWallet.ts +12 -10
- package/src/WalletProviders/WalletProvider.tsx +37 -40
- package/src/WalletProviders/useWallet.ts +1 -1
package/README.md
CHANGED
@@ -42,7 +42,7 @@ Wallets source code [here](https://github.com/hippospace/aptos-wallet-adapter/tr
|
|
42
42
|
# Use React Provider
|
43
43
|
|
44
44
|
```typescript
|
45
|
-
import React from
|
45
|
+
import React from 'react';
|
46
46
|
import {
|
47
47
|
WalletProvider,
|
48
48
|
HippoWalletAdapter,
|
@@ -66,8 +66,9 @@ const App: React.FC = () => {
|
|
66
66
|
return (
|
67
67
|
<WalletProvider
|
68
68
|
wallets={wallets}
|
69
|
+
autoConnect={true | false} /** allow auto wallet connection or not **/
|
69
70
|
onError={(error: Error) => {
|
70
|
-
console.log('Handle Error Message', error)
|
71
|
+
console.log('Handle Error Message', error);
|
71
72
|
}}>
|
72
73
|
{/* your website */}
|
73
74
|
</WalletProvider>
|
@@ -106,13 +107,21 @@ import { AptosWalletName, useWallet } from "@manahippo/aptos-wallet-adapter"
|
|
106
107
|
|
107
108
|
...
|
108
109
|
|
109
|
-
const { connect, disconnect, connected } = useWallet();
|
110
|
+
const { connect, disconnect, connected, select } = useWallet();
|
111
|
+
|
112
|
+
/** If auto-connect is not enabled, you will require to do the connect() manually **/
|
113
|
+
useEffect(() => {
|
114
|
+
if (!autoConnect && currentWallet?.adapter) {
|
115
|
+
connect();
|
116
|
+
}
|
117
|
+
}, [autoConnect, currentWallet, connect]);
|
118
|
+
/** this is only required if you do not want auto connect wallet **/
|
110
119
|
|
111
120
|
if (!connected) {
|
112
121
|
return (
|
113
122
|
<button
|
114
123
|
onClick={() => {
|
115
|
-
|
124
|
+
select(); // E.g. connecting to the Aptos official wallet (Breaking Change)
|
116
125
|
}}
|
117
126
|
>
|
118
127
|
Connect
|
@@ -12,10 +12,10 @@ interface IAptosWallet {
|
|
12
12
|
}>;
|
13
13
|
account: () => Promise<string>;
|
14
14
|
isConnected: () => Promise<boolean>;
|
15
|
-
signAndSubmitTransaction(transaction: any): Promise<{
|
15
|
+
signAndSubmitTransaction(transaction: any, options?: any): Promise<{
|
16
16
|
hash: HexEncodedBytes;
|
17
17
|
} | IApotsErrorResult>;
|
18
|
-
signTransaction(transaction: any): Promise<Uint8Array | IApotsErrorResult>;
|
18
|
+
signTransaction(transaction: any, options?: any): Promise<Uint8Array | IApotsErrorResult>;
|
19
19
|
signMessage(message: string): Promise<{
|
20
20
|
signature: string;
|
21
21
|
}>;
|
@@ -42,8 +42,8 @@ export declare class AptosWalletAdapter extends BaseWalletAdapter {
|
|
42
42
|
get readyState(): WalletReadyState;
|
43
43
|
connect(): Promise<void>;
|
44
44
|
disconnect(): Promise<void>;
|
45
|
-
signTransaction(transaction: TransactionPayload): Promise<Uint8Array>;
|
46
|
-
signAndSubmitTransaction(transaction: TransactionPayload): Promise<{
|
45
|
+
signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array>;
|
46
|
+
signAndSubmitTransaction(transaction: TransactionPayload, options?: any): Promise<{
|
47
47
|
hash: HexEncodedBytes;
|
48
48
|
}>;
|
49
49
|
signMessage(message: string): Promise<string>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AptosWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAS1E,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/D,OAAO,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,wBAAwB,CACtB,WAAW,EAAE,GAAG,
|
1
|
+
{"version":3,"file":"AptosWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAS1E,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,iBAAiB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/D,OAAO,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,wBAAwB,CACtB,WAAW,EAAE,GAAG,EAChB,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,GAAG,iBAAiB,CAAC,CAAC;IAC1D,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,GAAG,iBAAiB,CAAC,CAAC;IAC1F,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC7D,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,eAAe,qBAAiC,CAAC;AAE9D,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB;IACvD,IAAI,sBAAmB;IAEvB,GAAG,SAAwD;IAE3D,IAAI,SAAwE;IAE5E,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,SAAS,CAAC;IAG9C,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,wBAA6B;IAqBhC,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;IAkCxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAkBpF,wBAAwB,CAC5B,WAAW,EAAE,kBAAkB,EAC/B,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC;IAkB/B,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAiBpD"}
|
@@ -107,14 +107,14 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
107
107
|
this.emit('disconnect');
|
108
108
|
});
|
109
109
|
}
|
110
|
-
signTransaction(transaction) {
|
110
|
+
signTransaction(transaction, options) {
|
111
111
|
return __awaiter(this, void 0, void 0, function* () {
|
112
112
|
try {
|
113
113
|
const wallet = this._wallet;
|
114
114
|
const provider = this._provider || window.aptos;
|
115
115
|
if (!wallet || !provider)
|
116
116
|
throw new errors_1.WalletNotConnectedError();
|
117
|
-
const response = yield provider.signTransaction(transaction);
|
117
|
+
const response = yield provider.signTransaction(transaction, options);
|
118
118
|
if (response.code) {
|
119
119
|
throw new Error(response.message);
|
120
120
|
}
|
@@ -127,14 +127,14 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
127
127
|
}
|
128
128
|
});
|
129
129
|
}
|
130
|
-
signAndSubmitTransaction(transaction) {
|
130
|
+
signAndSubmitTransaction(transaction, options) {
|
131
131
|
return __awaiter(this, void 0, void 0, function* () {
|
132
132
|
try {
|
133
133
|
const wallet = this._wallet;
|
134
134
|
const provider = this._provider || window.aptos;
|
135
135
|
if (!wallet || !provider)
|
136
136
|
throw new errors_1.WalletNotConnectedError();
|
137
|
-
const response = yield provider.signAndSubmitTransaction(transaction);
|
137
|
+
const response = yield provider.signAndSubmitTransaction(transaction, options);
|
138
138
|
if (response.code) {
|
139
139
|
throw new Error(response.message);
|
140
140
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AptosWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,sDAOmC;AACnC,+CAMuB;
|
1
|
+
{"version":3,"file":"AptosWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":"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"}
|
@@ -22,8 +22,8 @@ export declare class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
22
22
|
get readyState(): WalletReadyState;
|
23
23
|
connect(): Promise<void>;
|
24
24
|
disconnect(): Promise<void>;
|
25
|
-
signTransaction(transaction: TransactionPayload): Promise<Uint8Array>;
|
26
|
-
signAndSubmitTransaction(transaction: TransactionPayload): Promise<{
|
25
|
+
signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array>;
|
26
|
+
signAndSubmitTransaction(transaction: TransactionPayload, options?: any): Promise<{
|
27
27
|
hash: HexEncodedBytes;
|
28
28
|
}>;
|
29
29
|
signMessage(message: string): Promise<string>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"FewchaWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"AASA,OAAa,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAwB,MAAM,qBAAqB,CAAC;AAEhG,eAAO,MAAM,gBAAgB,sBAAmC,CAAC;AAQjE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,mBAAoB,SAAQ,iBAAiB;IACxD,IAAI,uBAAoB;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,CAGJ;IAEnC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,mBAAwB;
|
1
|
+
{"version":3,"file":"FewchaWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"AASA,OAAa,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAwB,MAAM,qBAAqB,CAAC;AAEhG,eAAO,MAAM,gBAAgB,sBAAmC,CAAC;AAQjE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,mBAAoB,SAAQ,iBAAiB;IACxD,IAAI,uBAAoB;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,CAGJ;IAEnC,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,mBAAwB;IAsB3B,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;IA8CxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAqBpF,wBAAwB,CAC5B,WAAW,EAAE,kBAAkB,EAC/B,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC;IAwB/B,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAiBpD"}
|
@@ -30,6 +30,7 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
30
30
|
? BaseAdapter_1.WalletReadyState.Unsupported
|
31
31
|
: BaseAdapter_1.WalletReadyState.NotDetected;
|
32
32
|
// this._network = network;
|
33
|
+
this._provider = typeof window !== 'undefined' ? new web3_1.default().action : undefined;
|
33
34
|
this._timeout = timeout;
|
34
35
|
this._connecting = false;
|
35
36
|
this._wallet = null;
|
@@ -72,7 +73,7 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
72
73
|
this._readyState === BaseAdapter_1.WalletReadyState.Installed))
|
73
74
|
throw new errors_1.WalletNotReadyError();
|
74
75
|
this._connecting = true;
|
75
|
-
const provider =
|
76
|
+
const provider = this._provider || window.fewcha;
|
76
77
|
const isConnected = yield provider.isConnected();
|
77
78
|
if ((isConnected === null || isConnected === void 0 ? void 0 : isConnected.data) === true) {
|
78
79
|
yield provider.disconnect();
|
@@ -127,14 +128,14 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
127
128
|
this.emit('disconnect');
|
128
129
|
});
|
129
130
|
}
|
130
|
-
signTransaction(transaction) {
|
131
|
+
signTransaction(transaction, options) {
|
131
132
|
return __awaiter(this, void 0, void 0, function* () {
|
132
133
|
try {
|
133
134
|
const wallet = this._wallet;
|
134
135
|
if (!wallet)
|
135
136
|
throw new errors_1.WalletNotConnectedError();
|
136
137
|
const provider = this._provider || window.fewcha;
|
137
|
-
const tx = yield provider.generateTransaction(transaction);
|
138
|
+
const tx = yield provider.generateTransaction(transaction, options);
|
138
139
|
if (!tx)
|
139
140
|
throw new Error('Cannot generate transaction');
|
140
141
|
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signTransaction(tx.data));
|
@@ -150,14 +151,14 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
150
151
|
}
|
151
152
|
});
|
152
153
|
}
|
153
|
-
signAndSubmitTransaction(transaction) {
|
154
|
+
signAndSubmitTransaction(transaction, options) {
|
154
155
|
return __awaiter(this, void 0, void 0, function* () {
|
155
156
|
try {
|
156
157
|
const wallet = this._wallet;
|
157
158
|
if (!wallet)
|
158
159
|
throw new errors_1.WalletNotConnectedError();
|
159
160
|
const provider = this._provider || window.fewcha;
|
160
|
-
const tx = yield provider.generateTransaction(transaction);
|
161
|
+
const tx = yield provider.generateTransaction(transaction, options);
|
161
162
|
if (!tx)
|
162
163
|
throw new Error('Cannot generate transaction');
|
163
164
|
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(tx.data));
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"FewchaWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sDAQmC;AACnC,wDAAsD;AACtD,+CAMuB;AAGV,QAAA,gBAAgB,GAAG,QAAgC,CAAC;AAcjE,MAAa,mBAAoB,SAAQ,+BAAiB;IAqBxD,YAAY;IACV,4BAA4B;IAC5B,0CAA0C;IAC1C,OAAO,GAAG,KAAK,KACQ,EAAE;QACzB,KAAK,EAAE,CAAC;QAzBV,SAAI,GAAG,wBAAgB,CAAC;QAExB,QAAG,GAAG,qBAAqB,CAAC;QAE5B,SAAI,GAAG,oEAAoE,CAAC;QAOlE,gBAAW,GACnB,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,QAAQ,KAAK,WAAW;YAC9D,CAAC,CAAC,8BAAgB,CAAC,WAAW;YAC9B,CAAC,CAAC,8BAAgB,CAAC,WAAW,CAAC;QAajC,2BAA2B;QAC3B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,iDAAiD;QAEjD,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,WAAW,EAAE;YACtF,IAAA,2CAA6B,EAAC,GAAG,EAAE;gBACjC,IAAI,MAAM,CAAC,MAAM,EAAE;oBACjB,IAAI,CAAC,WAAW,GAAG,8BAAgB,CAAC,SAAS,CAAC;oBAC9C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;oBAChD,OAAO,IAAI,CAAC;iBACb;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,IAAI,aAAa;;QACf,OAAO;YACL,SAAS,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,SAAS,KAAI,IAAI;YAC1C,OAAO,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,KAAI,IAAI;YACtC,OAAO,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,KAAI,IAAI;SACvC,CAAC;IACJ,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAI,SAAS;;QACX,OAAO,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,SAAS,CAAA,CAAC;IACnC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEK,OAAO;;YACX,IAAI;gBACF,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU;oBAAE,OAAO;gBAC9C,IACE,CAAC,CACC,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,QAAQ;oBAC9C,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,SAAS,CAChD;oBAED,MAAM,IAAI,4BAAmB,EAAE,CAAC;gBAElC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;gBACxB,MAAM,QAAQ,GAAG,IAAI,
|
1
|
+
{"version":3,"file":"FewchaWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"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"}
|
@@ -17,7 +17,7 @@ interface IMartianWallet {
|
|
17
17
|
connect: () => Promise<ConnectMartianAccount>;
|
18
18
|
account(): Promise<MartianAccount>;
|
19
19
|
isConnected(): Promise<boolean>;
|
20
|
-
generateTransaction(sender: MaybeHexString, payload: any): Promise<any>;
|
20
|
+
generateTransaction(sender: MaybeHexString, payload: any, options?: any): Promise<any>;
|
21
21
|
signAndSubmitTransaction(transaction: TransactionPayload): Promise<HexEncodedBytes>;
|
22
22
|
signTransaction(transaction: TransactionPayload): Promise<Uint8Array>;
|
23
23
|
signMessage(message: string): Promise<{
|
@@ -46,8 +46,8 @@ export declare class MartianWalletAdapter extends BaseWalletAdapter {
|
|
46
46
|
get readyState(): WalletReadyState;
|
47
47
|
connect(): Promise<void>;
|
48
48
|
disconnect(): Promise<void>;
|
49
|
-
signTransaction(transactionPyld: TransactionPayload): Promise<Uint8Array>;
|
50
|
-
signAndSubmitTransaction(transactionPyld: TransactionPayload): Promise<{
|
49
|
+
signTransaction(transactionPyld: TransactionPayload, options?: any): Promise<Uint8Array>;
|
50
|
+
signAndSubmitTransaction(transactionPyld: TransactionPayload, options?: any): Promise<{
|
51
51
|
hash: HexEncodedBytes;
|
52
52
|
}>;
|
53
53
|
signMessage(message: string): Promise<string>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"MartianWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/MartianWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAS1E,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,qBAAqB;IAC7B,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,cAAc,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,cAAc;IACtB,OAAO,EAAE,cAAc,CAAC;IACxB,SAAS,EAAE,cAAc,CAAC;IAC1B,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;CACtB;AACD,UAAU,cAAc;IACtB,OAAO,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC9C,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;IACnC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;
|
1
|
+
{"version":3,"file":"MartianWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/MartianWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAS1E,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,qBAAqB;IAC7B,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,cAAc,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,cAAc;IACtB,OAAO,EAAE,cAAc,CAAC;IACxB,SAAS,EAAE,cAAc,CAAC;IAC1B,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,EAAE,OAAO,CAAC;CACtB;AACD,UAAU,cAAc;IACtB,OAAO,EAAE,MAAM,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC9C,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;IACnC,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,mBAAmB,CAAC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACvF,wBAAwB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACpF,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACtE,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC7D,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,iBAAiB,uBAAqC,CAAC;AAEpE,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAE1B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,oBAAqB,SAAQ,iBAAiB;IACzD,IAAI,wBAAqB;IAEzB,GAAG,SAA+F;IAElG,IAAI,SAC+3O;IAEn4O,SAAS,CAAC,SAAS,EAAE,cAAc,GAAG,SAAS,CAAC;IAGhD,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,cAAc,GAAG,IAAI,CAAC;gBAE7B,EAGV,OAAe,EAChB,GAAE,0BAA+B;IAqBlC,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;IAuCxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,eAAe,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAmBxF,wBAAwB,CAC5B,eAAe,EAAE,kBAAkB,EACnC,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC;IAmB/B,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAiBpD"}
|
@@ -109,14 +109,14 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
109
109
|
this.emit('disconnect');
|
110
110
|
});
|
111
111
|
}
|
112
|
-
signTransaction(transactionPyld) {
|
112
|
+
signTransaction(transactionPyld, options) {
|
113
113
|
return __awaiter(this, void 0, void 0, function* () {
|
114
114
|
try {
|
115
115
|
const wallet = this._wallet;
|
116
116
|
const provider = this._provider || window.martian;
|
117
117
|
if (!wallet || !provider)
|
118
118
|
throw new errors_1.WalletNotConnectedError();
|
119
|
-
const tx = yield provider.generateTransaction(wallet.address || '', transactionPyld);
|
119
|
+
const tx = yield provider.generateTransaction(wallet.address || '', transactionPyld, options);
|
120
120
|
if (!tx)
|
121
121
|
throw new Error('Cannot generate transaction');
|
122
122
|
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signTransaction(tx));
|
@@ -131,14 +131,14 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
131
131
|
}
|
132
132
|
});
|
133
133
|
}
|
134
|
-
signAndSubmitTransaction(transactionPyld) {
|
134
|
+
signAndSubmitTransaction(transactionPyld, options) {
|
135
135
|
return __awaiter(this, void 0, void 0, function* () {
|
136
136
|
try {
|
137
137
|
const wallet = this._wallet;
|
138
138
|
const provider = this._provider || window.martian;
|
139
139
|
if (!wallet || !provider)
|
140
140
|
throw new errors_1.WalletNotConnectedError();
|
141
|
-
const tx = yield provider.generateTransaction(wallet.address || '', transactionPyld);
|
141
|
+
const tx = yield provider.generateTransaction(wallet.address || '', transactionPyld, options);
|
142
142
|
if (!tx)
|
143
143
|
throw new Error('Cannot generate transaction');
|
144
144
|
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(tx));
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"MartianWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/MartianWallet.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"MartianWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/MartianWallet.ts"],"names":[],"mappings":"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"}
|
@@ -8,10 +8,10 @@ interface ISpikaWallet {
|
|
8
8
|
}>;
|
9
9
|
account: () => Promise<string>;
|
10
10
|
isConnected: () => Promise<boolean>;
|
11
|
-
signAndSubmitTransaction(transaction: any): Promise<{
|
11
|
+
signAndSubmitTransaction(transaction: any, options?: any): Promise<{
|
12
12
|
hash: HexEncodedBytes;
|
13
13
|
}>;
|
14
|
-
signTransaction(transaction: any): Promise<Uint8Array>;
|
14
|
+
signTransaction(transaction: any, options?: any): Promise<Uint8Array>;
|
15
15
|
signMessage(message: string): Promise<string>;
|
16
16
|
disconnect(): Promise<void>;
|
17
17
|
}
|
@@ -36,8 +36,8 @@ export declare class SpikaWalletAdapter extends BaseWalletAdapter {
|
|
36
36
|
get readyState(): WalletReadyState;
|
37
37
|
connect(): Promise<void>;
|
38
38
|
disconnect(): Promise<void>;
|
39
|
-
signTransaction(transaction: TransactionPayload): Promise<Uint8Array>;
|
40
|
-
signAndSubmitTransaction(transaction: TransactionPayload): Promise<{
|
39
|
+
signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array>;
|
40
|
+
signAndSubmitTransaction(transaction: TransactionPayload, options?: any): Promise<{
|
41
41
|
hash: HexEncodedBytes;
|
42
42
|
}>;
|
43
43
|
signMessage(message: string): Promise<string>;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SpikaWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/SpikaWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAS1E,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAChF,OAAO,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,wBAAwB,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;
|
1
|
+
{"version":3,"file":"SpikaWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/SpikaWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAS1E,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAChF,OAAO,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,wBAAwB,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;IAC9F,eAAe,CAAC,WAAW,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACtE,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,eAAe,qBAAiC,CAAC;AAE9D,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB;IACvD,IAAI,sBAAmB;IAEvB,GAAG,SAAsF;IAEzF,IAAI,SAAmF;IAEvF,SAAS,CAAC,SAAS,EAAE,YAAY,GAAG,SAAS,CAAC;IAG9C,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,wBAA6B;IAqBhC,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;IA6CxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAmBpF,wBAAwB,CAC5B,WAAW,EAAE,kBAAkB,EAC/B,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC;IAmB/B,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAiBpD"}
|
@@ -70,10 +70,11 @@ class SpikaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
70
70
|
throw new errors_1.WalletNotReadyError();
|
71
71
|
this._connecting = true;
|
72
72
|
const provider = this._provider || window.spika;
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
73
|
+
yield (provider === null || provider === void 0 ? void 0 : provider.isConnected());
|
74
|
+
// const isConnected = await provider?.isConnected();
|
75
|
+
// if (isConnected === true) {
|
76
|
+
// await provider?.disconnect();
|
77
|
+
// }
|
77
78
|
const response = yield (provider === null || provider === void 0 ? void 0 : provider.connect());
|
78
79
|
if ((response === null || response === void 0 ? void 0 : response.publicKey) !== undefined) {
|
79
80
|
this._wallet = {
|
@@ -115,14 +116,14 @@ class SpikaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
115
116
|
this.emit('disconnect');
|
116
117
|
});
|
117
118
|
}
|
118
|
-
signTransaction(transaction) {
|
119
|
+
signTransaction(transaction, options) {
|
119
120
|
return __awaiter(this, void 0, void 0, function* () {
|
120
121
|
try {
|
121
122
|
const wallet = this._wallet;
|
122
123
|
const provider = this._provider || window.spika;
|
123
124
|
if (!wallet || !provider)
|
124
125
|
throw new errors_1.WalletNotConnectedError();
|
125
|
-
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signTransaction(transaction));
|
126
|
+
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signTransaction(transaction, options));
|
126
127
|
if (response) {
|
127
128
|
return response;
|
128
129
|
}
|
@@ -137,14 +138,14 @@ class SpikaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
137
138
|
}
|
138
139
|
});
|
139
140
|
}
|
140
|
-
signAndSubmitTransaction(transaction) {
|
141
|
+
signAndSubmitTransaction(transaction, options) {
|
141
142
|
return __awaiter(this, void 0, void 0, function* () {
|
142
143
|
try {
|
143
144
|
const wallet = this._wallet;
|
144
145
|
const provider = this._provider || window.spika;
|
145
146
|
if (!wallet || !provider)
|
146
147
|
throw new errors_1.WalletNotConnectedError();
|
147
|
-
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(transaction));
|
148
|
+
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(transaction, options));
|
148
149
|
if (response) {
|
149
150
|
return response;
|
150
151
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SpikaWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/SpikaWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,sDAOmC;AACnC,+CAMuB;AAkBV,QAAA,eAAe,GAAG,OAA8B,CAAC;AAQ9D,MAAa,kBAAmB,SAAQ,+BAAiB;IAqBvD,YAAY;IACV,YAAY;IACZ,0CAA0C;IAC1C,OAAO,GAAG,KAAK,KACa,EAAE;QAC9B,KAAK,EAAE,CAAC;QAzBV,SAAI,GAAG,uBAAe,CAAC;QAEvB,QAAG,GAAG,kFAAkF,CAAC;QAEzF,SAAI,GAAG,+EAA+E,CAAC;QAO7E,gBAAW,GACnB,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,QAAQ,KAAK,WAAW;YAC9D,CAAC,CAAC,8BAAgB,CAAC,WAAW;YAC9B,CAAC,CAAC,8BAAgB,CAAC,WAAW,CAAC;QAajC,IAAI,CAAC,SAAS,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1E,2BAA2B;QAC3B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,WAAW,EAAE;YACtF,IAAA,2CAA6B,EAAC,GAAG,EAAE;gBACjC,IAAI,MAAM,CAAC,KAAK,EAAE;oBAChB,IAAI,CAAC,WAAW,GAAG,8BAAgB,CAAC,SAAS,CAAC;oBAC9C,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;oBAChD,OAAO,IAAI,CAAC;iBACb;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,IAAI,aAAa;;QACf,OAAO;YACL,SAAS,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,SAAS,KAAI,IAAI;YAC1C,OAAO,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,KAAI,IAAI;YACtC,OAAO,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,KAAI,IAAI;SACvC,CAAC;IACJ,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAI,SAAS;;QACX,OAAO,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,WAAW,CAAA,CAAC;IACrC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEK,OAAO;;YACX,IAAI;gBACF,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;oBACrC,OAAO;iBACR;gBAED,IACE,CAAC,CACC,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,QAAQ;oBAC9C,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,SAAS,CAChD;oBAED,MAAM,IAAI,4BAAmB,EAAE,CAAC;gBAClC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;gBAExB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,IAAI,MAAM,CAAC,KAAK,CAAC;gBAChD,MAAM,
|
1
|
+
{"version":3,"file":"SpikaWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/SpikaWallet.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"WalletProvider.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":"
|
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,EAEL,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;AAcD,eAAO,MAAM,cAAc,EAAE,EAAE,CAAC,mBAAmB,CA6QlD,CAAC"}
|
@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
12
12
|
exports.WalletProvider = void 0;
|
13
13
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
14
|
-
const useLocalStorage_1 = require("../hooks/useLocalStorage");
|
15
14
|
const react_1 = require("react");
|
16
15
|
const errors_1 = require("./errors");
|
16
|
+
const useLocalStorage_1 = require("../hooks/useLocalStorage");
|
17
17
|
const BaseAdapter_1 = require("../WalletAdapters/BaseAdapter");
|
18
18
|
const useWallet_1 = require("./useWallet");
|
19
19
|
const initialState = {
|
@@ -85,16 +85,21 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
|
|
85
85
|
// If the window is closing or reloading, ignore disconnect and error events from the adapter
|
86
86
|
(0, react_1.useEffect)(() => {
|
87
87
|
function listener() {
|
88
|
+
if (!autoConnect) {
|
89
|
+
setName(null);
|
90
|
+
}
|
88
91
|
isUnloading.current = true;
|
89
92
|
}
|
90
93
|
window.addEventListener('beforeunload', listener);
|
91
94
|
return () => window.removeEventListener('beforeunload', listener);
|
92
|
-
}, [isUnloading]);
|
95
|
+
}, [isUnloading, autoConnect]);
|
93
96
|
// Handle the adapter's connect event
|
94
97
|
const handleConnect = (0, react_1.useCallback)(() => {
|
95
98
|
if (!adapter)
|
96
99
|
return;
|
97
|
-
setState((state) =>
|
100
|
+
setState((state) => {
|
101
|
+
return Object.assign(Object.assign({}, state), { connected: adapter.connected, account: adapter.publicAccount });
|
102
|
+
});
|
98
103
|
}, [adapter]);
|
99
104
|
// Handle the adapter's disconnect event
|
100
105
|
const handleDisconnect = (0, react_1.useCallback)(() => {
|
@@ -156,40 +161,35 @@ const WalletProvider = ({ children, wallets: adapters, autoConnect = false, onEr
|
|
156
161
|
})();
|
157
162
|
}, [isConnecting, connected, autoConnect, adapter, readyState, setName]);
|
158
163
|
// Connect the adapter to the wallet
|
159
|
-
const connect = (0, react_1.useCallback)((
|
164
|
+
const connect = (0, react_1.useCallback)(() => __awaiter(void 0, void 0, void 0, function* () {
|
160
165
|
if (isConnecting.current || isDisconnecting.current || connected)
|
161
166
|
return;
|
162
|
-
if (!
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
// Clear the selected wallet
|
170
|
-
setName(null);
|
171
|
-
if (typeof window !== 'undefined') {
|
172
|
-
window.open(adapter.url, '_blank');
|
173
|
-
}
|
174
|
-
throw handleError(new errors_1.WalletNotReadyError());
|
175
|
-
}
|
176
|
-
isConnecting.current = true;
|
177
|
-
setConnecting(true);
|
178
|
-
try {
|
179
|
-
yield adapter.connect();
|
180
|
-
}
|
181
|
-
catch (error) {
|
182
|
-
// Clear the selected wallet
|
183
|
-
setName(null);
|
184
|
-
// Rethrow the error, and handleError will also be called
|
185
|
-
throw error;
|
186
|
-
}
|
187
|
-
finally {
|
188
|
-
setConnecting(false);
|
189
|
-
isConnecting.current = false;
|
167
|
+
if (!adapter)
|
168
|
+
throw handleError(new errors_1.WalletNotSelectedError());
|
169
|
+
if (!(readyState === BaseAdapter_1.WalletReadyState.Installed || readyState === BaseAdapter_1.WalletReadyState.Loadable)) {
|
170
|
+
// Clear the selected wallet
|
171
|
+
setName(null);
|
172
|
+
if (typeof window !== 'undefined') {
|
173
|
+
window.open(adapter.url, '_blank');
|
190
174
|
}
|
175
|
+
throw handleError(new errors_1.WalletNotReadyError());
|
176
|
+
}
|
177
|
+
isConnecting.current = true;
|
178
|
+
setConnecting(true);
|
179
|
+
try {
|
180
|
+
yield adapter.connect();
|
181
|
+
}
|
182
|
+
catch (error) {
|
183
|
+
// Clear the selected wallet
|
184
|
+
setName(null);
|
185
|
+
// Rethrow the error, and handleError will also be called
|
186
|
+
throw error;
|
187
|
+
}
|
188
|
+
finally {
|
189
|
+
setConnecting(false);
|
190
|
+
isConnecting.current = false;
|
191
191
|
}
|
192
|
-
}), [isConnecting, isDisconnecting, connected, adapter, readyState, handleError, setName
|
192
|
+
}), [isConnecting, isDisconnecting, connected, adapter, readyState, handleError, setName]);
|
193
193
|
// Disconnect the adapter from the wallet
|
194
194
|
const disconnect = (0, react_1.useCallback)(() => __awaiter(void 0, void 0, void 0, function* () {
|
195
195
|
if (isDisconnecting.current)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,
|
1
|
+
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../src/WalletProviders/WalletProvider.tsx"],"names":[],"mappings":"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"}
|
@@ -14,7 +14,7 @@ export interface WalletContextState {
|
|
14
14
|
connected: boolean;
|
15
15
|
disconnecting: boolean;
|
16
16
|
select(walletName: WalletName): void;
|
17
|
-
connect(
|
17
|
+
connect(): Promise<void>;
|
18
18
|
disconnect(): Promise<void>;
|
19
19
|
signAndSubmitTransaction(transaction: TransactionPayload, options?: any): Promise<{
|
20
20
|
hash: HexEncodedBytes;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useWallet.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE1E,OAAO,EACL,WAAW,EACX,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,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IACrC,OAAO,
|
1
|
+
{"version":3,"file":"useWallet.d.ts","sourceRoot":"","sources":["../../src/WalletProviders/useWallet.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE1E,OAAO,EACL,WAAW,EACX,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,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;IACrC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,wBAAwB,CACtB,WAAW,EAAE,kBAAkB,EAC/B,OAAO,CAAC,EAAE,GAAG,GACZ,OAAO,CAAC;QAAE,IAAI,EAAE,eAAe,CAAA;KAAE,CAAC,CAAC;IACtC,eAAe,CAAC,WAAW,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACrF,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/C;AASD,eAAO,MAAM,aAAa,6CAEzB,CAAC;AAEF,wBAAgB,SAAS,IAAI,kBAAkB,CAE9C"}
|
package/package.json
CHANGED
@@ -26,9 +26,10 @@ interface IAptosWallet {
|
|
26
26
|
account: () => Promise<string>;
|
27
27
|
isConnected: () => Promise<boolean>;
|
28
28
|
signAndSubmitTransaction(
|
29
|
-
transaction: any
|
29
|
+
transaction: any,
|
30
|
+
options?: any
|
30
31
|
): Promise<{ hash: HexEncodedBytes } | IApotsErrorResult>;
|
31
|
-
signTransaction(transaction: any): Promise<Uint8Array | IApotsErrorResult>;
|
32
|
+
signTransaction(transaction: any, options?: any): Promise<Uint8Array | IApotsErrorResult>;
|
32
33
|
signMessage(message: string): Promise<{ signature: string }>;
|
33
34
|
disconnect(): Promise<void>;
|
34
35
|
}
|
@@ -163,13 +164,13 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
|
|
163
164
|
this.emit('disconnect');
|
164
165
|
}
|
165
166
|
|
166
|
-
async signTransaction(transaction: TransactionPayload): Promise<Uint8Array> {
|
167
|
+
async signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array> {
|
167
168
|
try {
|
168
169
|
const wallet = this._wallet;
|
169
170
|
const provider = this._provider || window.aptos;
|
170
171
|
if (!wallet || !provider) throw new WalletNotConnectedError();
|
171
172
|
|
172
|
-
const response = await provider.signTransaction(transaction);
|
173
|
+
const response = await provider.signTransaction(transaction, options);
|
173
174
|
if ((response as IApotsErrorResult).code) {
|
174
175
|
throw new Error((response as IApotsErrorResult).message);
|
175
176
|
}
|
@@ -182,14 +183,15 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
|
|
182
183
|
}
|
183
184
|
|
184
185
|
async signAndSubmitTransaction(
|
185
|
-
transaction: TransactionPayload
|
186
|
+
transaction: TransactionPayload,
|
187
|
+
options?: any
|
186
188
|
): Promise<{ hash: HexEncodedBytes }> {
|
187
189
|
try {
|
188
190
|
const wallet = this._wallet;
|
189
191
|
const provider = this._provider || window.aptos;
|
190
192
|
if (!wallet || !provider) throw new WalletNotConnectedError();
|
191
193
|
|
192
|
-
const response = await provider.signAndSubmitTransaction(transaction);
|
194
|
+
const response = await provider.signAndSubmitTransaction(transaction, options);
|
193
195
|
if ((response as IApotsErrorResult).code) {
|
194
196
|
throw new Error((response as IApotsErrorResult).message);
|
195
197
|
}
|
@@ -60,6 +60,7 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
60
60
|
super();
|
61
61
|
|
62
62
|
// this._network = network;
|
63
|
+
this._provider = typeof window !== 'undefined' ? new Web3().action : undefined;
|
63
64
|
this._timeout = timeout;
|
64
65
|
this._connecting = false;
|
65
66
|
this._wallet = null;
|
@@ -109,7 +110,7 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
109
110
|
throw new WalletNotReadyError();
|
110
111
|
|
111
112
|
this._connecting = true;
|
112
|
-
const provider =
|
113
|
+
const provider = this._provider || window.fewcha;
|
113
114
|
const isConnected = await provider.isConnected();
|
114
115
|
if (isConnected?.data === true) {
|
115
116
|
await provider.disconnect();
|
@@ -162,13 +163,13 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
162
163
|
this.emit('disconnect');
|
163
164
|
}
|
164
165
|
|
165
|
-
async signTransaction(transaction: TransactionPayload): Promise<Uint8Array> {
|
166
|
+
async signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array> {
|
166
167
|
try {
|
167
168
|
const wallet = this._wallet;
|
168
169
|
if (!wallet) throw new WalletNotConnectedError();
|
169
170
|
|
170
171
|
const provider = this._provider || window.fewcha;
|
171
|
-
const tx = await provider.generateTransaction(transaction as EntryFunctionPayload);
|
172
|
+
const tx = await provider.generateTransaction(transaction as EntryFunctionPayload, options);
|
172
173
|
if (!tx) throw new Error('Cannot generate transaction');
|
173
174
|
const response = await provider?.signTransaction(tx.data);
|
174
175
|
|
@@ -184,14 +185,15 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
184
185
|
}
|
185
186
|
|
186
187
|
async signAndSubmitTransaction(
|
187
|
-
transaction: TransactionPayload
|
188
|
+
transaction: TransactionPayload,
|
189
|
+
options?: any
|
188
190
|
): Promise<{ hash: HexEncodedBytes }> {
|
189
191
|
try {
|
190
192
|
const wallet = this._wallet;
|
191
193
|
if (!wallet) throw new WalletNotConnectedError();
|
192
194
|
|
193
195
|
const provider = this._provider || window.fewcha;
|
194
|
-
const tx = await provider.generateTransaction(transaction as EntryFunctionPayload);
|
196
|
+
const tx = await provider.generateTransaction(transaction as EntryFunctionPayload, options);
|
195
197
|
if (!tx) throw new Error('Cannot generate transaction');
|
196
198
|
const response = await provider?.signAndSubmitTransaction(tx.data);
|
197
199
|
if (response.status === 401) {
|
@@ -33,7 +33,7 @@ interface IMartianWallet {
|
|
33
33
|
connect: () => Promise<ConnectMartianAccount>;
|
34
34
|
account(): Promise<MartianAccount>;
|
35
35
|
isConnected(): Promise<boolean>;
|
36
|
-
generateTransaction(sender: MaybeHexString, payload: any): Promise<any>;
|
36
|
+
generateTransaction(sender: MaybeHexString, payload: any, options?: any): Promise<any>;
|
37
37
|
signAndSubmitTransaction(transaction: TransactionPayload): Promise<HexEncodedBytes>;
|
38
38
|
signTransaction(transaction: TransactionPayload): Promise<Uint8Array>;
|
39
39
|
signMessage(message: string): Promise<{ signature: string }>;
|
@@ -176,12 +176,12 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
176
176
|
this.emit('disconnect');
|
177
177
|
}
|
178
178
|
|
179
|
-
async signTransaction(transactionPyld: TransactionPayload): Promise<Uint8Array> {
|
179
|
+
async signTransaction(transactionPyld: TransactionPayload, options?: any): Promise<Uint8Array> {
|
180
180
|
try {
|
181
181
|
const wallet = this._wallet;
|
182
182
|
const provider = this._provider || window.martian;
|
183
183
|
if (!wallet || !provider) throw new WalletNotConnectedError();
|
184
|
-
const tx = await provider.generateTransaction(wallet.address || '', transactionPyld);
|
184
|
+
const tx = await provider.generateTransaction(wallet.address || '', transactionPyld, options);
|
185
185
|
if (!tx) throw new Error('Cannot generate transaction');
|
186
186
|
const response = await provider?.signTransaction(tx);
|
187
187
|
|
@@ -196,13 +196,14 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
196
196
|
}
|
197
197
|
|
198
198
|
async signAndSubmitTransaction(
|
199
|
-
transactionPyld: TransactionPayload
|
199
|
+
transactionPyld: TransactionPayload,
|
200
|
+
options?: any
|
200
201
|
): Promise<{ hash: HexEncodedBytes }> {
|
201
202
|
try {
|
202
203
|
const wallet = this._wallet;
|
203
204
|
const provider = this._provider || window.martian;
|
204
205
|
if (!wallet || !provider) throw new WalletNotConnectedError();
|
205
|
-
const tx = await provider.generateTransaction(wallet.address || '', transactionPyld);
|
206
|
+
const tx = await provider.generateTransaction(wallet.address || '', transactionPyld, options);
|
206
207
|
if (!tx) throw new Error('Cannot generate transaction');
|
207
208
|
const response = await provider?.signAndSubmitTransaction(tx);
|
208
209
|
|
@@ -19,8 +19,8 @@ interface ISpikaWallet {
|
|
19
19
|
connect: () => Promise<{ publicKey: string; account: string; authKey: string }>;
|
20
20
|
account: () => Promise<string>;
|
21
21
|
isConnected: () => Promise<boolean>;
|
22
|
-
signAndSubmitTransaction(transaction: any): Promise<{ hash: HexEncodedBytes }>;
|
23
|
-
signTransaction(transaction: any): Promise<Uint8Array>;
|
22
|
+
signAndSubmitTransaction(transaction: any, options?: any): Promise<{ hash: HexEncodedBytes }>;
|
23
|
+
signTransaction(transaction: any, options?: any): Promise<Uint8Array>;
|
24
24
|
signMessage(message: string): Promise<string>;
|
25
25
|
disconnect(): Promise<void>;
|
26
26
|
}
|
@@ -121,10 +121,11 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
|
|
121
121
|
this._connecting = true;
|
122
122
|
|
123
123
|
const provider = this._provider || window.spika;
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
124
|
+
await provider?.isConnected();
|
125
|
+
// const isConnected = await provider?.isConnected();
|
126
|
+
// if (isConnected === true) {
|
127
|
+
// await provider?.disconnect();
|
128
|
+
// }
|
128
129
|
|
129
130
|
const response = await provider?.connect();
|
130
131
|
if (response?.publicKey !== undefined) {
|
@@ -165,13 +166,13 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
|
|
165
166
|
this.emit('disconnect');
|
166
167
|
}
|
167
168
|
|
168
|
-
async signTransaction(transaction: TransactionPayload): Promise<Uint8Array> {
|
169
|
+
async signTransaction(transaction: TransactionPayload, options?: any): Promise<Uint8Array> {
|
169
170
|
try {
|
170
171
|
const wallet = this._wallet;
|
171
172
|
const provider = this._provider || window.spika;
|
172
173
|
if (!wallet || !provider) throw new WalletNotConnectedError();
|
173
174
|
|
174
|
-
const response = await provider?.signTransaction(transaction);
|
175
|
+
const response = await provider?.signTransaction(transaction, options);
|
175
176
|
if (response) {
|
176
177
|
return response;
|
177
178
|
} else {
|
@@ -185,14 +186,15 @@ export class SpikaWalletAdapter extends BaseWalletAdapter {
|
|
185
186
|
}
|
186
187
|
|
187
188
|
async signAndSubmitTransaction(
|
188
|
-
transaction: TransactionPayload
|
189
|
+
transaction: TransactionPayload,
|
190
|
+
options?: any
|
189
191
|
): Promise<{ hash: HexEncodedBytes }> {
|
190
192
|
try {
|
191
193
|
const wallet = this._wallet;
|
192
194
|
const provider = this._provider || window.spika;
|
193
195
|
if (!wallet || !provider) throw new WalletNotConnectedError();
|
194
196
|
|
195
|
-
const response = await provider?.signAndSubmitTransaction(transaction);
|
197
|
+
const response = await provider?.signAndSubmitTransaction(transaction, options);
|
196
198
|
if (response) {
|
197
199
|
return response;
|
198
200
|
} else {
|
@@ -1,4 +1,3 @@
|
|
1
|
-
import { useLocalStorage } from '../hooks/useLocalStorage';
|
2
1
|
import { FC, ReactNode, useCallback, useEffect, useRef, useState } from 'react';
|
3
2
|
import { TransactionPayload } from 'aptos/src/generated';
|
4
3
|
import {
|
@@ -7,6 +6,7 @@ import {
|
|
7
6
|
WalletNotReadyError,
|
8
7
|
WalletNotSelectedError
|
9
8
|
} from './errors';
|
9
|
+
import { useLocalStorage } from '../hooks/useLocalStorage';
|
10
10
|
import {
|
11
11
|
AccountKeys,
|
12
12
|
WalletAdapter,
|
@@ -118,21 +118,26 @@ export const WalletProvider: FC<WalletProviderProps> = ({
|
|
118
118
|
// If the window is closing or reloading, ignore disconnect and error events from the adapter
|
119
119
|
useEffect(() => {
|
120
120
|
function listener() {
|
121
|
+
if (!autoConnect) {
|
122
|
+
setName(null);
|
123
|
+
}
|
121
124
|
isUnloading.current = true;
|
122
125
|
}
|
123
126
|
|
124
127
|
window.addEventListener('beforeunload', listener);
|
125
128
|
return () => window.removeEventListener('beforeunload', listener);
|
126
|
-
}, [isUnloading]);
|
129
|
+
}, [isUnloading, autoConnect]);
|
127
130
|
|
128
131
|
// Handle the adapter's connect event
|
129
132
|
const handleConnect = useCallback(() => {
|
130
133
|
if (!adapter) return;
|
131
|
-
setState((state) =>
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
134
|
+
setState((state) => {
|
135
|
+
return {
|
136
|
+
...state,
|
137
|
+
connected: adapter.connected,
|
138
|
+
account: adapter.publicAccount
|
139
|
+
};
|
140
|
+
});
|
136
141
|
}, [adapter]);
|
137
142
|
|
138
143
|
// Handle the adapter's disconnect event
|
@@ -200,43 +205,35 @@ export const WalletProvider: FC<WalletProviderProps> = ({
|
|
200
205
|
}, [isConnecting, connected, autoConnect, adapter, readyState, setName]);
|
201
206
|
|
202
207
|
// Connect the adapter to the wallet
|
203
|
-
const connect = useCallback(
|
204
|
-
|
205
|
-
if (isConnecting.current || isDisconnecting.current || connected) return;
|
206
|
-
if (!name) {
|
207
|
-
setName(walletName);
|
208
|
-
} else {
|
209
|
-
if (!adapter) throw handleError(new WalletNotSelectedError());
|
208
|
+
const connect = useCallback(async () => {
|
209
|
+
if (isConnecting.current || isDisconnecting.current || connected) return;
|
210
210
|
|
211
|
-
|
212
|
-
!(readyState === WalletReadyState.Installed || readyState === WalletReadyState.Loadable)
|
213
|
-
) {
|
214
|
-
// Clear the selected wallet
|
215
|
-
setName(null);
|
211
|
+
if (!adapter) throw handleError(new WalletNotSelectedError());
|
216
212
|
|
217
|
-
|
218
|
-
|
219
|
-
|
213
|
+
if (!(readyState === WalletReadyState.Installed || readyState === WalletReadyState.Loadable)) {
|
214
|
+
// Clear the selected wallet
|
215
|
+
setName(null);
|
220
216
|
|
221
|
-
|
222
|
-
|
223
|
-
isConnecting.current = true;
|
224
|
-
setConnecting(true);
|
225
|
-
try {
|
226
|
-
await adapter.connect();
|
227
|
-
} catch (error: any) {
|
228
|
-
// Clear the selected wallet
|
229
|
-
setName(null);
|
230
|
-
// Rethrow the error, and handleError will also be called
|
231
|
-
throw error;
|
232
|
-
} finally {
|
233
|
-
setConnecting(false);
|
234
|
-
isConnecting.current = false;
|
235
|
-
}
|
217
|
+
if (typeof window !== 'undefined') {
|
218
|
+
window.open(adapter.url, '_blank');
|
236
219
|
}
|
237
|
-
|
238
|
-
|
239
|
-
|
220
|
+
|
221
|
+
throw handleError(new WalletNotReadyError());
|
222
|
+
}
|
223
|
+
isConnecting.current = true;
|
224
|
+
setConnecting(true);
|
225
|
+
try {
|
226
|
+
await adapter.connect();
|
227
|
+
} catch (error: any) {
|
228
|
+
// Clear the selected wallet
|
229
|
+
setName(null);
|
230
|
+
// Rethrow the error, and handleError will also be called
|
231
|
+
throw error;
|
232
|
+
} finally {
|
233
|
+
setConnecting(false);
|
234
|
+
isConnecting.current = false;
|
235
|
+
}
|
236
|
+
}, [isConnecting, isDisconnecting, connected, adapter, readyState, handleError, setName]);
|
240
237
|
|
241
238
|
// Disconnect the adapter from the wallet
|
242
239
|
const disconnect = useCallback(async () => {
|
@@ -21,7 +21,7 @@ export interface WalletContextState {
|
|
21
21
|
connected: boolean;
|
22
22
|
disconnecting: boolean;
|
23
23
|
select(walletName: WalletName): void;
|
24
|
-
connect(
|
24
|
+
connect(): Promise<void>;
|
25
25
|
disconnect(): Promise<void>;
|
26
26
|
signAndSubmitTransaction(
|
27
27
|
transaction: TransactionPayload,
|