@dynamic-labs/multi-wallet 0.15.15 → 0.15.17
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 +15 -0
- package/package.json +3 -3
- package/src/utils/CancellablePromise/CancellablePromise.d.ts +9 -0
- package/src/utils/CancellablePromise/CancellablePromise.js +32 -0
- package/src/utils/CancellablePromise/CancellablePromise.js.map +1 -0
- package/src/utils/CancellablePromise/index.d.ts +1 -0
- package/src/utils/CancellablePromise/index.js +6 -0
- package/src/utils/CancellablePromise/index.js.map +1 -0
- package/src/wallets/ethereum/MagicConnector/MagicConnector.d.ts +3 -0
- package/src/wallets/ethereum/MagicConnector/MagicConnector.js +8 -2
- package/src/wallets/ethereum/MagicConnector/MagicConnector.js.map +1 -1
- package/src/wallets/ethereum/ethProviderHelper.d.ts +0 -1
- package/src/wallets/ethereum/ethProviderHelper.js +14 -10
- package/src/wallets/ethereum/ethProviderHelper.js.map +1 -1
- package/src/wallets/window.d.ts +6 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,4 +1,19 @@
|
|
|
1
1
|
|
|
2
|
+
### [0.15.17](https://github.com/dynamic-labs/DynamicAuth/compare/v0.15.16...v0.15.17) (2023-03-24)
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
### Features
|
|
6
|
+
|
|
7
|
+
* support phantom evm in non-override mode ([f2c84c3](https://github.com/dynamic-labs/DynamicAuth/commit/f2c84c368f4e25c645f9022f211e9397044159e3))
|
|
8
|
+
|
|
9
|
+
### [0.15.16](https://github.com/dynamic-labs/DynamicAuth/compare/v0.15.15...v0.15.16) (2023-03-24)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
### Bug Fixes
|
|
13
|
+
|
|
14
|
+
* **magic_wallet:** prevent failure when email is edited ([3caa374](https://github.com/dynamic-labs/DynamicAuth/commit/3caa3744a7dbcd1f5d7515e271fe0df53364a81d))
|
|
15
|
+
* remove dep on multi-wallet in wagmi connector ([9475f3d](https://github.com/dynamic-labs/DynamicAuth/commit/9475f3dd42e1ae3d6b56f61afe342dcaeed8699a))
|
|
16
|
+
|
|
2
17
|
### [0.15.15](https://github.com/dynamic-labs/DynamicAuth/compare/v0.15.14...v0.15.15) (2023-03-23)
|
|
3
18
|
|
|
4
19
|
|
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.17",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/dynamic-labs/DynamicAuth.git",
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
"react-dom": "18.2.0",
|
|
26
26
|
"starknet": "3.19.0",
|
|
27
27
|
"tslib": "2.4.1",
|
|
28
|
-
"@dynamic-labs/logger": "0.15.
|
|
29
|
-
"@dynamic-labs/wallet-connector-core": "0.15.
|
|
28
|
+
"@dynamic-labs/logger": "0.15.17",
|
|
29
|
+
"@dynamic-labs/wallet-connector-core": "0.15.17"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
32
32
|
"@walletconnect/types": "^2.2.1"
|
|
@@ -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 {};
|
|
@@ -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
|
|
@@ -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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { CancellablePromise } from './CancellablePromise';
|
|
@@ -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
|
|
@@ -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"}
|
|
@@ -2,6 +2,7 @@ import { Magic as MagicClient, MagicSDKAdditionalConfiguration, MagicSDKExtensio
|
|
|
2
2
|
import { ethers } from 'ethers';
|
|
3
3
|
import { Chain, EmailWalletConnector, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
|
|
4
4
|
import { WalletUiUtils } from '../../../types';
|
|
5
|
+
import { CancellablePromise } from '../../../utils/CancellablePromise';
|
|
5
6
|
import { EvmNetwork } from './../evm-network';
|
|
6
7
|
export type MagicLinkConfig = Pick<MagicSDKAdditionalConfiguration<string, MagicSDKExtensionsOption<string>>, 'network' | 'testMode' | 'locale'> & {
|
|
7
8
|
redirectURI?: string;
|
|
@@ -24,12 +25,14 @@ export declare class MagicConnector implements EmailWalletConnector {
|
|
|
24
25
|
_provider: ethers.providers.Web3Provider | undefined;
|
|
25
26
|
_config: MagicLinkConfig | undefined;
|
|
26
27
|
_listeners: WalletEventListeners | undefined;
|
|
28
|
+
_currentAuthCancellablePromise: CancellablePromise<string | null> | undefined;
|
|
27
29
|
constructor({ apiKey, walletUiUtils, evmNetworks, config, }: {
|
|
28
30
|
apiKey: string;
|
|
29
31
|
config?: MagicLinkConfig;
|
|
30
32
|
evmNetworks: EvmNetwork[];
|
|
31
33
|
walletUiUtils: WalletUiUtils;
|
|
32
34
|
});
|
|
35
|
+
cancelPreviousEmail(): void;
|
|
33
36
|
getDeepLink(): string | undefined;
|
|
34
37
|
_getClient(): Promise<MagicClient<MagicSDKExtensionsOption<string>>>;
|
|
35
38
|
get email(): string | undefined;
|
|
@@ -7,6 +7,7 @@ const ethers_1 = require("ethers");
|
|
|
7
7
|
const errors_1 = require("../../../errors");
|
|
8
8
|
const logger_1 = require("../../../utils/logger");
|
|
9
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
|
}
|
|
@@ -94,11 +99,12 @@ class MagicConnector {
|
|
|
94
99
|
if (!email)
|
|
95
100
|
return;
|
|
96
101
|
try {
|
|
97
|
-
|
|
102
|
+
this._currentAuthCancellablePromise = CancellablePromise_1.CancellablePromise.fromPromise(client.auth.loginWithMagicLink({
|
|
98
103
|
email,
|
|
99
104
|
redirectURI: (_a = this._config) === null || _a === void 0 ? void 0 : _a.redirectURI,
|
|
100
105
|
showUI: false,
|
|
101
|
-
});
|
|
106
|
+
}));
|
|
107
|
+
yield this._currentAuthCancellablePromise;
|
|
102
108
|
}
|
|
103
109
|
catch (err) {
|
|
104
110
|
logger_1.logger.error(err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MagicConnector.js","sourceRoot":"","sources":["../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/MagicConnector.ts"],"names":[],"mappings":";;;;AAAA,yCAKmB;AACnB,mCAAgC;AAQhC,4CAA+C;AAC/C,kDAA+C;AAE/C,0GAAuG;
|
|
1
|
+
{"version":3,"file":"MagicConnector.js","sourceRoot":"","sources":["../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/MagicConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,6 @@ export declare class EthProviderHelper {
|
|
|
19
19
|
};
|
|
20
20
|
installedProviderLookup(providerFlags: Array<ProviderCondition>): IEthereum | undefined;
|
|
21
21
|
allInstalledProviders(): IEthereum[];
|
|
22
|
-
findEthereumProviders(ethereum?: IEthereum): IEthereum[];
|
|
23
22
|
isInstalledHelper(walletName: string): boolean;
|
|
24
23
|
findProvider(walletName: string): ethers.providers.Web3Provider | undefined;
|
|
25
24
|
fetchPublicAddressWithName(name: string): Promise<string | undefined>;
|
|
@@ -54,20 +54,24 @@ class EthProviderHelper {
|
|
|
54
54
|
};
|
|
55
55
|
}
|
|
56
56
|
installedProviderLookup(providerFlags) {
|
|
57
|
-
|
|
57
|
+
const allInstalledProviders = this.allInstalledProviders();
|
|
58
|
+
return (0, ProviderLookup_1.ProviderLookup)(allInstalledProviders, providerFlags);
|
|
58
59
|
}
|
|
59
60
|
allInstalledProviders() {
|
|
60
|
-
|
|
61
|
-
}
|
|
62
|
-
findEthereumProviders(ethereum) {
|
|
61
|
+
var _a;
|
|
63
62
|
const ethereumProviders = [];
|
|
64
|
-
if (ethereum
|
|
65
|
-
|
|
63
|
+
if (window.ethereum) {
|
|
64
|
+
if (!window.ethereum.providers) {
|
|
65
|
+
ethereumProviders.push(window.ethereum);
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
window.ethereum.providers.forEach((provider) => {
|
|
69
|
+
ethereumProviders.push(provider);
|
|
70
|
+
});
|
|
71
|
+
}
|
|
66
72
|
}
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
ethereumProviders.push(provider);
|
|
70
|
-
});
|
|
73
|
+
if ((_a = window.phantom) === null || _a === void 0 ? void 0 : _a.ethereum) {
|
|
74
|
+
ethereumProviders.push(window.phantom.ethereum);
|
|
71
75
|
}
|
|
72
76
|
return ethereumProviders;
|
|
73
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ethProviderHelper.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/ethProviderHelper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ethProviderHelper.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/ethereum/ethProviderHelper.ts"],"names":[],"mappings":"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"}
|
package/src/wallets/window.d.ts
CHANGED
|
@@ -37,6 +37,7 @@ export interface IWindow {
|
|
|
37
37
|
fcl_extensions: IFclProvider[] | undefined;
|
|
38
38
|
glowSolana: ISolana;
|
|
39
39
|
location: Window['location'];
|
|
40
|
+
phantom: IPhantom;
|
|
40
41
|
solana: ISolana;
|
|
41
42
|
solflare: ISolana;
|
|
42
43
|
starknet: IStarknetWindowObject;
|
|
@@ -47,6 +48,7 @@ export interface IEthereum {
|
|
|
47
48
|
isCoinbaseWallet: boolean;
|
|
48
49
|
isMetaMask: boolean;
|
|
49
50
|
isOpera: boolean;
|
|
51
|
+
isPhantom: boolean;
|
|
50
52
|
isTrustWallet: boolean;
|
|
51
53
|
providers: object[];
|
|
52
54
|
request: <T extends string>(params: {
|
|
@@ -73,3 +75,7 @@ export interface ISolana {
|
|
|
73
75
|
export interface IFclProvider {
|
|
74
76
|
id: string;
|
|
75
77
|
}
|
|
78
|
+
export interface IPhantom {
|
|
79
|
+
ethereum: IEthereum;
|
|
80
|
+
solana: ISolana;
|
|
81
|
+
}
|