@dynamic-labs/multi-wallet 0.15.7 → 0.15.9
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 +26 -0
- package/package.json +3 -3
- package/src/data/wallet-connect-wallets.json +4 -4
- package/src/multi-wallet.js +5 -4
- package/src/multi-wallet.js.map +1 -1
- package/src/types.d.ts +10 -2
- package/src/utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.js +8 -22
- package/src/utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.js.map +1 -1
- package/src/wallets/ethereum/MagicLink.d.ts +8 -3
- package/src/wallets/ethereum/MagicLink.js +5 -2
- package/src/wallets/ethereum/MagicLink.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,4 +1,30 @@
|
|
|
1
1
|
|
|
2
|
+
### [0.15.9](https://github.com/dynamic-labs/DynamicAuth/compare/v0.15.8...v0.15.9) (2023-03-17)
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
* **magic:** add network/testMode/locale/redirectURI magic configuration ([7d1b369](https://github.com/dynamic-labs/DynamicAuth/commit/7d1b369312b4a360a8b8bcae6e722ba8e603fe2a))
|
|
8
|
+
* **magic:** sendTransaction/signMessage modal improvements ([04864ae](https://github.com/dynamic-labs/DynamicAuth/commit/04864aeacae4441a497e4dacd9875f9fdcf588fb))
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* add missing width to dynamic logo to work with webkit browsers ([b0a35e4](https://github.com/dynamic-labs/DynamicAuth/commit/b0a35e4ea860b26b8fe70679ea054b7f592d79ae))
|
|
14
|
+
* **IconWithSpinner:** show the icon with correct size ([d2b738d](https://github.com/dynamic-labs/DynamicAuth/commit/d2b738d5f3183aba8236cb5ac02e61a24cedc7e8))
|
|
15
|
+
|
|
16
|
+
### [0.15.8](https://github.com/dynamic-labs/DynamicAuth/compare/v0.15.7...v0.15.8) (2023-03-17)
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
### Features
|
|
20
|
+
|
|
21
|
+
* add modal backdrop css variables ([8d7d52b](https://github.com/dynamic-labs/DynamicAuth/commit/8d7d52bbfab6820f7020f238fb30b5fa1cd3b136))
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
### Bug Fixes
|
|
25
|
+
|
|
26
|
+
* coolwallet icon id ([ee1df9c](https://github.com/dynamic-labs/DynamicAuth/commit/ee1df9c37016e38c3ad1b61d6ff3ef6901105fb6))
|
|
27
|
+
|
|
2
28
|
### [0.15.7](https://github.com/dynamic-labs/DynamicAuth/compare/v0.15.6...v0.15.7) (2023-03-16)
|
|
3
29
|
|
|
4
30
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dynamic-labs/multi-wallet",
|
|
3
|
-
"version": "0.15.
|
|
3
|
+
"version": "0.15.9",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/dynamic-labs/DynamicAuth.git",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"magic-sdk": "13.4.0",
|
|
24
24
|
"starknet": "3.19.0",
|
|
25
25
|
"tslib": "2.4.1",
|
|
26
|
-
"@dynamic-labs/logger": "0.15.
|
|
27
|
-
"@dynamic-labs/wallet-connector-core": "0.15.
|
|
26
|
+
"@dynamic-labs/logger": "0.15.9",
|
|
27
|
+
"@dynamic-labs/wallet-connector-core": "0.15.9"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@walletconnect/types": "^2.2.1"
|
|
@@ -1095,11 +1095,11 @@
|
|
|
1095
1095
|
"versions": ["1", "2"],
|
|
1096
1096
|
"sdks": ["sign_v1", "sign_v2"],
|
|
1097
1097
|
"app_type": "wallet",
|
|
1098
|
-
"image_id": "
|
|
1098
|
+
"image_id": "f581365d-e844-4d21-8e35-44a755a32d00",
|
|
1099
1099
|
"image_url": {
|
|
1100
|
-
"sm": "https://registry.walletconnect.org/v2/logo/sm/
|
|
1101
|
-
"md": "https://registry.walletconnect.org/v2/logo/md/
|
|
1102
|
-
"lg": "https://registry.walletconnect.org/v2/logo/lg/
|
|
1100
|
+
"sm": "https://registry.walletconnect.org/v2/logo/sm/f581365d-e844-4d21-8e35-44a755a32d00",
|
|
1101
|
+
"md": "https://registry.walletconnect.org/v2/logo/md/f581365d-e844-4d21-8e35-44a755a32d00",
|
|
1102
|
+
"lg": "https://registry.walletconnect.org/v2/logo/lg/f581365d-e844-4d21-8e35-44a755a32d00"
|
|
1103
1103
|
},
|
|
1104
1104
|
"app": {
|
|
1105
1105
|
"browser": null,
|
package/src/multi-wallet.js
CHANGED
|
@@ -53,14 +53,14 @@ const defaultWalletUiUtils = {
|
|
|
53
53
|
enableInternalSign: () => {
|
|
54
54
|
throw Error('enableInternalSign, not implemented');
|
|
55
55
|
},
|
|
56
|
-
|
|
56
|
+
sendTransaction: () => {
|
|
57
57
|
throw Error('requestSendTransactionConfirmation not implemented');
|
|
58
58
|
},
|
|
59
|
-
|
|
60
|
-
throw Error('
|
|
59
|
+
signMessage: () => {
|
|
60
|
+
throw Error('signMessage not implemented');
|
|
61
61
|
},
|
|
62
62
|
};
|
|
63
|
-
const getSupportedWallets = ({ appLogoUrl, appName, isWalletConnectV2Enabled, networkConfigurations, skipMemo, vendorCredentials, walletConnectProjectId, walletUiUtils, magicLinkApiKey, } = {
|
|
63
|
+
const getSupportedWallets = ({ appLogoUrl, appName, isWalletConnectV2Enabled, networkConfigurations, skipMemo, vendorCredentials, walletConnectProjectId, walletUiUtils, magicLinkApiKey, magicLinkConfig, } = {
|
|
64
64
|
appLogoUrl: '',
|
|
65
65
|
appName: '',
|
|
66
66
|
isWalletConnectV2Enabled: false,
|
|
@@ -112,6 +112,7 @@ const getSupportedWallets = ({ appLogoUrl, appName, isWalletConnectV2Enabled, ne
|
|
|
112
112
|
? [
|
|
113
113
|
new MagicLink_1.MagicConnector({
|
|
114
114
|
apiKey: magicLinkApiKey,
|
|
115
|
+
config: magicLinkConfig,
|
|
115
116
|
evmNetworks: evmNetworkConfigs,
|
|
116
117
|
walletUiUtils: walletUiUtils || defaultWalletUiUtils,
|
|
117
118
|
}),
|
package/src/multi-wallet.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-wallet.js","sourceRoot":"","sources":["../../../../packages/multi-wallet/src/multi-wallet.ts"],"names":[],"mappings":";;;;AAEA,+EAA+C;AAC/C,mFAAmD;AACnD,2EAA2C;AAC3C,iFAAiD;AACjD,yEAAyC;AACzC,2EAA2C;AAC3C,2EAA2C;AAM3C,+CAA8D;AAC9D,qDAAkE;AAClE,yDAG+B;AAC/B,+EAA+C;AAC/C,4FAA4D;AAC5D,sFAAsD;AACtD,0FAA0D;AAC1D,sHAAsF;AACtF,4FAA4D;AAC5D,8FAA8D;AAC9D,4FAA4D;AAC5D,wGAAwE;AACxE,iFAAiD;AACjD,iFAAiD;AACjD,qFAAqD;AACrD,6FAA4D;AAC5D,4GAA4G;AAC5G,6FAA6D;AAC7D,sFAAsD;AACtD,qFAAqD;AACrD,2EAA2C;AAC3C,yEAAsE;AACtE,mEAAgE;AAChE,mFAAgF;AAChF,mFAAgF;AAChF,2CAAwC;AACxC,gGAAgE;AAChE,4DAA8D;AAC9D,2EAAwE;AACxE,kEAAwF;AAA/E,yHAAA,UAAU,OAA2B;AAE9C,IAAI,OAAO,GAAsB,EAAE,CAAC;AAEpC,4DAA4D;AAC5D,8BAA8B;AACjB,QAAA,4BAA4B,GAAG;IAC1C,UAAU;IACV,aAAa;IACb,OAAO;IACP,QAAQ;CACT,CAAC;AAEF,MAAM,oBAAoB,GAAkB;IAC1C,kBAAkB,EAAE,GAAG,EAAE;QACvB,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACrD,CAAC;IACD,
|
|
1
|
+
{"version":3,"file":"multi-wallet.js","sourceRoot":"","sources":["../../../../packages/multi-wallet/src/multi-wallet.ts"],"names":[],"mappings":"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"}
|
package/src/types.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { ethers } from 'ethers';
|
|
|
3
3
|
import type { NetworkConfiguration } from '@dynamic-labs/sdk-api';
|
|
4
4
|
import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
|
|
5
5
|
import { EvmNetwork } from './wallets/ethereum/evm-network';
|
|
6
|
+
import { MagicLinkConfig } from './wallets/ethereum/MagicLink';
|
|
6
7
|
export type WalletConnectWalletMetadata = {
|
|
7
8
|
app: {
|
|
8
9
|
android: string | null;
|
|
@@ -69,6 +70,7 @@ export type GetSupportedWalletsOpts = {
|
|
|
69
70
|
appName?: string;
|
|
70
71
|
isWalletConnectV2Enabled: boolean;
|
|
71
72
|
magicLinkApiKey?: string;
|
|
73
|
+
magicLinkConfig?: MagicLinkConfig;
|
|
72
74
|
networkConfigurations: NetworkConfigurationMap | undefined;
|
|
73
75
|
skipMemo?: boolean;
|
|
74
76
|
vendorCredentials?: VendorCredentials;
|
|
@@ -78,6 +80,12 @@ export type GetSupportedWalletsOpts = {
|
|
|
78
80
|
export type GetSupportedWallets = (opts?: GetSupportedWalletsOpts) => Promise<WalletConnector[]>;
|
|
79
81
|
export type WalletUiUtils = {
|
|
80
82
|
enableInternalSign: () => void;
|
|
81
|
-
|
|
82
|
-
|
|
83
|
+
sendTransaction: (props: {
|
|
84
|
+
handler: (transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>) => Promise<ethers.providers.TransactionResponse>;
|
|
85
|
+
transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>;
|
|
86
|
+
}) => Promise<ethers.providers.TransactionResponse>;
|
|
87
|
+
signMessage: (props: {
|
|
88
|
+
handler: (message: string | ethers.utils.Bytes) => Promise<string>;
|
|
89
|
+
message: string | ethers.utils.Bytes;
|
|
90
|
+
}) => Promise<string>;
|
|
83
91
|
};
|
|
@@ -5,38 +5,24 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const isFunction_1 = require("../isFunction");
|
|
6
6
|
const applyJsonRpcSignerGates = (jsonRpcSigner, walletUiUtils) => {
|
|
7
7
|
const originalSignMessage = jsonRpcSigner.signMessage;
|
|
8
|
-
const originalSendTransaction = jsonRpcSigner.sendTransaction;
|
|
9
8
|
const originalSendUncheckedTransaction = jsonRpcSigner.sendUncheckedTransaction;
|
|
10
9
|
if ((0, isFunction_1.isFunction)(originalSignMessage)) {
|
|
11
10
|
Object.assign(jsonRpcSigner, {
|
|
12
11
|
signMessage: (message) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
}
|
|
17
|
-
return originalSignMessage.bind(jsonRpcSigner)(message);
|
|
18
|
-
}),
|
|
19
|
-
});
|
|
20
|
-
}
|
|
21
|
-
if ((0, isFunction_1.isFunction)(originalSendTransaction)) {
|
|
22
|
-
Object.assign(jsonRpcSigner, {
|
|
23
|
-
sendTransaction: (transaction) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
24
|
-
const confirmed = yield walletUiUtils.requestSendTransactionConfirmation(transaction);
|
|
25
|
-
if (confirmed !== true) {
|
|
26
|
-
throw Error('user rejected transaction');
|
|
27
|
-
}
|
|
28
|
-
return originalSendTransaction.bind(jsonRpcSigner)(transaction);
|
|
12
|
+
return walletUiUtils.signMessage({
|
|
13
|
+
handler: originalSignMessage.bind(jsonRpcSigner),
|
|
14
|
+
message,
|
|
15
|
+
});
|
|
29
16
|
}),
|
|
30
17
|
});
|
|
31
18
|
}
|
|
32
19
|
if ((0, isFunction_1.isFunction)(originalSendUncheckedTransaction)) {
|
|
33
20
|
Object.assign(jsonRpcSigner, {
|
|
34
21
|
sendUncheckedTransaction: (transaction) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
}
|
|
39
|
-
return originalSendUncheckedTransaction.bind(jsonRpcSigner)(transaction);
|
|
22
|
+
return walletUiUtils.sendTransaction({
|
|
23
|
+
handler: originalSendUncheckedTransaction.bind(jsonRpcSigner),
|
|
24
|
+
transaction,
|
|
25
|
+
});
|
|
40
26
|
}),
|
|
41
27
|
});
|
|
42
28
|
}
|
package/src/utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assignConfirmationScreenToProvider.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.ts"],"names":[],"mappings":";;;;AAGA,8CAA2C;AAE3C,MAAM,uBAAuB,GAAG,CAG9B,aAAgB,EAChB,aAA4B,EAC5B,EAAE;IACF,MAAM,mBAAmB,GAAG,aAAa,CAAC,WAAW,CAAC;IACtD,MAAM,
|
|
1
|
+
{"version":3,"file":"assignConfirmationScreenToProvider.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/utils/assignConfirmationScreenToProvider/assignConfirmationScreenToProvider.ts"],"names":[],"mappings":";;;;AAGA,8CAA2C;AAE3C,MAAM,uBAAuB,GAAG,CAG9B,aAAgB,EAChB,aAA4B,EAC5B,EAAE;IACF,MAAM,mBAAmB,GAAG,aAAa,CAAC,WAAW,CAAC;IACtD,MAAM,gCAAgC,GACpC,aAAa,CAAC,wBAAwB,CAAC;IAEzC,IAAI,IAAA,uBAAU,EAAC,mBAAmB,CAAC,EAAE;QACnC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YAC3B,WAAW,EAAE,CAAO,OAAe,EAAE,EAAE;gBACrC,OAAA,aAAa,CAAC,WAAW,CAAC;oBACxB,OAAO,EAAE,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC;oBAChD,OAAO;iBACR,CAAC,CAAA;cAAA;SACL,CAAC,CAAC;KACJ;IAED,IAAI,IAAA,uBAAU,EAAC,gCAAgC,CAAC,EAAE;QAChD,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE;YAC3B,wBAAwB,EAAE,CACxB,WAAyE,EACzE,EAAE;gBACF,OAAA,aAAa,CAAC,eAAe,CAAC;oBAC5B,OAAO,EAAE,gCAAgC,CAAC,IAAI,CAAC,aAAa,CAAC;oBAC7D,WAAW;iBACZ,CAAC,CAAA;cAAA;SACL,CAAC,CAAC;KACJ;AACH,CAAC,CAAC;AAEF,MAAM,6CAA6C,GAAG,CACpD,MAAc,EACd,aAA4B,EAC5B,EAAE;IACF,MAAM,OAAO,GAAG,CAAC,WAAW,EAAE,oBAAoB,EAAE,kBAAkB,CAAC,CAAC;IAExE,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAC7B,MAAM,MAAM,GAAI,MAAc,CAAC,UAAU,CAAC,CAAC;QAE3C,IAAI,CAAC,IAAA,uBAAU,EAAC,MAAM,CAAC,EAAE;YACvB,OAAO;SACR;QAED,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;YACpB,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,IAAe,EAAE,EAAE;gBACnC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;gBAE5C,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,EAAE;oBACjD,6CAA6C,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;oBACrE,uBAAuB,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;iBAChD;gBAED,OAAO,MAAM,CAAC;YAChB,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEK,MAAM,kCAAkC,GAAG,CAChD,QAAuC,EACvC,aAA4B,EAC5B,EAAE,CAAC,6CAA6C,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;AAH/D,QAAA,kCAAkC,sCAG6B"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import { Magic as MagicClient, MagicUserMetadata } from 'magic-sdk';
|
|
1
|
+
import { Magic as MagicClient, MagicSDKAdditionalConfiguration, MagicSDKExtensionsOption, MagicUserMetadata } from 'magic-sdk';
|
|
2
2
|
import { ethers } from 'ethers';
|
|
3
3
|
import { Chain, EmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
|
|
4
4
|
import { WalletUiUtils } from '../../types';
|
|
5
5
|
import { EvmNetwork } from './evm-network';
|
|
6
|
+
export type MagicLinkConfig = Pick<MagicSDKAdditionalConfiguration<string, MagicSDKExtensionsOption<string>>, 'network' | 'testMode' | 'locale'> & {
|
|
7
|
+
redirectURI?: string;
|
|
8
|
+
};
|
|
6
9
|
export declare class MagicConnector implements EmailWalletConnector {
|
|
7
10
|
canConnectViaCustodialService: boolean;
|
|
8
11
|
canConnectViaQrCode: boolean;
|
|
@@ -19,12 +22,14 @@ export declare class MagicConnector implements EmailWalletConnector {
|
|
|
19
22
|
_magicSdk: MagicClient | undefined;
|
|
20
23
|
_walletUiUtils: WalletUiUtils;
|
|
21
24
|
_provider: ethers.providers.Web3Provider | undefined;
|
|
22
|
-
|
|
25
|
+
_config: MagicLinkConfig | undefined;
|
|
26
|
+
constructor({ apiKey, walletUiUtils, evmNetworks, config, }: {
|
|
23
27
|
apiKey: string;
|
|
28
|
+
config?: MagicLinkConfig;
|
|
24
29
|
evmNetworks: EvmNetwork[];
|
|
25
30
|
walletUiUtils: WalletUiUtils;
|
|
26
31
|
});
|
|
27
|
-
_getClient(): Promise<MagicClient<
|
|
32
|
+
_getClient(): Promise<MagicClient<MagicSDKExtensionsOption<string>>>;
|
|
28
33
|
get email(): string | undefined;
|
|
29
34
|
setEmail(email: string): void;
|
|
30
35
|
connect(): Promise<void>;
|
|
@@ -8,7 +8,7 @@ const errors_1 = require("../../errors");
|
|
|
8
8
|
const logger_1 = require("../../utils/logger");
|
|
9
9
|
const assignConfirmationScreenToProvider_1 = require("../../utils/assignConfirmationScreenToProvider");
|
|
10
10
|
class MagicConnector {
|
|
11
|
-
constructor({ apiKey, walletUiUtils, evmNetworks, }) {
|
|
11
|
+
constructor({ apiKey, walletUiUtils, evmNetworks, config, }) {
|
|
12
12
|
this.canConnectViaCustodialService = true;
|
|
13
13
|
this.canConnectViaQrCode = false;
|
|
14
14
|
this.connectedChain = 'EVM';
|
|
@@ -19,6 +19,7 @@ class MagicConnector {
|
|
|
19
19
|
this.canConnectViaEmail = true;
|
|
20
20
|
this.evmNetworks = [];
|
|
21
21
|
this._magicSdk = undefined;
|
|
22
|
+
this._config = config;
|
|
22
23
|
this._apiKey = apiKey;
|
|
23
24
|
this._walletUiUtils = walletUiUtils;
|
|
24
25
|
this.evmNetworks = evmNetworks;
|
|
@@ -26,7 +27,7 @@ class MagicConnector {
|
|
|
26
27
|
_getClient() {
|
|
27
28
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
28
29
|
if (!this._magicSdk) {
|
|
29
|
-
this._magicSdk = new magic_sdk_1.Magic(this._apiKey);
|
|
30
|
+
this._magicSdk = new magic_sdk_1.Magic(this._apiKey, this._config);
|
|
30
31
|
yield this._magicSdk.preload();
|
|
31
32
|
}
|
|
32
33
|
return this._magicSdk;
|
|
@@ -67,6 +68,7 @@ class MagicConnector {
|
|
|
67
68
|
});
|
|
68
69
|
}
|
|
69
70
|
fetchPublicAddress() {
|
|
71
|
+
var _a;
|
|
70
72
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
71
73
|
const client = yield this._getClient();
|
|
72
74
|
try {
|
|
@@ -81,6 +83,7 @@ class MagicConnector {
|
|
|
81
83
|
try {
|
|
82
84
|
yield client.auth.loginWithMagicLink({
|
|
83
85
|
email,
|
|
86
|
+
redirectURI: (_a = this._config) === null || _a === void 0 ? void 0 : _a.redirectURI,
|
|
84
87
|
showUI: false,
|
|
85
88
|
});
|
|
86
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MagicLink.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicLink.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"MagicLink.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicLink.ts"],"names":[],"mappings":"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"}
|