@manahippo/aptos-wallet-adapter 0.1.14 → 0.1.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/WalletAdapters/AptosWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/AptosWallet.js +1 -1
- package/dist/WalletAdapters/AptosWallet.js.map +1 -1
- package/dist/WalletAdapters/FewchaWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/FewchaWallet.js +17 -13
- package/dist/WalletAdapters/FewchaWallet.js.map +1 -1
- package/dist/WalletAdapters/HippoExtensionWallet.d.ts +5 -2
- package/dist/WalletAdapters/HippoExtensionWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/HippoExtensionWallet.js +6 -8
- package/dist/WalletAdapters/HippoExtensionWallet.js.map +1 -1
- package/dist/WalletAdapters/HippoWallet.d.ts +3 -0
- package/dist/WalletAdapters/HippoWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/HippoWallet.js +4 -3
- package/dist/WalletAdapters/HippoWallet.js.map +1 -1
- package/dist/WalletAdapters/MartianWallet.d.ts +21 -7
- package/dist/WalletAdapters/MartianWallet.d.ts.map +1 -1
- package/dist/WalletAdapters/MartianWallet.js +34 -73
- package/dist/WalletAdapters/MartianWallet.js.map +1 -1
- package/dist/WalletAdapters/MultiMaskWallet.js +1 -1
- package/dist/WalletAdapters/MultiMaskWallet.js.map +1 -1
- package/package.json +9 -9
- package/src/WalletAdapters/AptosWallet.ts +1 -4
- package/src/WalletAdapters/FewchaWallet.ts +22 -16
- package/src/WalletAdapters/HippoExtensionWallet.ts +14 -10
- package/src/WalletAdapters/HippoWallet.ts +8 -10
- package/src/WalletAdapters/MartianWallet.ts +59 -80
- package/src/WalletAdapters/MultiMaskWallet.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AptosWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAOvC,OAAO,EACL,WAAW,
|
|
1
|
+
{"version":3,"file":"AptosWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAOvC,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,YAAY;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC5C,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,IAAI,CAAC,CAAC;IAC1D,eAAe,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,eAAe,4BAA+C,CAAC;AAE5E,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB;IACvD,IAAI,6BAAmB;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;IA6BxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAsBnF,wBAAwB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAsB7F"}
|
|
@@ -46,7 +46,7 @@ class AptosWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
46
46
|
return {
|
|
47
47
|
publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
|
|
48
48
|
address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
|
|
49
|
-
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.
|
|
49
|
+
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
get connecting() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AptosWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,sDAKmC;AACnC,+
|
|
1
|
+
{"version":3,"file":"AptosWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/AptosWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FewchaWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAQvC,OAAa,EAAgB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,WAAW,EACX,iBAAiB,
|
|
1
|
+
{"version":3,"file":"FewchaWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAQvC,OAAa,EAAgB,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,eAAO,MAAM,gBAAgB,6BAAiD,CAAC;AAU/E,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,mBAAoB,SAAQ,iBAAiB;IACxD,IAAI,8BAAoB;IAExB,GAAG,SAAyB;IAE5B,IAAI,SAAwE;IAE5E,SAAS,CAAC,SAAS,EAAE,gBAAgB,GAAG,SAAS,CAAC;IAGlD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAA8B;IAErE,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,mBAAwB;IA4C3B,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,gBAAgB,CAEjC;IAEK,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IA0BnF,wBAAwB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CA0B7F"}
|
|
@@ -38,8 +38,7 @@ const errors_1 = require("../WalletProviders/errors");
|
|
|
38
38
|
const web3_1 = __importStar(require("@fewcha/web3"));
|
|
39
39
|
const BaseAdapter_1 = require("./BaseAdapter");
|
|
40
40
|
exports.FewchaWalletName = 'Fewcha Wallet';
|
|
41
|
-
const
|
|
42
|
-
const defaultWeb3 = new web3_1.default(new web3_1.Web3Provider(defaultNodeURL));
|
|
41
|
+
const defaultWeb3 = new web3_1.default(new web3_1.Web3Provider(window.fewcha));
|
|
43
42
|
class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
44
43
|
constructor({
|
|
45
44
|
// provider = WEBWALLET_URL,
|
|
@@ -58,11 +57,7 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
58
57
|
// this._readyState = WalletReadyState.Installed;
|
|
59
58
|
if (this._readyState !== BaseAdapter_1.WalletReadyState.Unsupported) {
|
|
60
59
|
(0, BaseAdapter_1.scopePollingDetectionStrategy)(() => {
|
|
61
|
-
|
|
62
|
-
if (wallet) {
|
|
63
|
-
const provider = new web3_1.Web3Provider(wallet);
|
|
64
|
-
const web3 = new web3_1.default(provider);
|
|
65
|
-
this._provider = web3.action;
|
|
60
|
+
if (window.fewcha) {
|
|
66
61
|
this._readyState = BaseAdapter_1.WalletReadyState.Installed;
|
|
67
62
|
this.emit('readyStateChange', this._readyState);
|
|
68
63
|
return true;
|
|
@@ -74,14 +69,16 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
74
69
|
var _a, _b;
|
|
75
70
|
const publicAccount = yield ((_a = this._provider) === null || _a === void 0 ? void 0 : _a.account());
|
|
76
71
|
const isConnected = yield ((_b = this._provider) === null || _b === void 0 ? void 0 : _b.isConnected());
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
this._wallet = Object.assign({ connected: isConnected }, publicAccount);
|
|
72
|
+
if ((publicAccount === null || publicAccount === void 0 ? void 0 : publicAccount.data.publicKey) && isConnected) {
|
|
73
|
+
this._wallet = Object.assign({ connected: isConnected }, publicAccount.data);
|
|
80
74
|
this.emit('connect', this._wallet.publicKey);
|
|
81
75
|
}
|
|
82
76
|
}));
|
|
83
77
|
window.addEventListener('aptos#transaction', (e) => {
|
|
84
|
-
|
|
78
|
+
var _a, _b;
|
|
79
|
+
if ((_a = e === null || e === void 0 ? void 0 : e.detail) === null || _a === void 0 ? void 0 : _a.tx) {
|
|
80
|
+
this.emit('success', (_b = e === null || e === void 0 ? void 0 : e.detail) === null || _b === void 0 ? void 0 : _b.tx);
|
|
81
|
+
}
|
|
85
82
|
});
|
|
86
83
|
window.addEventListener('aptos#disconnected', () => {
|
|
87
84
|
this.emit('disconnect');
|
|
@@ -92,7 +89,7 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
92
89
|
return {
|
|
93
90
|
publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
|
|
94
91
|
address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
|
|
95
|
-
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.
|
|
92
|
+
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
|
|
96
93
|
};
|
|
97
94
|
}
|
|
98
95
|
get connecting() {
|
|
@@ -106,6 +103,7 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
106
103
|
return this._readyState;
|
|
107
104
|
}
|
|
108
105
|
connect() {
|
|
106
|
+
var _a;
|
|
109
107
|
return __awaiter(this, void 0, void 0, function* () {
|
|
110
108
|
try {
|
|
111
109
|
if (this.connected || this.connecting)
|
|
@@ -115,6 +113,10 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
115
113
|
throw new errors_1.WalletNotReadyError();
|
|
116
114
|
this._connecting = true;
|
|
117
115
|
const provider = this._provider;
|
|
116
|
+
const isConnected = yield ((_a = this._provider) === null || _a === void 0 ? void 0 : _a.isConnected());
|
|
117
|
+
if (isConnected) {
|
|
118
|
+
yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
|
|
119
|
+
}
|
|
118
120
|
yield (provider === null || provider === void 0 ? void 0 : provider.connect());
|
|
119
121
|
}
|
|
120
122
|
catch (error) {
|
|
@@ -180,7 +182,9 @@ class FewchaWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
180
182
|
this.once('success', resolve);
|
|
181
183
|
this.once('error', reject);
|
|
182
184
|
});
|
|
183
|
-
return
|
|
185
|
+
return {
|
|
186
|
+
hash: promise
|
|
187
|
+
};
|
|
184
188
|
}
|
|
185
189
|
catch (error) {
|
|
186
190
|
const errMsg = error instanceof Error ? error.message : error.response.data.message;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FewchaWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,6DAAsE;AACtE,sDAKmC;AACnC,qDAAoE;AACpE,+
|
|
1
|
+
{"version":3,"file":"FewchaWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/FewchaWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
|
+
import { MaybeHexString } from 'aptos';
|
|
1
2
|
import { PendingTransaction, SubmitTransactionRequest, TransactionPayload } from 'aptos/dist/api/data-contracts';
|
|
2
3
|
import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
|
|
3
4
|
interface IHippoWallet {
|
|
4
5
|
connect: () => Promise<{
|
|
5
|
-
address:
|
|
6
|
+
address: MaybeHexString;
|
|
7
|
+
publicKey: MaybeHexString;
|
|
8
|
+
authKey: MaybeHexString;
|
|
6
9
|
}>;
|
|
7
10
|
account: () => Promise<string>;
|
|
8
11
|
isConnected: () => Promise<boolean>;
|
|
9
|
-
signAndSubmitTransaction(transaction: any): Promise<
|
|
12
|
+
signAndSubmitTransaction(transaction: any): Promise<any>;
|
|
10
13
|
signTransaction(transaction: any): Promise<void>;
|
|
11
14
|
disconnect(): Promise<void>;
|
|
12
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HippoExtensionWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/HippoExtensionWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAOvC,OAAO,EACL,WAAW,EACX,iBAAiB,
|
|
1
|
+
{"version":3,"file":"HippoExtensionWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/HippoExtensionWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAOvC,OAAO,EACL,WAAW,EACX,iBAAiB,EAEjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,YAAY;IACpB,OAAO,EAAE,MAAM,OAAO,CAAC;QACrB,OAAO,EAAE,cAAc,CAAC;QACxB,SAAS,EAAE,cAAc,CAAC;QAC1B,OAAO,EAAE,cAAc,CAAC;KACzB,CAAC,CAAC;IACH,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,GAAG,CAAC,CAAC;IACzD,eAAe,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACjD,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,wBAAwB,4BAA+C,CAAC;AAErF,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,2BAA4B,SAAQ,iBAAiB;IAChE,IAAI,6BAA4B;IAEhC,GAAG,SAAgD;IAEnD,IAAI,SAAqF;IAEzF,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,iCAAsC;IAqBzC,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;IA6BxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAsBnF,wBAAwB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAsB7F"}
|
|
@@ -20,7 +20,7 @@ class HippoExtensionWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
20
20
|
timeout = 10000 } = {}) {
|
|
21
21
|
super();
|
|
22
22
|
this.name = exports.HippoExtensionWalletName;
|
|
23
|
-
this.url = 'https://hippo-wallet
|
|
23
|
+
this.url = 'https://github.com/hippospace/hippo-wallet';
|
|
24
24
|
this.icon = 'https://ui-test1-22e7c.web.app/static/media/hippo_logo.ecded6bf411652de9b7f.png';
|
|
25
25
|
this._readyState = typeof window === 'undefined' || typeof document === 'undefined'
|
|
26
26
|
? BaseAdapter_1.WalletReadyState.Unsupported
|
|
@@ -46,7 +46,7 @@ class HippoExtensionWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
46
46
|
return {
|
|
47
47
|
publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
|
|
48
48
|
address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
|
|
49
|
-
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.
|
|
49
|
+
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
get connecting() {
|
|
@@ -70,10 +70,7 @@ class HippoExtensionWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
70
70
|
this._connecting = true;
|
|
71
71
|
const provider = this._provider || window.hippoWallet;
|
|
72
72
|
const response = yield (provider === null || provider === void 0 ? void 0 : provider.connect());
|
|
73
|
-
this._wallet = {
|
|
74
|
-
publicKey: response === null || response === void 0 ? void 0 : response.address,
|
|
75
|
-
isConnected: true
|
|
76
|
-
};
|
|
73
|
+
this._wallet = Object.assign(Object.assign({}, response), { isConnected: true });
|
|
77
74
|
this.emit('connect', this._wallet.publicKey);
|
|
78
75
|
}
|
|
79
76
|
catch (error) {
|
|
@@ -137,14 +134,15 @@ class HippoExtensionWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
137
134
|
const provider = this._provider || window.hippoWallet;
|
|
138
135
|
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(transaction));
|
|
139
136
|
if (response) {
|
|
140
|
-
return response;
|
|
137
|
+
return response.detail;
|
|
141
138
|
}
|
|
142
139
|
else {
|
|
143
140
|
throw new Error('Transaction failed');
|
|
144
141
|
}
|
|
145
142
|
}
|
|
146
143
|
catch (error) {
|
|
147
|
-
|
|
144
|
+
// console.log('transact err', error, error.message);
|
|
145
|
+
throw new errors_1.WalletSignTransactionError(error.message || error);
|
|
148
146
|
}
|
|
149
147
|
}
|
|
150
148
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HippoExtensionWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/HippoExtensionWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"HippoExtensionWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/HippoExtensionWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HippoWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/HippoWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAOvC,OAAO,
|
|
1
|
+
{"version":3,"file":"HippoWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/HippoWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAOvC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAE7F,eAAO,MAAM,eAAe,gCAAuD,CAAC;AAEpF,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB;IACvD,IAAI,iCAAmB;IAEvB,GAAG,SAAuC;IAE1C,IAAI,SAAqF;IAEzF,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAGxC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAE3B,SAAS,CAAC,WAAW,EAAE,gBAAgB,CAA8B;IAErE,SAAS,CAAC,WAAW,EAAE,OAAO,CAAC;IAE/B,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,wBAA6B;IAWhC,IAAI,aAAa,IAAI,WAAW,CAM/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,IAAI,UAAU,IAAI,gBAAgB,CAEjC;IAED,aAAa,MACR,aAAa;QACd,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE;YACR,SAAS,EAAE,cAAc,CAAC;SAC3B,CAAC;QACF,SAAS,CAAC,EAAE;YACV,SAAS,EAAE,cAAc,CAAC;SAC3B,CAAC;QACF,OAAO,CAAC,EAAE;YACR,SAAS,EAAE,cAAc,CAAC;SAC3B,CAAC;QACF,MAAM,CAAC,EAAE;YACP,IAAI,EAAE,cAAc,CAAC;SACtB,CAAC;QACF,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC,KACD,IAAI,CAkBL;IAEI,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAO3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IA2BnF,wBAAwB,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IA0B5F,OAAO,CAAC,aAAa,CAEnB;CACH"}
|
|
@@ -36,7 +36,7 @@ class HippoWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
36
36
|
this.emit('connect', this._wallet);
|
|
37
37
|
}
|
|
38
38
|
else if (e.data.method === 'success') {
|
|
39
|
-
this.emit('success',
|
|
39
|
+
this.emit('success', e.data.detail);
|
|
40
40
|
}
|
|
41
41
|
else if (e.data.method === 'fail') {
|
|
42
42
|
this.emit('error', new errors_1.WalletSignAndSubmitMessageError(e.data.error));
|
|
@@ -61,7 +61,7 @@ class HippoWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
61
61
|
return {
|
|
62
62
|
publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
|
|
63
63
|
address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
|
|
64
|
-
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.
|
|
64
|
+
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
|
|
65
65
|
};
|
|
66
66
|
}
|
|
67
67
|
get connecting() {
|
|
@@ -111,7 +111,8 @@ class HippoWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
111
111
|
method: 'signTransaction',
|
|
112
112
|
payload: transaction
|
|
113
113
|
}),
|
|
114
|
-
origin: window.location.origin
|
|
114
|
+
origin: window.location.origin,
|
|
115
|
+
isPopUp: 'true'
|
|
115
116
|
}).toString();
|
|
116
117
|
const popup = window.open(`${aptosConstants_1.WEBWALLET_URL}?${request}`, 'Transaction Confirmation', 'scrollbars=no,resizable=no,status=no,location=no,toolbar=no,menubar=no,width=440,height=700');
|
|
117
118
|
if (!popup)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HippoWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/HippoWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,6DAAyD;AACzD,sDAImC;AACnC,+
|
|
1
|
+
{"version":3,"file":"HippoWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/HippoWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,24 @@
|
|
|
1
|
+
import { MaybeHexString } from 'aptos';
|
|
1
2
|
import { PendingTransaction, SubmitTransactionRequest, TransactionPayload } from 'aptos/dist/api/data-contracts';
|
|
2
3
|
import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
|
|
4
|
+
interface ConnectMartianAccount {
|
|
5
|
+
address: MaybeHexString;
|
|
6
|
+
method: string;
|
|
7
|
+
publicKey: MaybeHexString;
|
|
8
|
+
status: number;
|
|
9
|
+
}
|
|
10
|
+
interface MartianAccount {
|
|
11
|
+
address: MaybeHexString;
|
|
12
|
+
publicKey: MaybeHexString;
|
|
13
|
+
authKey: MaybeHexString;
|
|
14
|
+
isConnected: boolean;
|
|
15
|
+
}
|
|
3
16
|
interface IMartianWallet {
|
|
4
|
-
connect: (params?: any) => Promise<
|
|
5
|
-
|
|
6
|
-
isConnected
|
|
7
|
-
|
|
17
|
+
connect: (params?: any) => Promise<ConnectMartianAccount>;
|
|
18
|
+
account(): Promise<MartianAccount>;
|
|
19
|
+
isConnected(): Promise<boolean>;
|
|
20
|
+
generateTransaction(sender: MaybeHexString, payload: any): Promise<any>;
|
|
21
|
+
signAndSubmitTransaction(transaction: any): Promise<string>;
|
|
8
22
|
disconnect(): Promise<void>;
|
|
9
23
|
}
|
|
10
24
|
export declare const MartianWalletName: WalletName<"MartianWallet">;
|
|
@@ -20,7 +34,7 @@ export declare class MartianWalletAdapter extends BaseWalletAdapter {
|
|
|
20
34
|
protected _timeout: number;
|
|
21
35
|
protected _readyState: WalletReadyState;
|
|
22
36
|
protected _connecting: boolean;
|
|
23
|
-
protected _wallet:
|
|
37
|
+
protected _wallet: MartianAccount | null;
|
|
24
38
|
constructor({ timeout }?: MartianWalletAdapterConfig);
|
|
25
39
|
get publicAccount(): AccountKeys;
|
|
26
40
|
get connecting(): boolean;
|
|
@@ -28,8 +42,8 @@ export declare class MartianWalletAdapter extends BaseWalletAdapter {
|
|
|
28
42
|
get readyState(): WalletReadyState;
|
|
29
43
|
connect(): Promise<void>;
|
|
30
44
|
disconnect(): Promise<void>;
|
|
31
|
-
signTransaction(
|
|
32
|
-
signAndSubmitTransaction(
|
|
45
|
+
signTransaction(transactionPyld: TransactionPayload): Promise<SubmitTransactionRequest>;
|
|
46
|
+
signAndSubmitTransaction(transactionPyld: TransactionPayload): Promise<PendingTransaction>;
|
|
33
47
|
}
|
|
34
48
|
export {};
|
|
35
49
|
//# sourceMappingURL=MartianWallet.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MartianWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdapters/MartianWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,
|
|
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,EACL,kBAAkB,EAClB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAQvC,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,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC1D,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;IACxE,wBAAwB,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE5D,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B;AAQD,eAAO,MAAM,iBAAiB,6BAAiD,CAAC;AAEhF,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,cAAc,CAAC;IAE1B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,oBAAqB,SAAQ,iBAAiB;IACzD,IAAI,8BAAqB;IAEzB,GAAG,SAA+F;IAElG,IAAI,SAC4U;IAEhV,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;IA6CxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB3B,eAAe,CAAC,eAAe,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IAoBvF,wBAAwB,CAAC,eAAe,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAmBjG"}
|
|
@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.MartianWalletAdapter = exports.MartianWalletName = void 0;
|
|
13
|
+
const aptosConstants_1 = require("../config/aptosConstants");
|
|
13
14
|
const errors_1 = require("../WalletProviders/errors");
|
|
14
15
|
const BaseAdapter_1 = require("./BaseAdapter");
|
|
15
16
|
exports.MartianWalletName = 'MartianWallet';
|
|
@@ -46,7 +47,7 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
46
47
|
return {
|
|
47
48
|
publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
|
|
48
49
|
address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
|
|
49
|
-
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.
|
|
50
|
+
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
|
|
50
51
|
};
|
|
51
52
|
}
|
|
52
53
|
get connecting() {
|
|
@@ -73,28 +74,20 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
73
74
|
// console.log(3);
|
|
74
75
|
this._connecting = true;
|
|
75
76
|
const provider = window.martian;
|
|
77
|
+
yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
|
|
76
78
|
// console.log(4);
|
|
77
|
-
const
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
// console.log(6);
|
|
82
|
-
try {
|
|
83
|
-
resolve(respAddress.address);
|
|
84
|
-
}
|
|
85
|
-
catch (err) {
|
|
86
|
-
reject(err);
|
|
87
|
-
}
|
|
88
|
-
// 0xc4265dc8a5d90715f8a60bebf16688819427bca928a537ad35f798d4d1267716
|
|
89
|
-
});
|
|
90
|
-
});
|
|
91
|
-
// console.log(7, loggedInAddress, window.martian?.address);
|
|
92
|
-
if (loggedInAddress === ((_a = window.martian) === null || _a === void 0 ? void 0 : _a.address)) {
|
|
93
|
-
// console.log(8);
|
|
94
|
-
this._wallet = window.martian;
|
|
79
|
+
const response = yield (provider === null || provider === void 0 ? void 0 : provider.connect());
|
|
80
|
+
// console.log(5, response);
|
|
81
|
+
if (!response) {
|
|
82
|
+
throw new errors_1.WalletNotConnectedError('No connect response');
|
|
95
83
|
}
|
|
96
|
-
|
|
97
|
-
|
|
84
|
+
const walletAccount = yield (provider === null || provider === void 0 ? void 0 : provider.account());
|
|
85
|
+
if (walletAccount) {
|
|
86
|
+
this._wallet = Object.assign(Object.assign({}, walletAccount), { isConnected: true });
|
|
87
|
+
// console.log(6, this._wallet);
|
|
88
|
+
}
|
|
89
|
+
// console.log(9, this._wallet?.address);
|
|
90
|
+
this.emit('connect', ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.address) || '');
|
|
98
91
|
}
|
|
99
92
|
catch (error) {
|
|
100
93
|
// console.log(10, error);
|
|
@@ -110,21 +103,11 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
110
103
|
disconnect() {
|
|
111
104
|
return __awaiter(this, void 0, void 0, function* () {
|
|
112
105
|
const wallet = this._wallet;
|
|
106
|
+
const provider = this._provider;
|
|
113
107
|
if (wallet) {
|
|
114
108
|
this._wallet = null;
|
|
115
109
|
try {
|
|
116
|
-
yield
|
|
117
|
-
const timeout = setTimeout(() => resolve(), 250);
|
|
118
|
-
try {
|
|
119
|
-
wallet.disconnect(() => {
|
|
120
|
-
clearTimeout(timeout);
|
|
121
|
-
resolve();
|
|
122
|
-
});
|
|
123
|
-
}
|
|
124
|
-
catch (err) {
|
|
125
|
-
reject(err);
|
|
126
|
-
}
|
|
127
|
-
});
|
|
110
|
+
yield (provider === null || provider === void 0 ? void 0 : provider.disconnect());
|
|
128
111
|
}
|
|
129
112
|
catch (error) {
|
|
130
113
|
this.emit('error', new errors_1.WalletDisconnectionError(error === null || error === void 0 ? void 0 : error.message, error));
|
|
@@ -133,30 +116,21 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
133
116
|
this.emit('disconnect');
|
|
134
117
|
});
|
|
135
118
|
}
|
|
136
|
-
signTransaction(
|
|
119
|
+
signTransaction(transactionPyld) {
|
|
137
120
|
return __awaiter(this, void 0, void 0, function* () {
|
|
138
121
|
try {
|
|
139
122
|
const wallet = this._wallet;
|
|
123
|
+
const provider = this._provider;
|
|
140
124
|
if (!wallet)
|
|
141
125
|
throw new errors_1.WalletNotConnectedError();
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
if (resp.status === 200) {
|
|
147
|
-
// console.log('Transaction is Signed successfully.');
|
|
148
|
-
resolve(resp);
|
|
149
|
-
}
|
|
150
|
-
else {
|
|
151
|
-
reject(resp.message);
|
|
152
|
-
}
|
|
153
|
-
});
|
|
154
|
-
});
|
|
155
|
-
return response;
|
|
156
|
-
}
|
|
157
|
-
catch (error) {
|
|
158
|
-
throw new errors_1.WalletSignTransactionError(error === null || error === void 0 ? void 0 : error.message, error);
|
|
126
|
+
const tx = yield aptosConstants_1.aptosClient.generateTransaction(wallet.address || '', transactionPyld);
|
|
127
|
+
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(tx));
|
|
128
|
+
if (!response) {
|
|
129
|
+
throw new errors_1.WalletSignTransactionError('No response');
|
|
159
130
|
}
|
|
131
|
+
return {
|
|
132
|
+
hash: response
|
|
133
|
+
};
|
|
160
134
|
}
|
|
161
135
|
catch (error) {
|
|
162
136
|
this.emit('error', error);
|
|
@@ -164,34 +138,21 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
164
138
|
}
|
|
165
139
|
});
|
|
166
140
|
}
|
|
167
|
-
signAndSubmitTransaction(
|
|
141
|
+
signAndSubmitTransaction(transactionPyld) {
|
|
168
142
|
return __awaiter(this, void 0, void 0, function* () {
|
|
169
143
|
try {
|
|
170
144
|
const wallet = this._wallet;
|
|
145
|
+
const provider = this._provider;
|
|
171
146
|
if (!wallet)
|
|
172
147
|
throw new errors_1.WalletNotConnectedError();
|
|
173
|
-
const
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
// const args = [...transaction.type_arguments, transaction.arguments[0] / 1000];
|
|
178
|
-
// console.log('trans 2', wallet, transaction);
|
|
179
|
-
wallet.signGenericTransaction(transaction.function, transaction.arguments, transaction.type_arguments, (resp) => {
|
|
180
|
-
console.log('signTransaction', resp);
|
|
181
|
-
if (resp.status === 200) {
|
|
182
|
-
// console.log('Transaction is Signed successfully.');
|
|
183
|
-
resolve(resp);
|
|
184
|
-
}
|
|
185
|
-
else {
|
|
186
|
-
reject(resp.message);
|
|
187
|
-
}
|
|
188
|
-
});
|
|
189
|
-
});
|
|
190
|
-
return response;
|
|
191
|
-
}
|
|
192
|
-
catch (error) {
|
|
193
|
-
throw new errors_1.WalletSignTransactionError(error);
|
|
148
|
+
const tx = yield (provider === null || provider === void 0 ? void 0 : provider.generateTransaction(wallet.address || '', transactionPyld));
|
|
149
|
+
const response = yield (provider === null || provider === void 0 ? void 0 : provider.signAndSubmitTransaction(tx));
|
|
150
|
+
if (!response) {
|
|
151
|
+
throw new errors_1.WalletSignTransactionError('No response');
|
|
194
152
|
}
|
|
153
|
+
return {
|
|
154
|
+
hash: response
|
|
155
|
+
};
|
|
195
156
|
}
|
|
196
157
|
catch (error) {
|
|
197
158
|
this.emit('error', error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MartianWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/MartianWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,sDAKmC;AACnC,+
|
|
1
|
+
{"version":3,"file":"MartianWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/MartianWallet.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ class MultiMaskWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
46
46
|
return {
|
|
47
47
|
publicKey: ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.publicKey) || null,
|
|
48
48
|
address: ((_b = this._wallet) === null || _b === void 0 ? void 0 : _b.address) || null,
|
|
49
|
-
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.
|
|
49
|
+
authKey: ((_c = this._wallet) === null || _c === void 0 ? void 0 : _c.authKey) || null
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
get connecting() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiMaskWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/MultiMaskWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,sDAKmC;AACnC,+CAOuB;AAqBV,QAAA,mBAAmB,GAAG,iBAAkD,CAAC;AAQtF,MAAa,sBAAuB,SAAQ,+BAAiB;IAqB3D,YAAY;IACV,YAAY;IACZ,0CAA0C;IAC1C,OAAO,GAAG,KAAK,KACiB,EAAE;QAClC,KAAK,EAAE,CAAC;QAzBV,SAAI,GAAG,2BAAmB,CAAC;QAE3B,QAAG,GAAG,mEAAmE,CAAC;QAE1E,SAAI,GAAG,yDAAyD,CAAC;QAOvD,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,MAAM,CAAC,SAAS,CAAC;QAClC,2BAA2B;QAC3B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,IAAI,IAAI,CAAC,WAAW,KAAK,8BAAgB,CAAC,WAAW,EAAE;YACrD,IAAA,2CAA6B,EAAC,GAAG,EAAE;gBACjC,IAAI,IAAI,CAAC,SAAS,EAAE;oBAClB,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,
|
|
1
|
+
{"version":3,"file":"MultiMaskWallet.js","sourceRoot":"","sources":["../../src/WalletAdapters/MultiMaskWallet.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@manahippo/aptos-wallet-adapter",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.17",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"typings": "dist/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -15,20 +15,20 @@
|
|
|
15
15
|
"react-dom": "^18.1.0"
|
|
16
16
|
},
|
|
17
17
|
"devDependencies": {
|
|
18
|
-
"@types/jest": "^27.0.1",
|
|
19
|
-
"@types/node": "^16.7.13",
|
|
20
|
-
"@types/react": "^18.0.0",
|
|
21
|
-
"aptos": "^1.2.0",
|
|
22
18
|
"eslint-config-airbnb-typescript": "^17.0.0",
|
|
23
19
|
"eslint-config-prettier": "^8.5.0",
|
|
24
20
|
"eslint-plugin-prettier": "^4.2.1",
|
|
25
21
|
"eslint-plugin-react": "^7.30.1",
|
|
26
22
|
"eslint-plugin-react-hooks": "^4.6.0",
|
|
27
|
-
"
|
|
28
|
-
"prettier": "^2.7.1",
|
|
29
|
-
"typescript": "^4.7.4"
|
|
23
|
+
"prettier": "^2.7.1"
|
|
30
24
|
},
|
|
31
25
|
"dependencies": {
|
|
32
|
-
"@fewcha/web3": "^0.1.
|
|
26
|
+
"@fewcha/web3": "^0.1.6",
|
|
27
|
+
"@types/jest": "^27.0.1",
|
|
28
|
+
"@types/node": "^16.7.13",
|
|
29
|
+
"@types/react": "^18.0.0",
|
|
30
|
+
"aptos": "1.2.0",
|
|
31
|
+
"eventemitter3": "^4.0.7",
|
|
32
|
+
"typescript": "^4.4.2"
|
|
33
33
|
}
|
|
34
34
|
}
|
|
@@ -11,10 +11,7 @@ import {
|
|
|
11
11
|
} from '../WalletProviders/errors';
|
|
12
12
|
import {
|
|
13
13
|
AccountKeys,
|
|
14
|
-
Address,
|
|
15
|
-
AuthKey,
|
|
16
14
|
BaseWalletAdapter,
|
|
17
|
-
PublicKey,
|
|
18
15
|
scopePollingDetectionStrategy,
|
|
19
16
|
WalletName,
|
|
20
17
|
WalletReadyState
|
|
@@ -94,7 +91,7 @@ export class AptosWalletAdapter extends BaseWalletAdapter {
|
|
|
94
91
|
return {
|
|
95
92
|
publicKey: this._wallet?.publicKey || null,
|
|
96
93
|
address: this._wallet?.address || null,
|
|
97
|
-
authKey: this._wallet?.
|
|
94
|
+
authKey: this._wallet?.authKey || null
|
|
98
95
|
};
|
|
99
96
|
}
|
|
100
97
|
|
|
@@ -14,7 +14,6 @@ import Web3, { Web3Provider, Web3ProviderType } from '@fewcha/web3';
|
|
|
14
14
|
import {
|
|
15
15
|
AccountKeys,
|
|
16
16
|
BaseWalletAdapter,
|
|
17
|
-
PublicKey,
|
|
18
17
|
scopePollingDetectionStrategy,
|
|
19
18
|
WalletName,
|
|
20
19
|
WalletReadyState
|
|
@@ -22,8 +21,13 @@ import {
|
|
|
22
21
|
|
|
23
22
|
export const FewchaWalletName = 'Fewcha Wallet' as WalletName<'Fewcha Wallet'>;
|
|
24
23
|
|
|
25
|
-
|
|
26
|
-
|
|
24
|
+
interface FewchaWindow extends Window {
|
|
25
|
+
fewcha: Web3ProviderType;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
declare const window: FewchaWindow;
|
|
29
|
+
|
|
30
|
+
const defaultWeb3 = new Web3(new Web3Provider(window.fewcha));
|
|
27
31
|
|
|
28
32
|
export interface FewchaAdapterConfig {
|
|
29
33
|
provider?: string;
|
|
@@ -65,12 +69,7 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
|
65
69
|
|
|
66
70
|
if (this._readyState !== WalletReadyState.Unsupported) {
|
|
67
71
|
scopePollingDetectionStrategy(() => {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
if (wallet) {
|
|
71
|
-
const provider = new Web3Provider(wallet);
|
|
72
|
-
const web3 = new Web3(provider);
|
|
73
|
-
this._provider = web3.action;
|
|
72
|
+
if (window.fewcha) {
|
|
74
73
|
this._readyState = WalletReadyState.Installed;
|
|
75
74
|
this.emit('readyStateChange', this._readyState);
|
|
76
75
|
return true;
|
|
@@ -82,18 +81,19 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
|
82
81
|
window.addEventListener('aptos#connected', async () => {
|
|
83
82
|
const publicAccount = await this._provider?.account();
|
|
84
83
|
const isConnected = await this._provider?.isConnected();
|
|
85
|
-
|
|
86
|
-
if (publicAccount?.publicKey && isConnected) {
|
|
84
|
+
if (publicAccount?.data.publicKey && isConnected) {
|
|
87
85
|
this._wallet = {
|
|
88
86
|
connected: isConnected,
|
|
89
|
-
...publicAccount
|
|
87
|
+
...publicAccount.data
|
|
90
88
|
};
|
|
91
89
|
this.emit('connect', this._wallet.publicKey);
|
|
92
90
|
}
|
|
93
91
|
});
|
|
94
92
|
|
|
95
|
-
window.addEventListener('aptos#transaction', (e) => {
|
|
96
|
-
|
|
93
|
+
window.addEventListener('aptos#transaction', (e: any) => {
|
|
94
|
+
if (e?.detail?.tx) {
|
|
95
|
+
this.emit('success', e?.detail?.tx);
|
|
96
|
+
}
|
|
97
97
|
});
|
|
98
98
|
|
|
99
99
|
window.addEventListener('aptos#disconnected', () => {
|
|
@@ -105,7 +105,7 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
|
105
105
|
return {
|
|
106
106
|
publicKey: this._wallet?.publicKey || null,
|
|
107
107
|
address: this._wallet?.address || null,
|
|
108
|
-
authKey: this._wallet?.
|
|
108
|
+
authKey: this._wallet?.authKey || null
|
|
109
109
|
};
|
|
110
110
|
}
|
|
111
111
|
|
|
@@ -134,6 +134,10 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
|
134
134
|
|
|
135
135
|
this._connecting = true;
|
|
136
136
|
const provider = this._provider;
|
|
137
|
+
const isConnected = await this._provider?.isConnected();
|
|
138
|
+
if (isConnected) {
|
|
139
|
+
await provider?.disconnect();
|
|
140
|
+
}
|
|
137
141
|
await provider?.connect();
|
|
138
142
|
} catch (error: any) {
|
|
139
143
|
this.emit('error', error);
|
|
@@ -197,7 +201,9 @@ export class FewchaWalletAdapter extends BaseWalletAdapter {
|
|
|
197
201
|
this.once('success', resolve);
|
|
198
202
|
this.once('error', reject);
|
|
199
203
|
});
|
|
200
|
-
return
|
|
204
|
+
return {
|
|
205
|
+
hash: promise
|
|
206
|
+
} as PendingTransaction;
|
|
201
207
|
} catch (error: any) {
|
|
202
208
|
const errMsg = error instanceof Error ? error.message : error.response.data.message;
|
|
203
209
|
throw new WalletSignTransactionError(errMsg);
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { MaybeHexString } from 'aptos';
|
|
1
2
|
import {
|
|
2
3
|
PendingTransaction,
|
|
3
4
|
SubmitTransactionRequest,
|
|
@@ -12,17 +13,20 @@ import {
|
|
|
12
13
|
import {
|
|
13
14
|
AccountKeys,
|
|
14
15
|
BaseWalletAdapter,
|
|
15
|
-
PublicKey,
|
|
16
16
|
scopePollingDetectionStrategy,
|
|
17
17
|
WalletName,
|
|
18
18
|
WalletReadyState
|
|
19
19
|
} from './BaseAdapter';
|
|
20
20
|
|
|
21
21
|
interface IHippoWallet {
|
|
22
|
-
connect: () => Promise<{
|
|
22
|
+
connect: () => Promise<{
|
|
23
|
+
address: MaybeHexString;
|
|
24
|
+
publicKey: MaybeHexString;
|
|
25
|
+
authKey: MaybeHexString;
|
|
26
|
+
}>;
|
|
23
27
|
account: () => Promise<string>;
|
|
24
28
|
isConnected: () => Promise<boolean>;
|
|
25
|
-
signAndSubmitTransaction(transaction: any): Promise<
|
|
29
|
+
signAndSubmitTransaction(transaction: any): Promise<any>;
|
|
26
30
|
signTransaction(transaction: any): Promise<void>;
|
|
27
31
|
disconnect(): Promise<void>;
|
|
28
32
|
}
|
|
@@ -33,8 +37,7 @@ interface HippoWindow extends Window {
|
|
|
33
37
|
|
|
34
38
|
declare const window: HippoWindow;
|
|
35
39
|
|
|
36
|
-
export const HippoExtensionWalletName =
|
|
37
|
-
'Hippo Wallet' as WalletName<'Hippo Wallet'>;
|
|
40
|
+
export const HippoExtensionWalletName = 'Hippo Wallet' as WalletName<'Hippo Wallet'>;
|
|
38
41
|
|
|
39
42
|
export interface HippoExtensionWalletAdapterConfig {
|
|
40
43
|
provider?: IHippoWallet;
|
|
@@ -45,7 +48,7 @@ export interface HippoExtensionWalletAdapterConfig {
|
|
|
45
48
|
export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
|
|
46
49
|
name = HippoExtensionWalletName;
|
|
47
50
|
|
|
48
|
-
url = 'https://hippo-wallet
|
|
51
|
+
url = 'https://github.com/hippospace/hippo-wallet';
|
|
49
52
|
|
|
50
53
|
icon = 'https://ui-test1-22e7c.web.app/static/media/hippo_logo.ecded6bf411652de9b7f.png';
|
|
51
54
|
|
|
@@ -92,7 +95,7 @@ export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
|
|
|
92
95
|
return {
|
|
93
96
|
publicKey: this._wallet?.publicKey || null,
|
|
94
97
|
address: this._wallet?.address || null,
|
|
95
|
-
authKey: this._wallet?.
|
|
98
|
+
authKey: this._wallet?.authKey || null
|
|
96
99
|
};
|
|
97
100
|
}
|
|
98
101
|
|
|
@@ -124,7 +127,7 @@ export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
|
|
|
124
127
|
const response = await provider?.connect();
|
|
125
128
|
|
|
126
129
|
this._wallet = {
|
|
127
|
-
|
|
130
|
+
...response,
|
|
128
131
|
isConnected: true
|
|
129
132
|
};
|
|
130
133
|
|
|
@@ -184,12 +187,13 @@ export class HippoExtensionWalletAdapter extends BaseWalletAdapter {
|
|
|
184
187
|
const provider = this._provider || window.hippoWallet;
|
|
185
188
|
const response = await provider?.signAndSubmitTransaction(transaction);
|
|
186
189
|
if (response) {
|
|
187
|
-
return response;
|
|
190
|
+
return response.detail;
|
|
188
191
|
} else {
|
|
189
192
|
throw new Error('Transaction failed');
|
|
190
193
|
}
|
|
191
194
|
} catch (error: any) {
|
|
192
|
-
|
|
195
|
+
// console.log('transact err', error, error.message);
|
|
196
|
+
throw new WalletSignTransactionError(error.message || error);
|
|
193
197
|
}
|
|
194
198
|
} catch (error: any) {
|
|
195
199
|
this.emit('error', error);
|
|
@@ -10,13 +10,7 @@ import {
|
|
|
10
10
|
WalletNotReadyError,
|
|
11
11
|
WalletSignAndSubmitMessageError
|
|
12
12
|
} from '../WalletProviders/errors';
|
|
13
|
-
import {
|
|
14
|
-
AccountKeys,
|
|
15
|
-
BaseWalletAdapter,
|
|
16
|
-
PublicKey,
|
|
17
|
-
WalletName,
|
|
18
|
-
WalletReadyState
|
|
19
|
-
} from './BaseAdapter';
|
|
13
|
+
import { AccountKeys, BaseWalletAdapter, WalletName, WalletReadyState } from './BaseAdapter';
|
|
20
14
|
|
|
21
15
|
export const HippoWalletName = 'Hippo Web Wallet' as WalletName<'Hippo Web Wallet'>;
|
|
22
16
|
|
|
@@ -63,7 +57,7 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
|
|
|
63
57
|
return {
|
|
64
58
|
publicKey: this._wallet?.publicKey || null,
|
|
65
59
|
address: this._wallet?.address || null,
|
|
66
|
-
authKey: this._wallet?.
|
|
60
|
+
authKey: this._wallet?.authKey || null
|
|
67
61
|
};
|
|
68
62
|
}
|
|
69
63
|
|
|
@@ -92,6 +86,9 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
|
|
|
92
86
|
authKey?: {
|
|
93
87
|
hexString: MaybeHexString;
|
|
94
88
|
};
|
|
89
|
+
detail?: {
|
|
90
|
+
hash: MaybeHexString;
|
|
91
|
+
};
|
|
95
92
|
error?: string;
|
|
96
93
|
}>
|
|
97
94
|
): void => {
|
|
@@ -105,7 +102,7 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
|
|
|
105
102
|
};
|
|
106
103
|
this.emit('connect', this._wallet);
|
|
107
104
|
} else if (e.data.method === 'success') {
|
|
108
|
-
this.emit('success',
|
|
105
|
+
this.emit('success', e.data.detail);
|
|
109
106
|
} else if (e.data.method === 'fail') {
|
|
110
107
|
this.emit('error', new WalletSignAndSubmitMessageError(e.data.error));
|
|
111
108
|
} else if (e.data.method === 'disconnected') {
|
|
@@ -151,7 +148,8 @@ export class HippoWalletAdapter extends BaseWalletAdapter {
|
|
|
151
148
|
method: 'signTransaction',
|
|
152
149
|
payload: transaction
|
|
153
150
|
}),
|
|
154
|
-
origin: window.location.origin
|
|
151
|
+
origin: window.location.origin,
|
|
152
|
+
isPopUp: 'true'
|
|
155
153
|
}).toString();
|
|
156
154
|
const popup = window.open(
|
|
157
155
|
`${WEBWALLET_URL}?${request}`,
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import { MaybeHexString } from 'aptos';
|
|
1
2
|
import {
|
|
2
3
|
PendingTransaction,
|
|
3
|
-
ScriptFunctionPayload,
|
|
4
4
|
SubmitTransactionRequest,
|
|
5
5
|
TransactionPayload
|
|
6
6
|
} from 'aptos/dist/api/data-contracts';
|
|
7
|
+
import { aptosClient } from '../config/aptosConstants';
|
|
7
8
|
import {
|
|
8
9
|
WalletDisconnectionError,
|
|
9
10
|
WalletNotConnectedError,
|
|
@@ -13,17 +14,30 @@ import {
|
|
|
13
14
|
import {
|
|
14
15
|
AccountKeys,
|
|
15
16
|
BaseWalletAdapter,
|
|
16
|
-
PublicKey,
|
|
17
17
|
scopePollingDetectionStrategy,
|
|
18
18
|
WalletName,
|
|
19
19
|
WalletReadyState
|
|
20
20
|
} from './BaseAdapter';
|
|
21
21
|
|
|
22
|
+
interface ConnectMartianAccount {
|
|
23
|
+
address: MaybeHexString;
|
|
24
|
+
method: string;
|
|
25
|
+
publicKey: MaybeHexString;
|
|
26
|
+
status: number;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
interface MartianAccount {
|
|
30
|
+
address: MaybeHexString;
|
|
31
|
+
publicKey: MaybeHexString;
|
|
32
|
+
authKey: MaybeHexString;
|
|
33
|
+
isConnected: boolean;
|
|
34
|
+
}
|
|
22
35
|
interface IMartianWallet {
|
|
23
|
-
connect: (params?: any) => Promise<
|
|
24
|
-
|
|
25
|
-
isConnected
|
|
26
|
-
|
|
36
|
+
connect: (params?: any) => Promise<ConnectMartianAccount>;
|
|
37
|
+
account(): Promise<MartianAccount>;
|
|
38
|
+
isConnected(): Promise<boolean>;
|
|
39
|
+
generateTransaction(sender: MaybeHexString, payload: any): Promise<any>;
|
|
40
|
+
signAndSubmitTransaction(transaction: any): Promise<string>;
|
|
27
41
|
// signTransaction(transaction: any): Promise<void>;
|
|
28
42
|
disconnect(): Promise<void>;
|
|
29
43
|
}
|
|
@@ -62,7 +76,7 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
|
62
76
|
|
|
63
77
|
protected _connecting: boolean;
|
|
64
78
|
|
|
65
|
-
protected _wallet:
|
|
79
|
+
protected _wallet: MartianAccount | null;
|
|
66
80
|
|
|
67
81
|
constructor({
|
|
68
82
|
// provider,
|
|
@@ -93,7 +107,7 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
|
93
107
|
return {
|
|
94
108
|
publicKey: this._wallet?.publicKey || null,
|
|
95
109
|
address: this._wallet?.address || null,
|
|
96
|
-
authKey: this._wallet?.
|
|
110
|
+
authKey: this._wallet?.authKey || null
|
|
97
111
|
};
|
|
98
112
|
}
|
|
99
113
|
|
|
@@ -125,27 +139,25 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
|
125
139
|
this._connecting = true;
|
|
126
140
|
|
|
127
141
|
const provider = window.martian;
|
|
142
|
+
await provider?.disconnect();
|
|
128
143
|
// console.log(4);
|
|
129
|
-
const
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
try {
|
|
135
|
-
resolve(respAddress.address);
|
|
136
|
-
} catch (err) {
|
|
137
|
-
reject(err);
|
|
138
|
-
}
|
|
139
|
-
// 0xc4265dc8a5d90715f8a60bebf16688819427bca928a537ad35f798d4d1267716
|
|
140
|
-
});
|
|
141
|
-
});
|
|
142
|
-
// console.log(7, loggedInAddress, window.martian?.address);
|
|
143
|
-
if (loggedInAddress === window.martian?.address) {
|
|
144
|
-
// console.log(8);
|
|
145
|
-
this._wallet = window.martian;
|
|
144
|
+
const response = await provider?.connect();
|
|
145
|
+
// console.log(5, response);
|
|
146
|
+
|
|
147
|
+
if (!response) {
|
|
148
|
+
throw new WalletNotConnectedError('No connect response');
|
|
146
149
|
}
|
|
147
|
-
|
|
148
|
-
|
|
150
|
+
|
|
151
|
+
const walletAccount = await provider?.account();
|
|
152
|
+
if (walletAccount) {
|
|
153
|
+
this._wallet = {
|
|
154
|
+
...walletAccount,
|
|
155
|
+
isConnected: true
|
|
156
|
+
};
|
|
157
|
+
// console.log(6, this._wallet);
|
|
158
|
+
}
|
|
159
|
+
// console.log(9, this._wallet?.address);
|
|
160
|
+
this.emit('connect', this._wallet?.address || '');
|
|
149
161
|
} catch (error: any) {
|
|
150
162
|
// console.log(10, error);
|
|
151
163
|
this.emit('error', error);
|
|
@@ -158,22 +170,12 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
|
158
170
|
|
|
159
171
|
async disconnect(): Promise<void> {
|
|
160
172
|
const wallet = this._wallet;
|
|
173
|
+
const provider = this._provider;
|
|
161
174
|
if (wallet) {
|
|
162
175
|
this._wallet = null;
|
|
163
176
|
|
|
164
177
|
try {
|
|
165
|
-
await
|
|
166
|
-
const timeout = setTimeout(() => resolve(), 250);
|
|
167
|
-
|
|
168
|
-
try {
|
|
169
|
-
wallet.disconnect(() => {
|
|
170
|
-
clearTimeout(timeout);
|
|
171
|
-
resolve();
|
|
172
|
-
});
|
|
173
|
-
} catch (err) {
|
|
174
|
-
reject(err);
|
|
175
|
-
}
|
|
176
|
-
});
|
|
178
|
+
await provider?.disconnect();
|
|
177
179
|
} catch (error: any) {
|
|
178
180
|
this.emit('error', new WalletDisconnectionError(error?.message, error));
|
|
179
181
|
}
|
|
@@ -182,63 +184,40 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
|
182
184
|
this.emit('disconnect');
|
|
183
185
|
}
|
|
184
186
|
|
|
185
|
-
async signTransaction(
|
|
187
|
+
async signTransaction(transactionPyld: TransactionPayload): Promise<SubmitTransactionRequest> {
|
|
186
188
|
try {
|
|
187
189
|
const wallet = this._wallet;
|
|
190
|
+
const provider = this._provider;
|
|
188
191
|
if (!wallet) throw new WalletNotConnectedError();
|
|
192
|
+
const tx = await aptosClient.generateTransaction(wallet.address || '', transactionPyld);
|
|
193
|
+
const response = await provider?.signAndSubmitTransaction(tx);
|
|
189
194
|
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
wallet.signGenericTransaction(transaction, (resp: any) => {
|
|
193
|
-
// console.log('signTransaction', resp);
|
|
194
|
-
if (resp.status === 200) {
|
|
195
|
-
// console.log('Transaction is Signed successfully.');
|
|
196
|
-
resolve(resp);
|
|
197
|
-
} else {
|
|
198
|
-
reject(resp.message);
|
|
199
|
-
}
|
|
200
|
-
});
|
|
201
|
-
});
|
|
202
|
-
return response;
|
|
203
|
-
} catch (error: any) {
|
|
204
|
-
throw new WalletSignTransactionError(error?.message, error);
|
|
195
|
+
if (!response) {
|
|
196
|
+
throw new WalletSignTransactionError('No response');
|
|
205
197
|
}
|
|
198
|
+
return {
|
|
199
|
+
hash: response
|
|
200
|
+
} as PendingTransaction;
|
|
206
201
|
} catch (error: any) {
|
|
207
202
|
this.emit('error', error);
|
|
208
203
|
throw error;
|
|
209
204
|
}
|
|
210
205
|
}
|
|
211
206
|
|
|
212
|
-
async signAndSubmitTransaction(
|
|
207
|
+
async signAndSubmitTransaction(transactionPyld: TransactionPayload): Promise<PendingTransaction> {
|
|
213
208
|
try {
|
|
214
209
|
const wallet = this._wallet;
|
|
210
|
+
const provider = this._provider;
|
|
215
211
|
if (!wallet) throw new WalletNotConnectedError();
|
|
216
|
-
const
|
|
212
|
+
const tx = await provider?.generateTransaction(wallet.address || '', transactionPyld);
|
|
213
|
+
const response = await provider?.signAndSubmitTransaction(tx);
|
|
217
214
|
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
const response = await new Promise<PendingTransaction>((resolve, reject) => {
|
|
221
|
-
// const args = [...transaction.type_arguments, transaction.arguments[0] / 1000];
|
|
222
|
-
// console.log('trans 2', wallet, transaction);
|
|
223
|
-
wallet.signGenericTransaction(
|
|
224
|
-
transaction.function,
|
|
225
|
-
transaction.arguments,
|
|
226
|
-
transaction.type_arguments,
|
|
227
|
-
(resp: any) => {
|
|
228
|
-
console.log('signTransaction', resp);
|
|
229
|
-
if (resp.status === 200) {
|
|
230
|
-
// console.log('Transaction is Signed successfully.');
|
|
231
|
-
resolve(resp);
|
|
232
|
-
} else {
|
|
233
|
-
reject(resp.message);
|
|
234
|
-
}
|
|
235
|
-
}
|
|
236
|
-
);
|
|
237
|
-
});
|
|
238
|
-
return response;
|
|
239
|
-
} catch (error: any) {
|
|
240
|
-
throw new WalletSignTransactionError(error);
|
|
215
|
+
if (!response) {
|
|
216
|
+
throw new WalletSignTransactionError('No response');
|
|
241
217
|
}
|
|
218
|
+
return {
|
|
219
|
+
hash: response
|
|
220
|
+
} as PendingTransaction;
|
|
242
221
|
} catch (error: any) {
|
|
243
222
|
this.emit('error', error);
|
|
244
223
|
throw error;
|
|
@@ -96,7 +96,7 @@ export class MultiMaskWalletAdapter extends BaseWalletAdapter {
|
|
|
96
96
|
return {
|
|
97
97
|
publicKey: this._wallet?.publicKey || null,
|
|
98
98
|
address: this._wallet?.address || null,
|
|
99
|
-
authKey: this._wallet?.
|
|
99
|
+
authKey: this._wallet?.authKey || null
|
|
100
100
|
};
|
|
101
101
|
}
|
|
102
102
|
|