@dynamic-labs/multi-wallet 0.16.0-RC.12 → 0.16.0-RC.14
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/CHANGELOG.md +35 -0
- package/package.json +7 -7
- package/src/index.d.ts +1 -1
- package/src/index.js +1 -1
- package/src/index.js.map +1 -1
- package/src/utils/convertors.js +1 -1
- package/src/utils/convertors.js.map +1 -1
- package/src/wallets/clients/walletConnect/walletConnect.d.ts +7 -3
- package/src/wallets/clients/walletConnect/walletConnect.js +59 -33
- package/src/wallets/clients/walletConnect/walletConnect.js.map +1 -1
- package/src/wallets/constants.d.ts +2 -2
- package/src/wallets/constants.js +3 -3
- package/src/wallets/constants.js.map +1 -1
- package/src/wallets/cosmos/keplrWalletConnect.d.ts +47 -2
- package/src/wallets/cosmos/keplrWalletConnect.js +202 -3
- package/src/wallets/cosmos/keplrWalletConnect.js.map +1 -1
- package/src/wallets/ethereum/MagicConnector/EmailMagicWalletConnector/EmailMagicWalletConnector.js +2 -2
- package/src/wallets/ethereum/MagicConnector/EmailMagicWalletConnector/EmailMagicWalletConnector.js.map +1 -1
- package/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js +1 -1
- package/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js.map +1 -1
- package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.d.ts +24 -0
- package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.js +94 -0
- package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.js.map +1 -0
- package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/index.d.ts +2 -0
- package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/index.js +6 -0
- package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/index.js.map +1 -0
- package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.d.ts +7 -13
- package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.js +26 -45
- package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.js.map +1 -1
- package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/index.d.ts +1 -1
- package/src/wallets/ethereum/MagicConnector/index.d.ts +1 -0
- package/src/wallets/ethereum/MagicConnector/index.js +1 -0
- package/src/wallets/ethereum/MagicConnector/index.js.map +1 -1
- package/src/wallets/starknet/argentx.js +1 -1
- package/src/wallets/starknet/argentx.js.map +1 -1
- package/src/wallets/starknet/braavos.js +1 -1
- package/src/wallets/starknet/braavos.js.map +1 -1
- package/src/wallets/starknet/starknetProvider.d.ts +22 -10
- package/src/wallets/starknet/starknetProvider.js +121 -23
- package/src/wallets/starknet/starknetProvider.js.map +1 -1
- package/src/wallets/walletConnect/walletConnect.d.ts +1 -0
- package/src/wallets/walletConnect/walletConnect.js +2 -2
- package/src/wallets/walletConnect/walletConnect.js.map +1 -1
- package/src/wallets/window.d.ts +1 -0
- package/src/wallets/starknet/starknetProviderHelper.d.ts +0 -17
- package/src/wallets/starknet/starknetProviderHelper.js +0 -159
- package/src/wallets/starknet/starknetProviderHelper.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,4 +1,39 @@
|
|
|
1
1
|
|
|
2
|
+
## [0.16.0-RC.14](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.0-RC.13...v0.16.0-RC.14) (2023-04-12)
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
* **DYN-2073:** use emailOnly property to decide whether to show wallet list or not ([#1855](https://github.com/dynamic-labs/DynamicAuth/issues/1855)) ([9f98713](https://github.com/dynamic-labs/DynamicAuth/commit/9f9871343811e9bcaa4bad3b01407fcab7401630))
|
|
8
|
+
* **Keplr:** sign message with walletconnect and authorize ([699d438](https://github.com/dynamic-labs/DynamicAuth/commit/699d438e9c14ce5f562cbebe9c4895530bbeb0cf))
|
|
9
|
+
* **Keplr:** support network switch ([28c98b3](https://github.com/dynamic-labs/DynamicAuth/commit/28c98b31010bfd74b0a1a767165311a7ca1bca8a))
|
|
10
|
+
* **KeplrWalletCnnect:** fetch balance ([d42aad9](https://github.com/dynamic-labs/DynamicAuth/commit/d42aad9c848ced5eff782da23fd0ed50a1727f74))
|
|
11
|
+
* **KeplrWalletCnnect:** fetch balance ([bd0f854](https://github.com/dynamic-labs/DynamicAuth/commit/bd0f854ea95425dabdc918f87a3e85c1f30e42c9))
|
|
12
|
+
* **magic:** handle network switching ([c9636ef](https://github.com/dynamic-labs/DynamicAuth/commit/c9636ef61bc72970fde4182f7c2e5c05fcccf1bf))
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
* **Keplr:** authorize with persited network ([82e9e94](https://github.com/dynamic-labs/DynamicAuth/commit/82e9e945039d9ee39a64193d6b14f993b9f980f0))
|
|
18
|
+
* remove extend WalletConnect from keplrWalletConnect ([9ae62be](https://github.com/dynamic-labs/DynamicAuth/commit/9ae62be5d47e1b17a986bd4c84aba3a8d3583743))
|
|
19
|
+
|
|
20
|
+
## [0.16.0-RC.13](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.0-RC.12...v0.16.0-RC.13) (2023-04-11)
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
### Features
|
|
24
|
+
|
|
25
|
+
* add cosmos to the new wallet chain options ([ba93570](https://github.com/dynamic-labs/DynamicAuth/commit/ba93570a1b51d79135e985273c9a8ac7b417b690))
|
|
26
|
+
* add glow and starknet to shouldManuallyReconnectOnRefresh ([a971787](https://github.com/dynamic-labs/DynamicAuth/commit/a97178750aa2ff6b2e6c8b84bf8587f43faaf243))
|
|
27
|
+
* starknet update signature for getWeb3Provider and updated isInstalled ([94e84ac](https://github.com/dynamic-labs/DynamicAuth/commit/94e84ac04e4ceb20a6b13ede4ff22230b0bb08f5))
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
### Bug Fixes
|
|
31
|
+
|
|
32
|
+
* **connect-only:** manually reconnect connector based on shouldManuallyReconnectOnRefresh ([e81ec1c](https://github.com/dynamic-labs/DynamicAuth/commit/e81ec1ccee9fe4361dc4e12e358a4d199b750478))
|
|
33
|
+
* remove useFetchPublicAddress ([5cb5659](https://github.com/dynamic-labs/DynamicAuth/commit/5cb5659aa8b3d03589f6e6a065a087ff54afe863))
|
|
34
|
+
* starknet properly teardown the listeners ([1212251](https://github.com/dynamic-labs/DynamicAuth/commit/121225146ed2d7e6dff58f00681f7876ba20bd6e))
|
|
35
|
+
* update kycEnabled value when projectSettings change ([#1836](https://github.com/dynamic-labs/DynamicAuth/issues/1836)) ([56f4312](https://github.com/dynamic-labs/DynamicAuth/commit/56f431218648d34275d4ea0ab5e5dbfadd8ed7b3))
|
|
36
|
+
|
|
2
37
|
## [0.16.0-RC.12](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.0-RC.11...v0.16.0-RC.12) (2023-04-06)
|
|
3
38
|
|
|
4
39
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dynamic-labs/multi-wallet",
|
|
3
|
-
"version": "0.16.0-RC.
|
|
3
|
+
"version": "0.16.0-RC.14",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/dynamic-labs/DynamicAuth.git",
|
|
@@ -10,9 +10,10 @@
|
|
|
10
10
|
"@blocto/sdk": "0.3.3",
|
|
11
11
|
"@coinbase/wallet-sdk": "3.6.4",
|
|
12
12
|
"@dynamic-labs/iconic": "0.1.16",
|
|
13
|
-
"@dynamic-labs/sdk-api": "0.0.
|
|
14
|
-
"@dynamic-labs/wallet-book": "0.0.
|
|
15
|
-
"@keplr-wallet/types": "0.11.
|
|
13
|
+
"@dynamic-labs/sdk-api": "0.0.174",
|
|
14
|
+
"@dynamic-labs/wallet-book": "0.0.10",
|
|
15
|
+
"@keplr-wallet/types": "0.11.53",
|
|
16
|
+
"@keplr-wallet/wc-client": "0.11.53",
|
|
16
17
|
"@onflow/fcl": "1.3.2",
|
|
17
18
|
"@randlabs/myalgo-connect": "1.4.2",
|
|
18
19
|
"@solana/web3.js": "1.70.1",
|
|
@@ -25,11 +26,10 @@
|
|
|
25
26
|
"get-starknet": "1.5.0",
|
|
26
27
|
"magic-sdk": "16.0.1",
|
|
27
28
|
"react": "18.2.0",
|
|
28
|
-
"react-dom": "18.2.0",
|
|
29
29
|
"starknet": "3.19.0",
|
|
30
30
|
"tslib": "2.4.1",
|
|
31
|
-
"@dynamic-labs/logger": "0.16.0-RC.
|
|
32
|
-
"@dynamic-labs/wallet-connector-core": "0.16.0-RC.
|
|
31
|
+
"@dynamic-labs/logger": "0.16.0-RC.14",
|
|
32
|
+
"@dynamic-labs/wallet-connector-core": "0.16.0-RC.14"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@walletconnect/types": "^2.2.1"
|
package/src/index.d.ts
CHANGED
|
@@ -17,4 +17,4 @@ export * from './wallets/clients/coinbase';
|
|
|
17
17
|
export type { EvmNetwork } from './wallets/ethereum/evm-network';
|
|
18
18
|
export { Keplr } from './wallets/cosmos/keplr';
|
|
19
19
|
export * from './utils/isSameAddress';
|
|
20
|
-
export { defaultStarknetTypedDataDomain } from './wallets/constants';
|
|
20
|
+
export { DEFAULT_STARKNET_TYPED_DATA_DOMAIN as defaultStarknetTypedDataDomain } from './wallets/constants';
|
package/src/index.js
CHANGED
|
@@ -31,5 +31,5 @@ var keplr_1 = require("./wallets/cosmos/keplr");
|
|
|
31
31
|
Object.defineProperty(exports, "Keplr", { enumerable: true, get: function () { return keplr_1.Keplr; } });
|
|
32
32
|
tslib_1.__exportStar(require("./utils/isSameAddress"), exports);
|
|
33
33
|
var constants_1 = require("./wallets/constants");
|
|
34
|
-
Object.defineProperty(exports, "defaultStarknetTypedDataDomain", { enumerable: true, get: function () { return constants_1.
|
|
34
|
+
Object.defineProperty(exports, "defaultStarknetTypedDataDomain", { enumerable: true, get: function () { return constants_1.DEFAULT_STARKNET_TYPED_DATA_DOMAIN; } });
|
|
35
35
|
//# sourceMappingURL=index.js.map
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/multi-wallet/src/index.ts"],"names":[],"mappings":";;;;AAAA,uBAAqB;AAErB,yDAA+B;AAC/B,kDAAwB;AACxB,mDAAyB;AACzB,yDAA+B;AAC/B,yDAA+B;AAC/B,4EAAkD;AAElD,2CAAwD;AAA/C,gHAAA,qBAAqB,OAAA;AAC9B,6CAA8D;AAArD,kGAAA,MAAM,OAAA;AAAE,oGAAA,QAAQ,OAAA;AAAE,oGAAA,QAAQ,OAAA;AAEnC,mEAAkE;AAAzD,0HAAA,mBAAmB,OAAA;AAC5B,yEAAwE;AAA/D,gIAAA,sBAAsB,OAAA;AAC/B,+EAA8E;AAArE,sIAAA,yBAAyB,OAAA;AAClC,qDAAoD;AAA3C,4GAAA,YAAY,OAAA;AACrB,6EAA4E;AAAnE,oIAAA,wBAAwB,OAAA;AAEjC,0EAAgD;AAChD,qEAA2C;AAI3C,gDAA+C;AAAtC,8FAAA,KAAK,OAAA;AAEd,gEAAsC;AAEtC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/multi-wallet/src/index.ts"],"names":[],"mappings":";;;;AAAA,uBAAqB;AAErB,yDAA+B;AAC/B,kDAAwB;AACxB,mDAAyB;AACzB,yDAA+B;AAC/B,yDAA+B;AAC/B,4EAAkD;AAElD,2CAAwD;AAA/C,gHAAA,qBAAqB,OAAA;AAC9B,6CAA8D;AAArD,kGAAA,MAAM,OAAA;AAAE,oGAAA,QAAQ,OAAA;AAAE,oGAAA,QAAQ,OAAA;AAEnC,mEAAkE;AAAzD,0HAAA,mBAAmB,OAAA;AAC5B,yEAAwE;AAA/D,gIAAA,sBAAsB,OAAA;AAC/B,+EAA8E;AAArE,sIAAA,yBAAyB,OAAA;AAClC,qDAAoD;AAA3C,4GAAA,YAAY,OAAA;AACrB,6EAA4E;AAAnE,oIAAA,wBAAwB,OAAA;AAEjC,0EAAgD;AAChD,qEAA2C;AAI3C,gDAA+C;AAAtC,8FAAA,KAAK,OAAA;AAEd,gEAAsC;AAEtC,iDAA2G;AAAlG,2HAAA,kCAAkC,OAAkC"}
|
package/src/utils/convertors.js
CHANGED
|
@@ -9,7 +9,7 @@ const bufferToBase64 = (buf) => {
|
|
|
9
9
|
return btoa(binstr);
|
|
10
10
|
};
|
|
11
11
|
exports.bufferToBase64 = bufferToBase64;
|
|
12
|
-
const defaultTypedData = Object.assign(Object.assign({}, constants_1.
|
|
12
|
+
const defaultTypedData = Object.assign(Object.assign({}, constants_1.DEFAULT_STARKNET_TYPED_DATA_DOMAIN), { primaryType: 'Message', types: {
|
|
13
13
|
Message: [
|
|
14
14
|
{
|
|
15
15
|
name: 'message',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertors.js","sourceRoot":"","sources":["../../../../../packages/multi-wallet/src/utils/convertors.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"convertors.js","sourceRoot":"","sources":["../../../../../packages/multi-wallet/src/utils/convertors.ts"],"names":[],"mappings":";;;AAEA,oDAA0E;AAEnE,MAAM,cAAc,GAAG,CAAC,GAAe,EAAU,EAAE;IACxD,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG;SAC/B,IAAI,CAAC,GAAG,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;SAClD,IAAI,CAAC,EAAE,CAAC,CAAC;IACZ,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC;AACtB,CAAC,CAAC;AALW,QAAA,cAAc,kBAKzB;AAEF,MAAM,gBAAgB,mCACjB,8CAAkC,KACrC,WAAW,EAAE,SAAS,EACtB,KAAK,EAAE;QACL,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,MAAM;aACb;SACF;QACD,cAAc,EAAE;YACd;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,MAAM;aACb;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,MAAM;aACb;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,MAAM;aACb;SACF;KACF,GACF,CAAC;AAEK,MAAM,sBAAsB,GAAG,CACpC,YAAoB,EACpB,UAAmC,SAAS,EACjC,EAAE;IACb,MAAM,OAAO,GAA4B;QACvC,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC;KACvC,CAAC;IAEF,OAAO,gCACF,gBAAgB,KACnB,MAAM,kCACD,gBAAgB,CAAC,MAAM,KAC1B,OAAO,KAET,OAAO,GACK,CAAC;AACjB,CAAC,CAAC;AAhBW,QAAA,sBAAsB,0BAgBjC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import Client from '@walletconnect/client';
|
|
2
|
-
import {
|
|
2
|
+
import { KeplrWalletConnectV1 } from '@keplr-wallet/wc-client';
|
|
3
|
+
import { FetchPublicAddressOpts, PayloadParams, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
|
|
3
4
|
import { WalletSchema } from '@dynamic-labs/wallet-book';
|
|
4
|
-
export declare const initClient: (name: string) => Client;
|
|
5
|
+
export declare const initClient: (name: string, settings?: any) => Client;
|
|
5
6
|
/**
|
|
6
7
|
* Attach event handlers to WalletConnect events.
|
|
7
8
|
*/
|
|
@@ -14,5 +15,8 @@ export declare const killWalletConnectSession: (client: Client) => Promise<void>
|
|
|
14
15
|
export declare const getDeepLink: (uri: string, metadata: WalletSchema, { removeWCUri, }?: {
|
|
15
16
|
removeWCUri?: boolean | undefined;
|
|
16
17
|
}) => string;
|
|
17
|
-
export declare const
|
|
18
|
+
export declare const createSession: (client: Client) => Promise<PayloadParams>;
|
|
19
|
+
export declare const useDeepLink: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => void;
|
|
20
|
+
export declare const fetchWalletConnectCosmosPublicAddress: (metadata: WalletSchema, wcClient: Client, provider: KeplrWalletConnectV1, opts: FetchPublicAddressOpts & Required<Pick<FetchPublicAddressOpts, 'chainId'>>) => Promise<string>;
|
|
21
|
+
export declare const fetchWalletConnectEVMPublicAddress: (metadata: WalletSchema, wcClient: Client, opts?: FetchPublicAddressOpts) => Promise<string | undefined>;
|
|
18
22
|
export declare const signWalletConnectPersonalMessage: (messageToSign: string, metadata: WalletSchema, client: Client) => Promise<string | undefined>;
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.signWalletConnectPersonalMessage = exports.
|
|
3
|
+
exports.signWalletConnectPersonalMessage = exports.fetchWalletConnectEVMPublicAddress = exports.fetchWalletConnectCosmosPublicAddress = exports.useDeepLink = exports.createSession = exports.getDeepLink = exports.killWalletConnectSession = exports.teardownWalletConnectEventListeners = exports.setupWalletConnectEventListeners = exports.initClient = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const client_1 = tslib_1.__importDefault(require("@walletconnect/client"));
|
|
6
6
|
const isMobile_1 = require("../../../utils/isMobile");
|
|
7
7
|
const isSameAddress_1 = require("../../../utils/isSameAddress");
|
|
8
8
|
const logger_1 = require("../../../utils/logger");
|
|
9
|
-
const initClient = (name) => {
|
|
9
|
+
const initClient = (name, settings) => {
|
|
10
10
|
const storageId = `walletconnect-${name}`;
|
|
11
11
|
const session = localStorage.getItem(storageId);
|
|
12
12
|
const clientArgs = session
|
|
13
13
|
? { session: JSON.parse(session), storageId }
|
|
14
14
|
: { bridge: 'https://bridge.walletconnect.org', storageId };
|
|
15
|
-
return new client_1.default(clientArgs);
|
|
15
|
+
return new client_1.default(Object.assign(Object.assign({}, clientArgs), settings));
|
|
16
16
|
};
|
|
17
17
|
exports.initClient = initClient;
|
|
18
18
|
/**
|
|
@@ -97,46 +97,72 @@ const getDeepLink = (uri, metadata, { removeWCUri = false, } = {}) => {
|
|
|
97
97
|
return uri;
|
|
98
98
|
};
|
|
99
99
|
exports.getDeepLink = getDeepLink;
|
|
100
|
-
const
|
|
100
|
+
const createSession = (client) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
101
|
+
return new Promise((resolve, reject) => {
|
|
102
|
+
try {
|
|
103
|
+
client.on('connect', (error, payload) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
104
|
+
if (error)
|
|
105
|
+
throw error;
|
|
106
|
+
resolve(payload);
|
|
107
|
+
}));
|
|
108
|
+
client.on('disconnect', (error, payload) => {
|
|
109
|
+
throw error || payload.params[0].message;
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
catch (e) {
|
|
113
|
+
reject(e);
|
|
114
|
+
}
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
exports.createSession = createSession;
|
|
118
|
+
const useDeepLink = (metadata, wcClient, opts) => {
|
|
101
119
|
var _a, _b, _c;
|
|
102
|
-
|
|
103
|
-
const [accountPublicAddress] = client.accounts;
|
|
104
|
-
return accountPublicAddress;
|
|
105
|
-
}
|
|
106
|
-
// createSession will trigger the QR code...
|
|
107
|
-
yield client.createSession();
|
|
120
|
+
const deepLink = (0, exports.getDeepLink)(wcClient.uri, metadata);
|
|
108
121
|
if ((0, isMobile_1.isMobile)()) {
|
|
109
|
-
const deepLink = (0, exports.getDeepLink)(client.uri, metadata);
|
|
110
122
|
window.location.href = deepLink;
|
|
111
123
|
}
|
|
112
124
|
else {
|
|
113
125
|
if ((_a = metadata === null || metadata === void 0 ? void 0 : metadata.desktop) === null || _a === void 0 ? void 0 : _a.native) {
|
|
114
|
-
|
|
115
|
-
(_b = opts === null || opts === void 0 ? void 0 : opts.onDesktopUri) === null || _b === void 0 ? void 0 : _b.call(opts, uri);
|
|
126
|
+
(_b = opts === null || opts === void 0 ? void 0 : opts.onDesktopUri) === null || _b === void 0 ? void 0 : _b.call(opts, deepLink);
|
|
116
127
|
}
|
|
117
|
-
(_c = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _c === void 0 ? void 0 : _c.call(opts,
|
|
128
|
+
(_c = opts === null || opts === void 0 ? void 0 : opts.onDisplayUri) === null || _c === void 0 ? void 0 : _c.call(opts, wcClient.uri);
|
|
118
129
|
}
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
130
|
+
};
|
|
131
|
+
exports.useDeepLink = useDeepLink;
|
|
132
|
+
const fetchWalletConnectCosmosPublicAddress = (metadata, wcClient, provider, opts) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
133
|
+
var _a;
|
|
134
|
+
if (wcClient.connected) {
|
|
135
|
+
const key = yield provider.getKey(opts.chainId);
|
|
136
|
+
return key.bech32Address;
|
|
137
|
+
}
|
|
138
|
+
yield wcClient.createSession();
|
|
139
|
+
(0, exports.useDeepLink)(metadata, wcClient, opts);
|
|
140
|
+
const payload = yield (0, exports.createSession)(wcClient);
|
|
141
|
+
const key = yield provider.getKey(opts.chainId);
|
|
142
|
+
(_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
|
|
143
|
+
wcClient.accounts = [key.bech32Address];
|
|
144
|
+
return key.bech32Address;
|
|
145
|
+
});
|
|
146
|
+
exports.fetchWalletConnectCosmosPublicAddress = fetchWalletConnectCosmosPublicAddress;
|
|
147
|
+
const fetchWalletConnectEVMPublicAddress = (metadata, wcClient, opts) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
148
|
+
var _b;
|
|
149
|
+
if (wcClient.connected) {
|
|
150
|
+
const [accountPublicAddress] = wcClient.accounts;
|
|
151
|
+
return accountPublicAddress;
|
|
152
|
+
}
|
|
153
|
+
// createSession will trigger the QR code...
|
|
154
|
+
yield wcClient.createSession();
|
|
155
|
+
(0, exports.useDeepLink)(metadata, wcClient, opts);
|
|
156
|
+
const payload = yield (0, exports.createSession)(wcClient);
|
|
157
|
+
(_b = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _b === void 0 ? void 0 : _b.call(opts, payload);
|
|
158
|
+
const [accountPublicAddress] = payload.params[0].accounts;
|
|
159
|
+
return accountPublicAddress;
|
|
134
160
|
});
|
|
135
|
-
exports.
|
|
161
|
+
exports.fetchWalletConnectEVMPublicAddress = fetchWalletConnectEVMPublicAddress;
|
|
136
162
|
const signWalletConnectPersonalMessage = (messageToSign, metadata, client) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
137
|
-
var
|
|
138
|
-
const isCryptoWallet = ((
|
|
139
|
-
((
|
|
163
|
+
var _c, _d;
|
|
164
|
+
const isCryptoWallet = ((_c = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _c === void 0 ? void 0 : _c.name) === 'Crypto.com | DeFi Wallet' ||
|
|
165
|
+
((_d = client === null || client === void 0 ? void 0 : client.peerMeta) === null || _d === void 0 ? void 0 : _d.name) === 'DeFi Wallet';
|
|
140
166
|
if (!client || !client.connected) {
|
|
141
167
|
return;
|
|
142
168
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"walletConnect.js","sourceRoot":"","sources":["../../../../../../../packages/multi-wallet/src/wallets/clients/walletConnect/walletConnect.ts"],"names":[],"mappings":";;;;AAAA,2EAA2C;
|
|
1
|
+
{"version":3,"file":"walletConnect.js","sourceRoot":"","sources":["../../../../../../../packages/multi-wallet/src/wallets/clients/walletConnect/walletConnect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { TypedData } from 'starknet/dist/utils/typedData';
|
|
2
2
|
export declare const infuraId = "87939db78f824920ada5c872db3e56b8";
|
|
3
|
-
export declare const
|
|
4
|
-
export declare const
|
|
3
|
+
export declare const ETH_STARKNET_ADDRESS = "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7";
|
|
4
|
+
export declare const DEFAULT_STARKNET_TYPED_DATA_DOMAIN: Partial<TypedData>;
|
package/src/wallets/constants.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.DEFAULT_STARKNET_TYPED_DATA_DOMAIN = exports.ETH_STARKNET_ADDRESS = exports.infuraId = void 0;
|
|
4
4
|
exports.infuraId = '87939db78f824920ada5c872db3e56b8';
|
|
5
|
-
exports.
|
|
6
|
-
exports.
|
|
5
|
+
exports.ETH_STARKNET_ADDRESS = '0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7';
|
|
6
|
+
exports.DEFAULT_STARKNET_TYPED_DATA_DOMAIN = {
|
|
7
7
|
domain: {
|
|
8
8
|
name: 'Dynamic Sample dApp',
|
|
9
9
|
version: '0.0.1',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../packages/multi-wallet/src/wallets/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,QAAQ,GAAG,kCAAkC,CAAC;AAE9C,QAAA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../packages/multi-wallet/src/wallets/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,QAAQ,GAAG,kCAAkC,CAAC;AAE9C,QAAA,oBAAoB,GAC/B,oEAAoE,CAAC;AAE1D,QAAA,kCAAkC,GAAuB;IACpE,MAAM,EAAE;QACN,IAAI,EAAE,qBAAqB;QAC3B,OAAO,EAAE,OAAO;KACjB;CACF,CAAC"}
|
|
@@ -1,8 +1,53 @@
|
|
|
1
|
+
import { KeplrWalletConnectV1 } from '@keplr-wallet/wc-client';
|
|
2
|
+
import Client from '@walletconnect/client';
|
|
3
|
+
import { OfflineAminoSigner } from '@keplr-wallet/types';
|
|
4
|
+
import { Chain, FetchPublicAddressOpts, WalletConnector, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
|
|
1
5
|
import { EvmNetwork } from '../ethereum/evm-network';
|
|
2
|
-
import
|
|
3
|
-
declare class KeplrWalletConnect
|
|
6
|
+
import { SwitchNetworkOps } from '../ethereum/ethProvider';
|
|
7
|
+
declare class KeplrWalletConnect implements WalletConnector {
|
|
4
8
|
constructor({ evmNetworks }: {
|
|
5
9
|
evmNetworks: EvmNetwork[];
|
|
6
10
|
});
|
|
11
|
+
name: string;
|
|
12
|
+
isWalletConnect: boolean;
|
|
13
|
+
switchNetworkOnlyFromWallet: boolean;
|
|
14
|
+
client?: Client;
|
|
15
|
+
clientOptions: {
|
|
16
|
+
signingMethods: string[];
|
|
17
|
+
};
|
|
18
|
+
evmNetworks?: EvmNetwork[];
|
|
19
|
+
selectedNetworkId: number;
|
|
20
|
+
chainIdMap: Record<number, string>;
|
|
21
|
+
supportedChains: Chain[];
|
|
22
|
+
connectedChain: Chain;
|
|
23
|
+
providerResources?: string[];
|
|
24
|
+
canConnectViaCustodialService: boolean;
|
|
25
|
+
canConnectViaQrCode: boolean;
|
|
26
|
+
_keplrInstance?: KeplrWalletConnectV1;
|
|
27
|
+
get key(): string;
|
|
28
|
+
get evmNetwork(): EvmNetwork | undefined;
|
|
29
|
+
get selectedNetwork(): EvmNetwork | undefined;
|
|
30
|
+
get lcdUrl(): string | undefined;
|
|
31
|
+
get denom(): string | undefined;
|
|
32
|
+
get chainId(): string;
|
|
33
|
+
getProvider(): KeplrWalletConnectV1;
|
|
34
|
+
getClient(): Client;
|
|
35
|
+
getNetwork(): Promise<number>;
|
|
36
|
+
switchNetwork({ networkChainId }: SwitchNetworkOps): Promise<void>;
|
|
37
|
+
signMessage(messageToSign: string): Promise<string | undefined>;
|
|
38
|
+
fetchPublicAddress(opts?: FetchPublicAddressOpts): Promise<string | undefined>;
|
|
39
|
+
getBalance(): Promise<string>;
|
|
40
|
+
connect(): Promise<void>;
|
|
41
|
+
endSession(): Promise<void>;
|
|
42
|
+
getConnectedAccounts(): Promise<string[]>;
|
|
43
|
+
getDeepLink(): string | undefined;
|
|
44
|
+
getRpcProvider(): Promise<unknown>;
|
|
45
|
+
getSigner(): Promise<OfflineAminoSigner | undefined>;
|
|
46
|
+
getWeb3Provider(): KeplrWalletConnectV1 | undefined;
|
|
47
|
+
isInstalledOnBrowser(): boolean;
|
|
48
|
+
proveOwnership(messageToSign: string): Promise<string | undefined>;
|
|
49
|
+
setupEventListeners(listeners: WalletEventListeners): () => void;
|
|
50
|
+
teardownEventListeners(): void;
|
|
51
|
+
supportsNetworkSwitching(): boolean;
|
|
7
52
|
}
|
|
8
53
|
export default KeplrWalletConnect;
|
|
@@ -1,10 +1,209 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
const
|
|
5
|
-
|
|
4
|
+
const wc_client_1 = require("@keplr-wallet/wc-client");
|
|
5
|
+
const wallet_book_1 = require("@dynamic-labs/wallet-book");
|
|
6
|
+
const walletConnect_1 = require("../clients/walletConnect");
|
|
7
|
+
const isMobile_1 = require("../../utils/isMobile");
|
|
8
|
+
const logger_1 = require("../../utils/logger");
|
|
9
|
+
const normalizeWalletName_1 = require("../../utils/normalizeWalletName");
|
|
10
|
+
const DYNAMIC_KEPLR_NETWORK_ID = 'dynamic_keplr_wc_network_id';
|
|
11
|
+
class KeplrWalletConnect {
|
|
6
12
|
constructor({ evmNetworks }) {
|
|
7
|
-
|
|
13
|
+
var _a;
|
|
14
|
+
this.name = 'Keplr';
|
|
15
|
+
this.isWalletConnect = true;
|
|
16
|
+
this.switchNetworkOnlyFromWallet = false;
|
|
17
|
+
this.clientOptions = {
|
|
18
|
+
signingMethods: [
|
|
19
|
+
'keplr_enable_wallet_connect_v1',
|
|
20
|
+
'keplr_sign_amino_wallet_connect_v1',
|
|
21
|
+
],
|
|
22
|
+
};
|
|
23
|
+
this.chainIdMap = {
|
|
24
|
+
401: 'cosmoshub-4',
|
|
25
|
+
402: 'axelar-dojo-1',
|
|
26
|
+
403: 'osmosis-1',
|
|
27
|
+
};
|
|
28
|
+
this.supportedChains = ['COSMOS'];
|
|
29
|
+
this.connectedChain = 'COSMOS';
|
|
30
|
+
this.canConnectViaCustodialService = false;
|
|
31
|
+
this.canConnectViaQrCode = true;
|
|
32
|
+
this.evmNetworks = evmNetworks;
|
|
33
|
+
const persistedNetworkId = localStorage.getItem(DYNAMIC_KEPLR_NETWORK_ID);
|
|
34
|
+
if (persistedNetworkId) {
|
|
35
|
+
this.selectedNetworkId = Number(persistedNetworkId);
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
this.selectedNetworkId = ((_a = evmNetworks[0]) === null || _a === void 0 ? void 0 : _a.chainId) || 401;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
get key() {
|
|
42
|
+
return (0, normalizeWalletName_1.normalizeWalletName)(this.name);
|
|
43
|
+
}
|
|
44
|
+
get evmNetwork() {
|
|
45
|
+
var _a;
|
|
46
|
+
return (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.find((network) => network.chainId === this.selectedNetworkId);
|
|
47
|
+
}
|
|
48
|
+
get selectedNetwork() {
|
|
49
|
+
var _a;
|
|
50
|
+
return (_a = this.evmNetworks) === null || _a === void 0 ? void 0 : _a.find((network) => network.networkId === this.selectedNetworkId);
|
|
51
|
+
}
|
|
52
|
+
get lcdUrl() {
|
|
53
|
+
var _a;
|
|
54
|
+
return (_a = this.selectedNetwork) === null || _a === void 0 ? void 0 : _a.lcdUrl;
|
|
55
|
+
}
|
|
56
|
+
get denom() {
|
|
57
|
+
var _a;
|
|
58
|
+
return (_a = this.selectedNetwork) === null || _a === void 0 ? void 0 : _a.nativeCurrency.denom;
|
|
59
|
+
}
|
|
60
|
+
get chainId() {
|
|
61
|
+
if (!this.selectedNetwork) {
|
|
62
|
+
return 'osmosis-1';
|
|
63
|
+
}
|
|
64
|
+
return this.chainIdMap[this.selectedNetwork.chainId];
|
|
65
|
+
}
|
|
66
|
+
getProvider() {
|
|
67
|
+
if (this.client && !this._keplrInstance) {
|
|
68
|
+
this._keplrInstance = new wc_client_1.KeplrWalletConnectV1(this.client);
|
|
69
|
+
}
|
|
70
|
+
return this._keplrInstance;
|
|
71
|
+
}
|
|
72
|
+
getClient() {
|
|
73
|
+
if (this.client) {
|
|
74
|
+
return this.client;
|
|
75
|
+
}
|
|
76
|
+
this.client = (0, walletConnect_1.initClient)((0, normalizeWalletName_1.normalizeWalletName)(this.name), this.clientOptions);
|
|
77
|
+
return this.client;
|
|
78
|
+
}
|
|
79
|
+
getNetwork() {
|
|
80
|
+
return Promise.resolve(this.selectedNetworkId);
|
|
81
|
+
}
|
|
82
|
+
switchNetwork({ networkChainId }) {
|
|
83
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
84
|
+
if (!networkChainId)
|
|
85
|
+
return;
|
|
86
|
+
try {
|
|
87
|
+
const keplr = this.getProvider();
|
|
88
|
+
yield keplr.enable(this.chainIdMap[networkChainId]);
|
|
89
|
+
this.selectedNetworkId = networkChainId;
|
|
90
|
+
localStorage.setItem(DYNAMIC_KEPLR_NETWORK_ID, networkChainId.toString());
|
|
91
|
+
}
|
|
92
|
+
catch (e) {
|
|
93
|
+
logger_1.logger.error(e);
|
|
94
|
+
}
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
signMessage(messageToSign) {
|
|
98
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
99
|
+
const keplr = this.getProvider();
|
|
100
|
+
const key = yield keplr.getKey(this.chainId);
|
|
101
|
+
const res = yield keplr.signAmino(this.chainId, key.bech32Address, {
|
|
102
|
+
// The property is required in the amino doc
|
|
103
|
+
// https://cosmos.github.io/cosmjs/latest/amino/interfaces/StdSignDoc.html
|
|
104
|
+
account_number: '0',
|
|
105
|
+
chain_id: this.chainId,
|
|
106
|
+
fee: {
|
|
107
|
+
amount: [],
|
|
108
|
+
gas: '0',
|
|
109
|
+
},
|
|
110
|
+
memo: '',
|
|
111
|
+
msgs: [{ type: 'custom/MsgSignText', value: { text: messageToSign } }],
|
|
112
|
+
sequence: '0',
|
|
113
|
+
});
|
|
114
|
+
return JSON.stringify(res);
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
fetchPublicAddress(opts) {
|
|
118
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
119
|
+
const client = this.getClient();
|
|
120
|
+
const keplr = this.getProvider();
|
|
121
|
+
return (0, walletConnect_1.fetchWalletConnectCosmosPublicAddress)((0, wallet_book_1.getWalletBookWallet)(this.name), client, keplr, Object.assign(Object.assign({}, opts), { chainId: this.chainId, onConnect: (payload) => {
|
|
122
|
+
var _a;
|
|
123
|
+
payload.params[0].chainId = this.selectedNetworkId;
|
|
124
|
+
(_a = opts === null || opts === void 0 ? void 0 : opts.onConnect) === null || _a === void 0 ? void 0 : _a.call(opts, payload);
|
|
125
|
+
} }));
|
|
126
|
+
});
|
|
127
|
+
}
|
|
128
|
+
getBalance() {
|
|
129
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
130
|
+
const address = yield this.fetchPublicAddress();
|
|
131
|
+
if (!address)
|
|
132
|
+
throw new Error('Address not found');
|
|
133
|
+
try {
|
|
134
|
+
const response = yield fetch(`${this.lcdUrl}/cosmos/bank/v1beta1/balances/${address}`).then((res) => res.json());
|
|
135
|
+
const balance = response.balances.reduce((acc, cur) => {
|
|
136
|
+
if (cur.denom === this.denom) {
|
|
137
|
+
return Number(cur.amount) / 1e6;
|
|
138
|
+
}
|
|
139
|
+
return acc;
|
|
140
|
+
}, 0);
|
|
141
|
+
return balance.toString();
|
|
142
|
+
}
|
|
143
|
+
catch (e) {
|
|
144
|
+
logger_1.logger.error(e);
|
|
145
|
+
return '0';
|
|
146
|
+
}
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
connect() {
|
|
150
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
151
|
+
yield this.fetchPublicAddress();
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
endSession() {
|
|
155
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
156
|
+
(0, walletConnect_1.killWalletConnectSession)(this.getClient());
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
getConnectedAccounts() {
|
|
160
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
161
|
+
const address = yield this.fetchPublicAddress({ chainId: this.chainId });
|
|
162
|
+
if (address)
|
|
163
|
+
return [address];
|
|
164
|
+
return [];
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
getDeepLink() {
|
|
168
|
+
var _a;
|
|
169
|
+
const wallet = (0, wallet_book_1.getWalletBookWallet)(this.name);
|
|
170
|
+
if (!(0, isMobile_1.isMobile)() && !((_a = wallet.desktop) === null || _a === void 0 ? void 0 : _a.native)) {
|
|
171
|
+
return undefined;
|
|
172
|
+
}
|
|
173
|
+
return (0, walletConnect_1.getDeepLink)(this.getClient().uri, wallet, {
|
|
174
|
+
removeWCUri: (0, isMobile_1.isIOS)() && (0, normalizeWalletName_1.normalizeWalletName)(this.name) === 'cryptocom',
|
|
175
|
+
});
|
|
176
|
+
}
|
|
177
|
+
getRpcProvider() {
|
|
178
|
+
throw new Error('Method not implemented.');
|
|
179
|
+
}
|
|
180
|
+
getSigner() {
|
|
181
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
182
|
+
const keplr = this.getProvider();
|
|
183
|
+
return keplr.getOfflineSigner(this.chainId);
|
|
184
|
+
});
|
|
185
|
+
}
|
|
186
|
+
getWeb3Provider() {
|
|
187
|
+
return this.getProvider();
|
|
188
|
+
}
|
|
189
|
+
isInstalledOnBrowser() {
|
|
190
|
+
return false;
|
|
191
|
+
}
|
|
192
|
+
proveOwnership(messageToSign) {
|
|
193
|
+
return this.signMessage(messageToSign);
|
|
194
|
+
}
|
|
195
|
+
setupEventListeners(listeners) {
|
|
196
|
+
return (0, walletConnect_1.setupWalletConnectEventListeners)({
|
|
197
|
+
onAccountChange: listeners.onAccountChange,
|
|
198
|
+
onChainChange: listeners.onChainChange,
|
|
199
|
+
onDisconnect: listeners.onDisconnect,
|
|
200
|
+
}, this.getClient());
|
|
201
|
+
}
|
|
202
|
+
teardownEventListeners() {
|
|
203
|
+
(0, walletConnect_1.teardownWalletConnectEventListeners)(this.getClient());
|
|
204
|
+
}
|
|
205
|
+
supportsNetworkSwitching() {
|
|
206
|
+
return true;
|
|
8
207
|
}
|
|
9
208
|
}
|
|
10
209
|
exports.default = KeplrWalletConnect;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keplrWalletConnect.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/cosmos/keplrWalletConnect.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"keplrWalletConnect.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/cosmos/keplrWalletConnect.ts"],"names":[],"mappings":"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"}
|
package/src/wallets/ethereum/MagicConnector/EmailMagicWalletConnector/EmailMagicWalletConnector.js
CHANGED
|
@@ -35,7 +35,7 @@ class EmailMagicWalletConnector extends MagicWalletConnector_1.MagicWalletConnec
|
|
|
35
35
|
loginWithMagic() {
|
|
36
36
|
var _a;
|
|
37
37
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
38
|
-
const client = this.
|
|
38
|
+
const client = this.getClient();
|
|
39
39
|
const user = yield this.getUserMetadata();
|
|
40
40
|
if (user && user.publicAddress) {
|
|
41
41
|
this.setEmail((user === null || user === void 0 ? void 0 : user.email) || '');
|
|
@@ -46,7 +46,7 @@ class EmailMagicWalletConnector extends MagicWalletConnector_1.MagicWalletConnec
|
|
|
46
46
|
return;
|
|
47
47
|
return client.auth.loginWithMagicLink({
|
|
48
48
|
email,
|
|
49
|
-
redirectURI: (_a = this.
|
|
49
|
+
redirectURI: (_a = this.config) === null || _a === void 0 ? void 0 : _a.redirectURI,
|
|
50
50
|
showUI: false,
|
|
51
51
|
});
|
|
52
52
|
});
|