@manahippo/aptos-wallet-adapter 0.1.3 → 0.1.6
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.
|
@@ -2,7 +2,7 @@ import { PendingTransaction, SubmitTransactionRequest, TransactionPayload } from
|
|
|
2
2
|
import { BaseWalletAdapter, PublicKey, WalletName, WalletReadyState } from './BaseAdapter';
|
|
3
3
|
interface IMartianWallet {
|
|
4
4
|
connect: (params?: any) => Promise<any>;
|
|
5
|
-
|
|
5
|
+
address?: string;
|
|
6
6
|
isConnected?: boolean;
|
|
7
7
|
signGenericTransaction(transaction: any): Promise<void>;
|
|
8
8
|
disconnect(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MartianWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdatpers/MartianWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAElB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAOvC,OAAO,EACL,iBAAiB,EACjB,SAAS,EAET,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,cAAc;IACtB,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,
|
|
1
|
+
{"version":3,"file":"MartianWallet.d.ts","sourceRoot":"","sources":["../../src/WalletAdatpers/MartianWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAElB,wBAAwB,EACxB,kBAAkB,EACnB,MAAM,+BAA+B,CAAC;AAOvC,OAAO,EACL,iBAAiB,EACjB,SAAS,EAET,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAEvB,UAAU,cAAc;IACtB,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,sBAAsB,CAAC,WAAW,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD,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,GAAG,GAAG,IAAI,CAAC;gBAElB,EAGV,OAAe,EAChB,GAAE,0BAA+B;IAqBlC,IAAI,SAAS,IAAI,SAAS,GAAG,IAAI,CAEhC;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;IA+CxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA0B3B,eAAe,CAAC,WAAW,EAAE,kBAAkB,GAAG,OAAO,CAAC,wBAAwB,CAAC;IA2BnF,wBAAwB,CAAC,eAAe,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;CAmCjG"}
|
|
@@ -25,14 +25,14 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
25
25
|
this._readyState = typeof window === 'undefined' || typeof document === 'undefined'
|
|
26
26
|
? BaseAdapter_1.WalletReadyState.Unsupported
|
|
27
27
|
: BaseAdapter_1.WalletReadyState.NotDetected;
|
|
28
|
-
this._provider = window.
|
|
28
|
+
this._provider = window.martian;
|
|
29
29
|
// this._network = network;
|
|
30
30
|
this._timeout = timeout;
|
|
31
31
|
this._connecting = false;
|
|
32
32
|
this._wallet = null;
|
|
33
33
|
if (this._readyState !== BaseAdapter_1.WalletReadyState.Unsupported) {
|
|
34
34
|
(0, BaseAdapter_1.scopePollingDetectionStrategy)(() => {
|
|
35
|
-
if (window.
|
|
35
|
+
if (window.martian) {
|
|
36
36
|
this._readyState = BaseAdapter_1.WalletReadyState.Installed;
|
|
37
37
|
this.emit('readyStateChange', this._readyState);
|
|
38
38
|
return true;
|
|
@@ -43,7 +43,7 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
43
43
|
}
|
|
44
44
|
get publicKey() {
|
|
45
45
|
var _a;
|
|
46
|
-
return ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.
|
|
46
|
+
return ((_a = this._wallet) === null || _a === void 0 ? void 0 : _a.address) || null;
|
|
47
47
|
}
|
|
48
48
|
get connecting() {
|
|
49
49
|
return this._connecting;
|
|
@@ -59,7 +59,7 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
59
59
|
var _a;
|
|
60
60
|
return __awaiter(this, void 0, void 0, function* () {
|
|
61
61
|
try {
|
|
62
|
-
// console.log(1);
|
|
62
|
+
// console.log(1, window.martian);
|
|
63
63
|
if (this.connected || this.connecting)
|
|
64
64
|
return;
|
|
65
65
|
// console.log(2);
|
|
@@ -68,7 +68,7 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
68
68
|
throw new errors_1.WalletNotReadyError();
|
|
69
69
|
// console.log(3);
|
|
70
70
|
this._connecting = true;
|
|
71
|
-
const provider = window.
|
|
71
|
+
const provider = window.martian;
|
|
72
72
|
// console.log(4);
|
|
73
73
|
const loggedInAddress = yield new Promise((resolve, reject) => {
|
|
74
74
|
provider === null || provider === void 0 ? void 0 : provider.disconnect();
|
|
@@ -76,7 +76,7 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
76
76
|
provider === null || provider === void 0 ? void 0 : provider.connect((respAddress) => {
|
|
77
77
|
// console.log(6);
|
|
78
78
|
try {
|
|
79
|
-
resolve(respAddress);
|
|
79
|
+
resolve(respAddress.address);
|
|
80
80
|
}
|
|
81
81
|
catch (err) {
|
|
82
82
|
reject(err);
|
|
@@ -84,13 +84,13 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
84
84
|
// 0xc4265dc8a5d90715f8a60bebf16688819427bca928a537ad35f798d4d1267716
|
|
85
85
|
});
|
|
86
86
|
});
|
|
87
|
-
// console.log(7, loggedInAddress, window.
|
|
88
|
-
if (loggedInAddress === ((_a = window.
|
|
87
|
+
// console.log(7, loggedInAddress, window.martian?.address);
|
|
88
|
+
if (loggedInAddress === ((_a = window.martian) === null || _a === void 0 ? void 0 : _a.address)) {
|
|
89
89
|
// console.log(8);
|
|
90
|
-
this._wallet = window.
|
|
90
|
+
this._wallet = window.martian;
|
|
91
91
|
}
|
|
92
92
|
// console.log(9);
|
|
93
|
-
this.emit('connect', this._wallet.
|
|
93
|
+
this.emit('connect', this._wallet.address);
|
|
94
94
|
}
|
|
95
95
|
catch (error) {
|
|
96
96
|
// console.log(10, error);
|
|
@@ -171,9 +171,9 @@ class MartianWalletAdapter extends BaseAdapter_1.BaseWalletAdapter {
|
|
|
171
171
|
// console.log('trans', 1);
|
|
172
172
|
const response = yield new Promise((resolve, reject) => {
|
|
173
173
|
// const args = [...transaction.type_arguments, transaction.arguments[0] / 1000];
|
|
174
|
-
// console.log('trans 2', wallet, transaction
|
|
175
|
-
wallet.signGenericTransaction(transaction.
|
|
176
|
-
|
|
174
|
+
// console.log('trans 2', wallet, transaction);
|
|
175
|
+
wallet.signGenericTransaction(transaction.function, transaction.arguments, transaction.type_arguments, (resp) => {
|
|
176
|
+
console.log('signTransaction', resp);
|
|
177
177
|
if (resp.status === 200) {
|
|
178
178
|
// console.log('Transaction is Signed successfully.');
|
|
179
179
|
resolve(resp);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MartianWallet.js","sourceRoot":"","sources":["../../src/WalletAdatpers/MartianWallet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,sDAKmC;AACnC,+CAMuB;AAiBV,QAAA,iBAAiB,GAAG,eAA8C,CAAC;AAQhF,MAAa,oBAAqB,SAAQ,+BAAiB;IAsBzD,YAAY;IACV,YAAY;IACZ,0CAA0C;IAC1C,OAAO,GAAG,KAAK,KACe,EAAE;QAChC,KAAK,EAAE,CAAC;QA1BV,SAAI,GAAG,yBAAiB,CAAC;QAEzB,QAAG,GAAG,2FAA2F,CAAC;QAElG,SAAI,GACF,6UAA6U,CAAC;QAOtU,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,
|
|
1
|
+
{"version":3,"file":"MartianWallet.js","sourceRoot":"","sources":["../../src/WalletAdatpers/MartianWallet.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -20,7 +20,7 @@ import {
|
|
|
20
20
|
|
|
21
21
|
interface IMartianWallet {
|
|
22
22
|
connect: (params?: any) => Promise<any>;
|
|
23
|
-
|
|
23
|
+
address?: string;
|
|
24
24
|
isConnected?: boolean;
|
|
25
25
|
signGenericTransaction(transaction: any): Promise<void>;
|
|
26
26
|
// signTransaction(transaction: any): Promise<void>;
|
|
@@ -28,7 +28,7 @@ interface IMartianWallet {
|
|
|
28
28
|
}
|
|
29
29
|
|
|
30
30
|
interface MartianWindow extends Window {
|
|
31
|
-
|
|
31
|
+
martian?: IMartianWallet;
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
declare const window: MartianWindow;
|
|
@@ -70,7 +70,7 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
|
70
70
|
}: MartianWalletAdapterConfig = {}) {
|
|
71
71
|
super();
|
|
72
72
|
|
|
73
|
-
this._provider = window.
|
|
73
|
+
this._provider = window.martian;
|
|
74
74
|
// this._network = network;
|
|
75
75
|
this._timeout = timeout;
|
|
76
76
|
this._connecting = false;
|
|
@@ -78,7 +78,7 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
|
78
78
|
|
|
79
79
|
if (this._readyState !== WalletReadyState.Unsupported) {
|
|
80
80
|
scopePollingDetectionStrategy(() => {
|
|
81
|
-
if (window.
|
|
81
|
+
if (window.martian) {
|
|
82
82
|
this._readyState = WalletReadyState.Installed;
|
|
83
83
|
this.emit('readyStateChange', this._readyState);
|
|
84
84
|
return true;
|
|
@@ -89,7 +89,7 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
|
89
89
|
}
|
|
90
90
|
|
|
91
91
|
get publicKey(): PublicKey | null {
|
|
92
|
-
return this._wallet?.
|
|
92
|
+
return this._wallet?.address || null;
|
|
93
93
|
}
|
|
94
94
|
|
|
95
95
|
get connecting(): boolean {
|
|
@@ -106,7 +106,7 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
|
106
106
|
|
|
107
107
|
async connect(): Promise<void> {
|
|
108
108
|
try {
|
|
109
|
-
// console.log(1);
|
|
109
|
+
// console.log(1, window.martian);
|
|
110
110
|
if (this.connected || this.connecting) return;
|
|
111
111
|
// console.log(2);
|
|
112
112
|
if (
|
|
@@ -119,28 +119,28 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
|
119
119
|
// console.log(3);
|
|
120
120
|
this._connecting = true;
|
|
121
121
|
|
|
122
|
-
const provider = window.
|
|
122
|
+
const provider = window.martian;
|
|
123
123
|
// console.log(4);
|
|
124
124
|
const loggedInAddress = await new Promise<string>((resolve, reject) => {
|
|
125
125
|
provider?.disconnect();
|
|
126
126
|
// console.log(5);
|
|
127
|
-
provider?.connect((respAddress: string) => {
|
|
127
|
+
provider?.connect((respAddress: { status: number; message: string; address: string }) => {
|
|
128
128
|
// console.log(6);
|
|
129
129
|
try {
|
|
130
|
-
resolve(respAddress);
|
|
130
|
+
resolve(respAddress.address);
|
|
131
131
|
} catch (err) {
|
|
132
132
|
reject(err);
|
|
133
133
|
}
|
|
134
134
|
// 0xc4265dc8a5d90715f8a60bebf16688819427bca928a537ad35f798d4d1267716
|
|
135
135
|
});
|
|
136
136
|
});
|
|
137
|
-
// console.log(7, loggedInAddress, window.
|
|
138
|
-
if (loggedInAddress === window.
|
|
137
|
+
// console.log(7, loggedInAddress, window.martian?.address);
|
|
138
|
+
if (loggedInAddress === window.martian?.address) {
|
|
139
139
|
// console.log(8);
|
|
140
|
-
this._wallet = window.
|
|
140
|
+
this._wallet = window.martian;
|
|
141
141
|
}
|
|
142
142
|
// console.log(9);
|
|
143
|
-
this.emit('connect', this._wallet.
|
|
143
|
+
this.emit('connect', this._wallet.address);
|
|
144
144
|
} catch (error: any) {
|
|
145
145
|
// console.log(10, error);
|
|
146
146
|
this.emit('error', error);
|
|
@@ -214,16 +214,21 @@ export class MartianWalletAdapter extends BaseWalletAdapter {
|
|
|
214
214
|
// console.log('trans', 1);
|
|
215
215
|
const response = await new Promise<PendingTransaction>((resolve, reject) => {
|
|
216
216
|
// const args = [...transaction.type_arguments, transaction.arguments[0] / 1000];
|
|
217
|
-
// console.log('trans 2', wallet, transaction
|
|
218
|
-
wallet.signGenericTransaction(
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
217
|
+
// console.log('trans 2', wallet, transaction);
|
|
218
|
+
wallet.signGenericTransaction(
|
|
219
|
+
transaction.function,
|
|
220
|
+
transaction.arguments,
|
|
221
|
+
transaction.type_arguments,
|
|
222
|
+
(resp: any) => {
|
|
223
|
+
console.log('signTransaction', resp);
|
|
224
|
+
if (resp.status === 200) {
|
|
225
|
+
// console.log('Transaction is Signed successfully.');
|
|
226
|
+
resolve(resp);
|
|
227
|
+
} else {
|
|
228
|
+
reject(resp.message);
|
|
229
|
+
}
|
|
225
230
|
}
|
|
226
|
-
|
|
231
|
+
);
|
|
227
232
|
});
|
|
228
233
|
return response;
|
|
229
234
|
} catch (error: any) {
|