@dynamic-labs/multi-wallet 0.7.1 → 0.7.2
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/package.json +1 -1
- package/src/wallets/ethereum/meta-mask.d.ts +0 -1
- package/src/wallets/ethereum/meta-mask.js +3 -27
- package/src/wallets/ethereum/meta-mask.js.map +1 -1
- package/src/wallets/flow/blocto.d.ts +1 -1
- package/src/wallets/flow/blocto.js +10 -7
- package/src/wallets/flow/blocto.js.map +1 -1
- package/src/wallets/wallet-connect-client.d.ts +2 -5
- package/src/wallets/wallet-connect-client.js +54 -60
- package/src/wallets/wallet-connect-client.js.map +1 -1
- package/src/wallets/wallet-connect.d.ts +0 -1
- package/src/wallets/wallet-connect.js +3 -27
- package/src/wallets/wallet-connect.js.map +1 -1
package/package.json
CHANGED
|
@@ -7,7 +7,6 @@ declare class MetaMask extends EthProvider implements WalletConnector {
|
|
|
7
7
|
canConnectViaQrCode: boolean;
|
|
8
8
|
canConnectViaCustodialService: boolean;
|
|
9
9
|
publicAddress: string | undefined;
|
|
10
|
-
private walletConnectClient;
|
|
11
10
|
constructor();
|
|
12
11
|
setupEventListeners(): void;
|
|
13
12
|
getWeb3Provider(): import("@ethersproject/providers").Web3Provider | undefined;
|
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -33,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
33
10
|
};
|
|
34
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
12
|
const ethers_1 = require("ethers");
|
|
36
|
-
const wallet_connect_client_1 =
|
|
13
|
+
const wallet_connect_client_1 = require("../wallet-connect-client");
|
|
37
14
|
const walletConnect_1 = require("../../utils/walletConnect");
|
|
38
15
|
const eth_provider_1 = require("./eth-provider");
|
|
39
16
|
class MetaMask extends eth_provider_1.EthProvider {
|
|
@@ -44,7 +21,6 @@ class MetaMask extends eth_provider_1.EthProvider {
|
|
|
44
21
|
this.connectedChain = 'ETH';
|
|
45
22
|
this.canConnectViaQrCode = true;
|
|
46
23
|
this.canConnectViaCustodialService = false;
|
|
47
|
-
this.walletConnectClient = new wallet_connect_client_1.default();
|
|
48
24
|
}
|
|
49
25
|
setupEventListeners() {
|
|
50
26
|
return;
|
|
@@ -60,7 +36,7 @@ class MetaMask extends eth_provider_1.EthProvider {
|
|
|
60
36
|
if (this.isInstalledOnBrowser()) {
|
|
61
37
|
return this.fetchPublicAddressWithName(this.name);
|
|
62
38
|
}
|
|
63
|
-
const address = yield
|
|
39
|
+
const address = yield (0, wallet_connect_client_1.fetchWalletConnectPublicAddress)((0, walletConnect_1.getWalletConnectMetadata)(this.name), opts);
|
|
64
40
|
return address ? ethers_1.utils.getAddress(address) : undefined;
|
|
65
41
|
});
|
|
66
42
|
}
|
|
@@ -68,7 +44,7 @@ class MetaMask extends eth_provider_1.EthProvider {
|
|
|
68
44
|
return __awaiter(this, void 0, void 0, function* () {
|
|
69
45
|
return this.isInstalledOnBrowser()
|
|
70
46
|
? this.signMessageWithName(messageToSign, this.name)
|
|
71
|
-
:
|
|
47
|
+
: (0, wallet_connect_client_1.signWalletConnectPersonalMessage)(messageToSign, (0, walletConnect_1.getWalletConnectMetadata)(this.name));
|
|
72
48
|
});
|
|
73
49
|
}
|
|
74
50
|
endSession() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"meta-mask.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/meta-mask.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"meta-mask.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/meta-mask.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,mCAA+B;AAE/B,oEAIkC;AAMlC,6DAAqE;AAErE,iDAA6C;AAE7C,MAAM,QAAS,SAAQ,0BAAW;IAYhC;QACE,KAAK,EAAE,CAAC;QAZV,SAAI,GAAG,UAAU,CAAC;QAElB,oBAAe,GAAY,CAAC,KAAK,CAAC,CAAC;QAEnC,mBAAc,GAAU,KAAK,CAAC;QAE9B,wBAAmB,GAAG,IAAI,CAAC;QAC3B,kCAA6B,GAAG,KAAK,CAAC;IAMtC,CAAC;IAED,mBAAmB;QACjB,OAAO;IACT,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,oBAAoB;QAClB,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAEK,kBAAkB,CACtB,IAA6B;;YAE7B,IAAI,IAAI,CAAC,oBAAoB,EAAE,EAAE;gBAC/B,OAAO,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnD;YACD,MAAM,OAAO,GAAG,MAAM,IAAA,uDAA+B,EACnD,IAAA,wCAAwB,EAAC,IAAI,CAAC,IAAI,CAAC,EACnC,IAAI,CACL,CAAC;YACF,OAAO,OAAO,CAAC,CAAC,CAAC,cAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACzD,CAAC;KAAA;IAEK,WAAW,CAAC,aAAqB;;YACrC,OAAO,IAAI,CAAC,oBAAoB,EAAE;gBAChC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC;gBACpD,CAAC,CAAC,IAAA,wDAAgC,EAC9B,aAAa,EACb,IAAA,wCAAwB,EAAC,IAAI,CAAC,IAAI,CAAC,CACpC,CAAC;QACR,CAAC;KAAA;IAEK,UAAU;;YACd,IAAA,gDAAwB,GAAE,CAAC;QAC7B,CAAC;KAAA;CACF;AAED,kBAAe,QAAQ,CAAC"}
|
|
@@ -14,7 +14,7 @@ declare class Blocto implements WalletConnector {
|
|
|
14
14
|
setupEventListeners(): void;
|
|
15
15
|
isInstalledOnBrowser(): boolean;
|
|
16
16
|
setupConfig(nonce?: string): Promise<void>;
|
|
17
|
-
fetchPublicAddress(_opts: FetchPublicAddressOpts, nonce
|
|
17
|
+
fetchPublicAddress(_opts: FetchPublicAddressOpts, nonce?: string): Promise<string | undefined>;
|
|
18
18
|
signMessage(messageToSign: string): Promise<string | undefined>;
|
|
19
19
|
getWeb3Provider(): undefined;
|
|
20
20
|
endSession(): Promise<void>;
|
|
@@ -56,7 +56,7 @@ class Blocto {
|
|
|
56
56
|
fetchPublicAddress(_opts, nonce) {
|
|
57
57
|
return __awaiter(this, void 0, void 0, function* () {
|
|
58
58
|
try {
|
|
59
|
-
yield this.setupConfig(nonce.repeat(2));
|
|
59
|
+
yield this.setupConfig(nonce === null || nonce === void 0 ? void 0 : nonce.repeat(2));
|
|
60
60
|
const user = yield (0, fcl_1.currentUser)().authenticate();
|
|
61
61
|
return user.addr;
|
|
62
62
|
}
|
|
@@ -67,17 +67,21 @@ class Blocto {
|
|
|
67
67
|
});
|
|
68
68
|
}
|
|
69
69
|
signMessage(messageToSign) {
|
|
70
|
-
var _a
|
|
70
|
+
var _a;
|
|
71
71
|
return __awaiter(this, void 0, void 0, function* () {
|
|
72
72
|
try {
|
|
73
73
|
if (!(yield fcl_1.config.get('fcl.accountProof.resolver'))) {
|
|
74
|
-
(
|
|
75
|
-
yield this.setupConfig((
|
|
74
|
+
(0, fcl_1.currentUser)().unauthenticate();
|
|
75
|
+
yield this.setupConfig((_a = (0, extractNonce_1.extractNonce)(messageToSign)) === null || _a === void 0 ? void 0 : _a.repeat(2));
|
|
76
76
|
}
|
|
77
77
|
const authenticateResponse = yield (0, fcl_1.currentUser)().authenticate();
|
|
78
78
|
const accountProof = authenticateResponse.services.find((service) => service.type === 'account-proof');
|
|
79
79
|
if (accountProof) {
|
|
80
|
-
|
|
80
|
+
const data = {
|
|
81
|
+
accountProof,
|
|
82
|
+
appName: this.appName,
|
|
83
|
+
};
|
|
84
|
+
return JSON.stringify(data);
|
|
81
85
|
}
|
|
82
86
|
else {
|
|
83
87
|
return undefined;
|
|
@@ -93,9 +97,8 @@ class Blocto {
|
|
|
93
97
|
return undefined;
|
|
94
98
|
}
|
|
95
99
|
endSession() {
|
|
96
|
-
var _a;
|
|
97
100
|
return __awaiter(this, void 0, void 0, function* () {
|
|
98
|
-
(
|
|
101
|
+
(0, fcl_1.currentUser)().unauthenticate();
|
|
99
102
|
});
|
|
100
103
|
}
|
|
101
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocto.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/flow/blocto.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,qCAAkD;AAElD,kEAA0C;AAC1C,2DAAwD;AAaxD,MAAM,MAAM;IAaV,YAAY,EACV,OAAO,EACP,UAAU,GAIX;QAlBD,SAAI,GAAG,QAAQ,CAAC;QAEhB,oBAAe,GAAY,CAAC,MAAM,CAAC,CAAC;QAEpC,mBAAc,GAAU,MAAM,CAAC;QAE/B,wBAAmB,GAAG,KAAK,CAAC;QAC5B,kCAA6B,GAAG,IAAI,CAAC;QAYnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,mBAAmB;QACjB,OAAO;IACT,CAAC;IAED,oBAAoB;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;IAEK,WAAW,CAAC,KAAc;;YAC9B,IAAI,QAA8C,CAAC;YAEnD,IAAI,KAAK,EAAE;gBACT,QAAQ,GAAG,GAAG,EAAE,CACd,OAAO,CAAC,OAAO,CAAC;oBACd,aAAa,EAAE,IAAI,CAAC,OAAO;oBAC3B,KAAK;iBACN,CAAC,CAAC;aACN;iBAAM;gBACL,QAAQ,GAAG,SAAS,CAAC;aACtB;YAED,MAAM,IAAA,YAAM,GAAE;iBACX,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC;iBAC/B,GAAG,CAAC,kBAAkB,EAAE,sCAAsC,CAAC;iBAC/D,GAAG,CAAC,uBAAuB,EAAE,QAAQ,CAAC;iBACtC,GAAG,CAAC,yBAAyB,EAAE,SAAS,CAAC;iBACzC,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,OAAO,CAAC;iBACrC,GAAG,CAAC,iBAAiB,EAAE,IAAI,CAAC,UAAU,CAAC;iBACvC,GAAG,CAAC,2BAA2B,EAAE,QAAQ,CAAC,CAAC;QAChD,CAAC;KAAA;IAEK,kBAAkB,CACtB,KAA6B,EAC7B,
|
|
1
|
+
{"version":3,"file":"blocto.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/flow/blocto.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,8 +43,5 @@ export declare const setupWalletConnectEventListeners: SetupWalletConnectEventLi
|
|
|
43
43
|
* Initialize a client from a stored session and terminate the connection.
|
|
44
44
|
*/
|
|
45
45
|
export declare const killWalletConnectSession: () => Promise<void>;
|
|
46
|
-
declare
|
|
47
|
-
|
|
48
|
-
signPersonalMessage(messageToSign: string, metadata: WalletConnectWalletMetadata): Promise<string | undefined>;
|
|
49
|
-
}
|
|
50
|
-
export default WalletConnectClient;
|
|
46
|
+
export declare const fetchWalletConnectPublicAddress: (metadata: WalletConnectWalletMetadata, opts?: FetchPublicAddressOpts | undefined) => Promise<string | undefined>;
|
|
47
|
+
export declare const signWalletConnectPersonalMessage: (messageToSign: string, metadata: WalletConnectWalletMetadata) => Promise<string | undefined>;
|
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.killWalletConnectSession = exports.setupWalletConnectEventListeners = exports.initializeWalletConnectClientFromSession = exports.initializeWalletConnectClient = void 0;
|
|
15
|
+
exports.signWalletConnectPersonalMessage = exports.fetchWalletConnectPublicAddress = exports.killWalletConnectSession = exports.setupWalletConnectEventListeners = exports.initializeWalletConnectClientFromSession = exports.initializeWalletConnectClient = void 0;
|
|
16
16
|
const client_1 = __importDefault(require("@walletconnect/client"));
|
|
17
17
|
const console_1 = __importDefault(require("../utils/console"));
|
|
18
18
|
const isMobile_1 = require("../utils/isMobile");
|
|
@@ -91,67 +91,61 @@ const killWalletConnectSession = () => __awaiter(void 0, void 0, void 0, functio
|
|
|
91
91
|
}
|
|
92
92
|
});
|
|
93
93
|
exports.killWalletConnectSession = killWalletConnectSession;
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
if (client.connected) {
|
|
101
|
-
const [accountPublicAddress] = client.accounts;
|
|
102
|
-
return accountPublicAddress;
|
|
103
|
-
}
|
|
104
|
-
// createSession will trigger the QR code...
|
|
105
|
-
yield client.createSession();
|
|
106
|
-
if ((0, isMobile_1.isMobile)()) {
|
|
107
|
-
const deepLink = `${metadata.mobile.universal}/wc?uri=${encodeURIComponent((_a = client.uri) !== null && _a !== void 0 ? _a : '')}`;
|
|
108
|
-
window.location.href = deepLink;
|
|
109
|
-
}
|
|
110
|
-
else {
|
|
111
|
-
(_b = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _b === void 0 ? void 0 : _b.call(opts, client.uri);
|
|
112
|
-
}
|
|
113
|
-
return new Promise((resolve, reject) => {
|
|
114
|
-
// ...then once the QR is scanned, this callback will run
|
|
115
|
-
client.on('connect', (error, payload) => {
|
|
116
|
-
var _a;
|
|
117
|
-
if (error) {
|
|
118
|
-
reject(error);
|
|
119
|
-
}
|
|
120
|
-
(_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
|
|
121
|
-
const [accountPublicAddress] = payload.params[0].accounts;
|
|
122
|
-
resolve(accountPublicAddress);
|
|
123
|
-
});
|
|
124
|
-
client.on('disconnect', (error, payload) => {
|
|
125
|
-
reject(error || payload.params[0].message);
|
|
126
|
-
});
|
|
127
|
-
});
|
|
128
|
-
});
|
|
94
|
+
const fetchWalletConnectPublicAddress = (metadata, opts) => __awaiter(void 0, void 0, void 0, function* () {
|
|
95
|
+
var _a, _b;
|
|
96
|
+
const client = (0, exports.initializeWalletConnectClient)();
|
|
97
|
+
if (client.connected) {
|
|
98
|
+
const [accountPublicAddress] = client.accounts;
|
|
99
|
+
return accountPublicAddress;
|
|
129
100
|
}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
accountPublicAddress,
|
|
146
|
-
]);
|
|
147
|
-
}
|
|
148
|
-
catch (e) {
|
|
149
|
-
console_1.default.log(e);
|
|
150
|
-
client.killSession();
|
|
151
|
-
throw e;
|
|
101
|
+
// createSession will trigger the QR code...
|
|
102
|
+
yield client.createSession();
|
|
103
|
+
if ((0, isMobile_1.isMobile)()) {
|
|
104
|
+
const deepLink = `${metadata.mobile.universal}/wc?uri=${encodeURIComponent((_a = client.uri) !== null && _a !== void 0 ? _a : '')}`;
|
|
105
|
+
window.location.href = deepLink;
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
(_b = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _b === void 0 ? void 0 : _b.call(opts, client.uri);
|
|
109
|
+
}
|
|
110
|
+
return new Promise((resolve, reject) => {
|
|
111
|
+
// ...then once the QR is scanned, this callback will run
|
|
112
|
+
client.on('connect', (error, payload) => {
|
|
113
|
+
var _a;
|
|
114
|
+
if (error) {
|
|
115
|
+
reject(error);
|
|
152
116
|
}
|
|
117
|
+
(_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
|
|
118
|
+
const [accountPublicAddress] = payload.params[0].accounts;
|
|
119
|
+
resolve(accountPublicAddress);
|
|
120
|
+
});
|
|
121
|
+
client.on('disconnect', (error, payload) => {
|
|
122
|
+
reject(error || payload.params[0].message);
|
|
153
123
|
});
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
exports.fetchWalletConnectPublicAddress = fetchWalletConnectPublicAddress;
|
|
127
|
+
const signWalletConnectPersonalMessage = (messageToSign, metadata) => __awaiter(void 0, void 0, void 0, function* () {
|
|
128
|
+
var _c;
|
|
129
|
+
const client = (0, exports.initializeWalletConnectClientFromSession)();
|
|
130
|
+
if (!client || !client.connected) {
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
const [accountPublicAddress] = client.accounts;
|
|
134
|
+
if ((0, isMobile_1.isMobile)()) {
|
|
135
|
+
const deepLink = `${metadata.mobile.universal}/wc?uri=${encodeURIComponent((_c = client.uri) !== null && _c !== void 0 ? _c : '')}`;
|
|
136
|
+
window.location.href = deepLink;
|
|
137
|
+
}
|
|
138
|
+
try {
|
|
139
|
+
return yield client.signPersonalMessage([
|
|
140
|
+
messageToSign,
|
|
141
|
+
accountPublicAddress,
|
|
142
|
+
]);
|
|
154
143
|
}
|
|
155
|
-
|
|
156
|
-
|
|
144
|
+
catch (e) {
|
|
145
|
+
console_1.default.log(e);
|
|
146
|
+
client.killSession();
|
|
147
|
+
throw e;
|
|
148
|
+
}
|
|
149
|
+
});
|
|
150
|
+
exports.signWalletConnectPersonalMessage = signWalletConnectPersonalMessage;
|
|
157
151
|
//# sourceMappingURL=wallet-connect-client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet-connect-client.js","sourceRoot":"","sources":["../../../../../packages/multi-wallet/src/wallets/wallet-connect-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mEAA2C;AAG3C,+DAAuC;AACvC,gDAA6C;AAY7C;;GAEG;AACH,IAAI,MAA0B,CAAC;AAE/B;;;;;;;;;;GAUG;AACI,MAAM,6BAA6B,GAAkC,CAC1E,IAAI,GAAG,EAAE,EACT,EAAE;;IACF,IAAI,MAAM,EAAE;QACV,OAAO,MAAM,CAAC;KACf;IAED,MAAM,EAAE,MAAM,GAAG,kCAAkC,EAAE,GAAG,IAAI,CAAC;IAC7D,MAAM,GAAG,MAAA,IAAA,gDAAwC,GAAE,mCAAI,IAAI,gBAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAE9E,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAXW,QAAA,6BAA6B,iCAWxC;AAIF;;;;;;;;GAQG;AACI,MAAM,wCAAwC,GACnD,GAAG,EAAE;IACH,IAAI,MAAM,EAAE;QACV,OAAO,MAAM,CAAC;KACf;IAED,6CAA6C;IAC7C,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACzD,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACvC,MAAM,GAAG,IAAI,gBAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAfS,QAAA,wCAAwC,4CAejD;AAWJ;;;;;GAKG;AACI,MAAM,gCAAgC,GAC3C,CAAC,IAAI,EAAE,MAAM,GAAG,IAAA,gDAAwC,GAAE,EAAE,EAAE;IAC5D,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE;QAC5B,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AALS,QAAA,gCAAgC,oCAKzC;AAEJ;;GAEG;AACI,MAAM,wBAAwB,GAAG,GAAS,EAAE;IACjD,IAAI;QACF,MAAM,mBAAmB,GAAG,IAAA,gDAAwC,GAAE,CAAC;QACvE,IAAI,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,SAAS,EAAE;YAClC,MAAM,mBAAmB,CAAC,WAAW,EAAE,CAAC;SACzC;KACF;IAAC,OAAO,CAAC,EAAE;QACV,iBAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAChB;AACH,CAAC,CAAA,CAAC;AATW,QAAA,wBAAwB,4BASnC;
|
|
1
|
+
{"version":3,"file":"wallet-connect-client.js","sourceRoot":"","sources":["../../../../../packages/multi-wallet/src/wallets/wallet-connect-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,27 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -33,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
33
10
|
};
|
|
34
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
12
|
const walletConnect_1 = require("../utils/walletConnect");
|
|
36
|
-
const wallet_connect_client_1 =
|
|
13
|
+
const wallet_connect_client_1 = require("./wallet-connect-client");
|
|
37
14
|
const chainMap = {
|
|
38
15
|
1: 'ETH',
|
|
39
16
|
245022934: 'SOL',
|
|
@@ -44,7 +21,6 @@ class WalletConnect {
|
|
|
44
21
|
this.canConnectViaQrCode = true;
|
|
45
22
|
this.canConnectViaCustodialService = false;
|
|
46
23
|
this.name = walletName;
|
|
47
|
-
this.walletConnectClient = new wallet_connect_client_1.default();
|
|
48
24
|
}
|
|
49
25
|
setupEventListeners(listeners) {
|
|
50
26
|
(0, wallet_connect_client_1.setupWalletConnectEventListeners)({
|
|
@@ -59,7 +35,7 @@ class WalletConnect {
|
|
|
59
35
|
}
|
|
60
36
|
fetchPublicAddress(opts) {
|
|
61
37
|
return __awaiter(this, void 0, void 0, function* () {
|
|
62
|
-
return
|
|
38
|
+
return (0, wallet_connect_client_1.fetchWalletConnectPublicAddress)((0, walletConnect_1.getWalletConnectMetadata)(this.name), Object.assign(Object.assign({}, opts), { onConnect: (payload) => {
|
|
63
39
|
var _a;
|
|
64
40
|
(_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
|
|
65
41
|
this.connectedChain = chainMap[payload.params[0].chainId];
|
|
@@ -68,7 +44,7 @@ class WalletConnect {
|
|
|
68
44
|
}
|
|
69
45
|
signMessage(messageToSign) {
|
|
70
46
|
return __awaiter(this, void 0, void 0, function* () {
|
|
71
|
-
return
|
|
47
|
+
return (0, wallet_connect_client_1.signWalletConnectPersonalMessage)(messageToSign, (0, walletConnect_1.getWalletConnectMetadata)(this.name));
|
|
72
48
|
});
|
|
73
49
|
}
|
|
74
50
|
endSession() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallet-connect.js","sourceRoot":"","sources":["../../../../../packages/multi-wallet/src/wallets/wallet-connect.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wallet-connect.js","sourceRoot":"","sources":["../../../../../packages/multi-wallet/src/wallets/wallet-connect.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,0DAAkE;AAElE,mEAKiC;AAOjC,MAAM,QAAQ,GAA0B;IACtC,CAAC,EAAE,KAAK;IACR,SAAS,EAAE,KAAK;CACjB,CAAC;AAEF,MAAM,aAAa;IAUjB,YAAY,EAAE,UAAU,EAA0B;QATlD,oBAAe,GAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAM1C,wBAAmB,GAAG,IAAI,CAAC;QAC3B,kCAA6B,GAAG,KAAK,CAAC;QAGpC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IACzB,CAAC;IAED,mBAAmB,CAAC,SAA4C;QAC9D,IAAA,wDAAgC,EAAC;YAC/B,YAAY,EAAE,SAAS,CAAC,YAAY;SACrC,CAAC,CAAC;IACL,CAAC;IAED,eAAe;QACb,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,oBAAoB;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;IAEK,kBAAkB,CACtB,IAA6B;;YAE7B,OAAO,IAAA,uDAA+B,EACpC,IAAA,wCAAwB,EAAC,IAAI,CAAC,IAAI,CAAC,kCAE9B,IAAI,KACP,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;;oBACrB,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,qDAAG,OAAO,CAAC,CAAC;oBAC3B,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;gBAC5D,CAAC,IAEJ,CAAC;QACJ,CAAC;KAAA;IAEK,WAAW,CAAC,aAAqB;;YACrC,OAAO,IAAA,wDAAgC,EACrC,aAAa,EACb,IAAA,wCAAwB,EAAC,IAAI,CAAC,IAAI,CAAC,CACpC,CAAC;QACJ,CAAC;KAAA;IAEK,UAAU;;YACd,IAAA,gDAAwB,GAAE,CAAC;QAC7B,CAAC;KAAA;CACF;AAED,kBAAe,aAAa,CAAC"}
|