@dynamic-labs/multi-wallet 0.15.14 → 0.15.16

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.
Files changed (21) hide show
  1. package/CHANGELOG.md +17 -0
  2. package/package.json +5 -3
  3. package/src/index.d.ts +1 -1
  4. package/src/index.js +1 -1
  5. package/src/index.js.map +1 -1
  6. package/src/multi-wallet.js +2 -2
  7. package/src/multi-wallet.js.map +1 -1
  8. package/src/types.d.ts +1 -1
  9. package/src/utils/CancellablePromise/CancellablePromise.d.ts +9 -0
  10. package/src/utils/CancellablePromise/CancellablePromise.js +32 -0
  11. package/src/utils/CancellablePromise/CancellablePromise.js.map +1 -0
  12. package/src/utils/CancellablePromise/index.d.ts +1 -0
  13. package/src/utils/CancellablePromise/index.js +6 -0
  14. package/src/utils/CancellablePromise/index.js.map +1 -0
  15. package/src/wallets/ethereum/{MagicLink.d.ts → MagicConnector/MagicConnector.d.ts} +11 -6
  16. package/src/wallets/ethereum/{MagicLink.js → MagicConnector/MagicConnector.js} +29 -12
  17. package/src/wallets/ethereum/MagicConnector/MagicConnector.js.map +1 -0
  18. package/src/wallets/ethereum/MagicConnector/index.d.ts +2 -0
  19. package/src/wallets/ethereum/MagicConnector/index.js +6 -0
  20. package/src/wallets/ethereum/MagicConnector/index.js.map +1 -0
  21. package/src/wallets/ethereum/MagicLink.js.map +0 -1
package/CHANGELOG.md CHANGED
@@ -1,4 +1,21 @@
1
1
 
2
+ ### [0.15.16](https://github.com/dynamic-labs/DynamicAuth/compare/v0.15.15...v0.15.16) (2023-03-24)
3
+
4
+
5
+ ### Bug Fixes
6
+
7
+ * **magic_wallet:** prevent failure when email is edited ([3caa374](https://github.com/dynamic-labs/DynamicAuth/commit/3caa3744a7dbcd1f5d7515e271fe0df53364a81d))
8
+ * remove dep on multi-wallet in wagmi connector ([9475f3d](https://github.com/dynamic-labs/DynamicAuth/commit/9475f3dd42e1ae3d6b56f61afe342dcaeed8699a))
9
+
10
+ ### [0.15.15](https://github.com/dynamic-labs/DynamicAuth/compare/v0.15.14...v0.15.15) (2023-03-23)
11
+
12
+
13
+ ### Bug Fixes
14
+
15
+ * **CustomerCallbacks:** make sure that we always call customer callbacks ([cad24fc](https://github.com/dynamic-labs/DynamicAuth/commit/cad24fc7a5556f2ac9ea3c2d327255fcdef1a275))
16
+ * **magic_wallet:** disconnect user when magic is logged out ([8a1885e](https://github.com/dynamic-labs/DynamicAuth/commit/8a1885ea52e078dbc5d2d4b52dcced3e97ae16a7))
17
+ * **NetworkPicker:** make sure that we use correct network picker on 'network not supported' step ([2777b35](https://github.com/dynamic-labs/DynamicAuth/commit/2777b35e0adb76857cbe155d0ce9895b534535bf))
18
+
2
19
  ### [0.15.14](https://github.com/dynamic-labs/DynamicAuth/compare/v0.15.13...v0.15.14) (2023-03-23)
3
20
 
4
21
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dynamic-labs/multi-wallet",
3
- "version": "0.15.14",
3
+ "version": "0.15.16",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -21,10 +21,12 @@
21
21
  "fortmatic": "2.4.0",
22
22
  "get-starknet": "1.5.0",
23
23
  "magic-sdk": "13.4.0",
24
+ "react": "18.2.0",
25
+ "react-dom": "18.2.0",
24
26
  "starknet": "3.19.0",
25
27
  "tslib": "2.4.1",
26
- "@dynamic-labs/logger": "0.15.14",
27
- "@dynamic-labs/wallet-connector-core": "0.15.14"
28
+ "@dynamic-labs/logger": "0.15.16",
29
+ "@dynamic-labs/wallet-connector-core": "0.15.16"
28
30
  },
29
31
  "devDependencies": {
30
32
  "@walletconnect/types": "^2.2.1"
package/src/index.d.ts CHANGED
@@ -4,7 +4,7 @@ export * from './types';
4
4
  export * from './errors';
5
5
  export * from './rpcProviders';
6
6
  export * from './utils/logger';
7
- export * from './wallets/ethereum/MagicLink';
7
+ export * from './wallets/ethereum/MagicConnector';
8
8
  export { generateMessageToSign } from './utils/message';
9
9
  export { isIPad, isIPhone, isMobile } from './utils/isMobile';
10
10
  export { normalizeWalletName } from './utils/normalizeWalletName';
package/src/index.js CHANGED
@@ -8,7 +8,7 @@ tslib_1.__exportStar(require("./types"), exports);
8
8
  tslib_1.__exportStar(require("./errors"), exports);
9
9
  tslib_1.__exportStar(require("./rpcProviders"), exports);
10
10
  tslib_1.__exportStar(require("./utils/logger"), exports);
11
- tslib_1.__exportStar(require("./wallets/ethereum/MagicLink"), exports);
11
+ tslib_1.__exportStar(require("./wallets/ethereum/MagicConnector"), exports);
12
12
  var message_1 = require("./utils/message");
13
13
  Object.defineProperty(exports, "generateMessageToSign", { enumerable: true, get: function () { return message_1.generateMessageToSign; } });
14
14
  var isMobile_1 = require("./utils/isMobile");
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,uEAA6C;AAE7C,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;AAE/B,uDAG+B;AAF7B,+GAAA,cAAc,OAAA;AACd,yHAAA,wBAAwB,OAAA;AAE1B,mDAAqD;AAA5C,6GAAA,cAAc,OAAA;AAEvB,6EAA4E;AAAnE,oIAAA,wBAAwB,OAAA;AAEjC,0EAAgD;AAChD,qEAA2C;AAI3C,gEAAsC;AAEtC,iDAAqE;AAA5D,2HAAA,8BAA8B,OAAA"}
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;AAE/B,uDAG+B;AAF7B,+GAAA,cAAc,OAAA;AACd,yHAAA,wBAAwB,OAAA;AAE1B,mDAAqD;AAA5C,6GAAA,cAAc,OAAA;AAEvB,6EAA4E;AAAnE,oIAAA,wBAAwB,OAAA;AAEjC,0EAAgD;AAChD,qEAA2C;AAI3C,gEAAsC;AAEtC,iDAAqE;AAA5D,2HAAA,8BAA8B,OAAA"}
package/src/multi-wallet.js CHANGED
@@ -36,7 +36,7 @@ const getWalletConnectConnector_1 = require("./wallets/getWalletConnectConnector
36
36
  const initializeWalletProviders_1 = require("./wallets/initializeWalletProviders");
37
37
  const logger_1 = require("./utils/logger");
38
38
  const PhantomEvm_1 = tslib_1.__importDefault(require("./wallets/ethereum/injected/PhantomEvm"));
39
- const MagicLink_1 = require("./wallets/ethereum/MagicLink");
39
+ const MagicConnector_1 = require("./wallets/ethereum/MagicConnector");
40
40
  const isEmailWalletConnector_1 = require("./utils/isEmailWalletConnector");
41
41
  var phantom_ledger_2 = require("./wallets/solana/phantom-ledger");
42
42
  Object.defineProperty(exports, "phantomLedgerWalletName", { enumerable: true, get: function () { return phantom_ledger_2.walletName; } });
@@ -110,7 +110,7 @@ const getSupportedWallets = ({ appLogoUrl, appName, isWalletConnectV2Enabled, ne
110
110
  new Opera_1.default({ evmNetworks: evmNetworkConfigs }),
111
111
  ...(magicLinkApiKey
112
112
  ? [
113
- new MagicLink_1.MagicConnector({
113
+ new MagicConnector_1.MagicConnector({
114
114
  apiKey: magicLinkApiKey,
115
115
  config: magicLinkConfig,
116
116
  evmNetworks: evmNetworkConfigs,
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":"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"}
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,7 +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
+ import { MagicLinkConfig } from './wallets/ethereum/MagicConnector';
7
7
  export type WalletConnectWalletMetadata = {
8
8
  app: {
9
9
  android: string | null;
package/src/utils/CancellablePromise/CancellablePromise.d.ts ADDED
@@ -0,0 +1,9 @@
1
+ type Executor<T> = (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: unknown) => void) => void;
2
+ export declare class CancellablePromise<T> extends Promise<T> {
3
+ _controller: AbortController;
4
+ constructor(executor: Executor<T>);
5
+ get isCancelled(): boolean;
6
+ cancel(): void;
7
+ static fromPromise<T>(promise: Promise<T>): CancellablePromise<T>;
8
+ }
9
+ export {};
package/src/utils/CancellablePromise/CancellablePromise.js ADDED
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.CancellablePromise = void 0;
4
+ class CancellablePromise extends Promise {
5
+ constructor(executor) {
6
+ super((resolve, reject) => {
7
+ executor((val) => {
8
+ if (this.isCancelled)
9
+ return;
10
+ resolve(val);
11
+ }, (err) => {
12
+ if (this.isCancelled)
13
+ return;
14
+ reject(err);
15
+ });
16
+ });
17
+ this._controller = new AbortController();
18
+ }
19
+ get isCancelled() {
20
+ return this._controller.signal.aborted;
21
+ }
22
+ cancel() {
23
+ this._controller.abort();
24
+ }
25
+ static fromPromise(promise) {
26
+ return new CancellablePromise((resolve, reject) => {
27
+ promise.then(resolve).catch(reject);
28
+ });
29
+ }
30
+ }
31
+ exports.CancellablePromise = CancellablePromise;
32
+ //# sourceMappingURL=CancellablePromise.js.map
package/src/utils/CancellablePromise/CancellablePromise.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"CancellablePromise.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/utils/CancellablePromise/CancellablePromise.ts"],"names":[],"mappings":";;;AAKA,MAAa,kBAAsB,SAAQ,OAAU;IAGnD,YAAY,QAAqB;QAC/B,KAAK,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxB,QAAQ,CACN,CAAC,GAAG,EAAE,EAAE;gBACN,IAAI,IAAI,CAAC,WAAW;oBAAE,OAAO;gBAE7B,OAAO,CAAC,GAAG,CAAC,CAAC;YACf,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;gBACN,IAAI,IAAI,CAAC,WAAW;oBAAE,OAAO;gBAE7B,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAhBL,gBAAW,GAAG,IAAI,eAAe,EAAE,CAAC;IAiBpC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC;IACzC,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED,MAAM,CAAC,WAAW,CAAI,OAAmB;QACvC,OAAO,IAAI,kBAAkB,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAChD,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAjCD,gDAiCC"}
package/src/utils/CancellablePromise/index.d.ts ADDED
@@ -0,0 +1 @@
1
+ export { CancellablePromise } from './CancellablePromise';
package/src/utils/CancellablePromise/index.js ADDED
@@ -0,0 +1,6 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.CancellablePromise = void 0;
4
+ var CancellablePromise_1 = require("./CancellablePromise");
5
+ Object.defineProperty(exports, "CancellablePromise", { enumerable: true, get: function () { return CancellablePromise_1.CancellablePromise; } });
6
+ //# sourceMappingURL=index.js.map
package/src/utils/CancellablePromise/index.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/utils/CancellablePromise/index.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAAjD,wHAAA,kBAAkB,OAAA"}
package/src/wallets/ethereum/{MagicLink.d.ts → MagicConnector/MagicConnector.d.ts} RENAMED
@@ -1,8 +1,9 @@
1
1
  import { Magic as MagicClient, MagicSDKAdditionalConfiguration, MagicSDKExtensionsOption, MagicUserMetadata } from 'magic-sdk';
2
2
  import { ethers } from 'ethers';
3
- import { Chain, EmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
4
- import { WalletUiUtils } from '../../types';
5
- import { EvmNetwork } from './evm-network';
3
+ import { Chain, EmailWalletConnector, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
4
+ import { WalletUiUtils } from '../../../types';
5
+ import { CancellablePromise } from '../../../utils/CancellablePromise';
6
+ import { EvmNetwork } from './../evm-network';
6
7
  export type MagicLinkConfig = Pick<MagicSDKAdditionalConfiguration<string, MagicSDKExtensionsOption<string>>, 'network' | 'testMode' | 'locale'> & {
7
8
  redirectURI?: string;
8
9
  };
@@ -23,19 +24,23 @@ export declare class MagicConnector implements EmailWalletConnector {
23
24
  _walletUiUtils: WalletUiUtils;
24
25
  _provider: ethers.providers.Web3Provider | undefined;
25
26
  _config: MagicLinkConfig | undefined;
27
+ _listeners: WalletEventListeners | undefined;
28
+ _currentAuthCancellablePromise: CancellablePromise<string | null> | undefined;
26
29
  constructor({ apiKey, walletUiUtils, evmNetworks, config, }: {
27
30
  apiKey: string;
28
31
  config?: MagicLinkConfig;
29
32
  evmNetworks: EvmNetwork[];
30
33
  walletUiUtils: WalletUiUtils;
31
34
  });
35
+ cancelPreviousEmail(): void;
32
36
  getDeepLink(): string | undefined;
33
37
  _getClient(): Promise<MagicClient<MagicSDKExtensionsOption<string>>>;
34
38
  get email(): string | undefined;
35
39
  setEmail(email: string): void;
36
40
  connect(): Promise<void>;
37
- endSession?(): Promise<void>;
38
- isLoggedIn(): Promise<boolean>;
41
+ endSession(): Promise<void>;
42
+ _isLoggedIn(): Promise<boolean>;
43
+ _checkIfLoggedIn(): Promise<boolean>;
39
44
  getUserMetadata(): Promise<MagicUserMetadata | undefined>;
40
45
  fetchPublicAddress(): Promise<string | undefined>;
41
46
  getBalance(): Promise<string | undefined>;
@@ -46,7 +51,7 @@ export declare class MagicConnector implements EmailWalletConnector {
46
51
  getWeb3Provider(): Promise<ethers.providers.Web3Provider>;
47
52
  isInstalledOnBrowser(): boolean;
48
53
  proveOwnership(messageToSign: string): Promise<string | undefined>;
49
- setupEventListeners(): void;
54
+ setupEventListeners(listeners: WalletEventListeners): void;
50
55
  signMessage(messageToSign: string): Promise<string | undefined>;
51
56
  supportsNetworkSwitching(): boolean;
52
57
  switchNetwork(): Promise<void>;
package/src/wallets/ethereum/{MagicLink.js → MagicConnector/MagicConnector.js} RENAMED
@@ -4,9 +4,10 @@ exports.MagicConnector = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const magic_sdk_1 = require("magic-sdk");
6
6
  const ethers_1 = require("ethers");
7
- const errors_1 = require("../../errors");
8
- const logger_1 = require("../../utils/logger");
9
- const assignConfirmationScreenToProvider_1 = require("../../utils/assignConfirmationScreenToProvider");
7
+ const errors_1 = require("../../../errors");
8
+ const logger_1 = require("../../../utils/logger");
9
+ const assignConfirmationScreenToProvider_1 = require("../../../utils/assignConfirmationScreenToProvider");
10
+ const CancellablePromise_1 = require("../../../utils/CancellablePromise");
10
11
  class MagicConnector {
11
12
  constructor({ apiKey, walletUiUtils, evmNetworks, config, }) {
12
13
  this.canConnectViaCustodialService = true;
@@ -24,6 +25,10 @@ class MagicConnector {
24
25
  this._walletUiUtils = walletUiUtils;
25
26
  this.evmNetworks = evmNetworks;
26
27
  }
28
+ cancelPreviousEmail() {
29
+ var _a;
30
+ (_a = this._currentAuthCancellablePromise) === null || _a === void 0 ? void 0 : _a.cancel();
31
+ }
27
32
  getDeepLink() {
28
33
  return undefined;
29
34
  }
@@ -55,15 +60,25 @@ class MagicConnector {
55
60
  this.setEmail('');
56
61
  });
57
62
  }
58
- isLoggedIn() {
63
+ _isLoggedIn() {
59
64
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
60
65
  const client = yield this._getClient();
61
66
  return client.user.isLoggedIn();
62
67
  });
63
68
  }
69
+ _checkIfLoggedIn() {
70
+ var _a, _b;
71
+ return tslib_1.__awaiter(this, void 0, void 0, function* () {
72
+ const isLoggedIn = yield this._isLoggedIn();
73
+ if (!isLoggedIn) {
74
+ (_b = (_a = this._listeners) === null || _a === void 0 ? void 0 : _a.onDisconnect) === null || _b === void 0 ? void 0 : _b.call(_a);
75
+ }
76
+ return isLoggedIn;
77
+ });
78
+ }
64
79
  getUserMetadata() {
65
80
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
66
- if (yield this.isLoggedIn()) {
81
+ if (yield this._isLoggedIn()) {
67
82
  const client = yield this._getClient();
68
83
  return client.user.getMetadata();
69
84
  }
@@ -84,11 +99,12 @@ class MagicConnector {
84
99
  if (!email)
85
100
  return;
86
101
  try {
87
- yield client.auth.loginWithMagicLink({
102
+ this._currentAuthCancellablePromise = CancellablePromise_1.CancellablePromise.fromPromise(client.auth.loginWithMagicLink({
88
103
  email,
89
104
  redirectURI: (_a = this._config) === null || _a === void 0 ? void 0 : _a.redirectURI,
90
105
  showUI: false,
91
- });
106
+ }));
107
+ yield this._currentAuthCancellablePromise;
92
108
  }
93
109
  catch (err) {
94
110
  logger_1.logger.error(err);
@@ -117,7 +133,7 @@ class MagicConnector {
117
133
  }
118
134
  getConnectedAccounts() {
119
135
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
120
- const isLoggedIn = yield this.isLoggedIn();
136
+ const isLoggedIn = yield this._isLoggedIn();
121
137
  if (!isLoggedIn)
122
138
  return [];
123
139
  const metadata = yield this.getUserMetadata();
@@ -161,8 +177,9 @@ class MagicConnector {
161
177
  proveOwnership(messageToSign) {
162
178
  return this.signMessage(messageToSign);
163
179
  }
164
- setupEventListeners() {
165
- return;
180
+ setupEventListeners(listeners) {
181
+ this._listeners = listeners;
182
+ this._checkIfLoggedIn();
166
183
  }
167
184
  signMessage(messageToSign) {
168
185
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -177,8 +194,8 @@ class MagicConnector {
177
194
  throw new Error('Method not implemented.');
178
195
  }
179
196
  teardownEventListeners() {
180
- return;
197
+ this._listeners = undefined;
181
198
  }
182
199
  }
183
200
  exports.MagicConnector = MagicConnector;
184
- //# sourceMappingURL=MagicLink.js.map
201
+ //# sourceMappingURL=MagicConnector.js.map
package/src/wallets/ethereum/MagicConnector/MagicConnector.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"MagicConnector.js","sourceRoot":"","sources":["../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/MagicConnector.ts"],"names":[],"mappings":"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"}
package/src/wallets/ethereum/MagicConnector/index.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ export { MagicConnector } from './MagicConnector';
2
+ export type { MagicLinkConfig } from './MagicConnector';
package/src/wallets/ethereum/MagicConnector/index.js ADDED
@@ -0,0 +1,6 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MagicConnector = void 0;
4
+ var MagicConnector_1 = require("./MagicConnector");
5
+ Object.defineProperty(exports, "MagicConnector", { enumerable: true, get: function () { return MagicConnector_1.MagicConnector; } });
6
+ //# sourceMappingURL=index.js.map
package/src/wallets/ethereum/MagicConnector/index.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/index.ts"],"names":[],"mappings":";;;AAAA,mDAAkD;AAAzC,gHAAA,cAAc,OAAA"}
package/src/wallets/ethereum/MagicLink.js.map DELETED
@@ -1 +0,0 @@
1
- {"version":3,"file":"MagicLink.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicLink.ts"],"names":[],"mappings":"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"}