@dynamic-labs/ethereum 1.1.0-alpha.0 → 1.1.0-alpha.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.
Files changed (61) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/package.json +8 -8
  3. package/src/EthWalletConnector.cjs +7 -0
  4. package/src/EthWalletConnector.js +7 -0
  5. package/src/coinbase/coinbase.cjs +27 -8
  6. package/src/coinbase/coinbase.d.ts +2 -0
  7. package/src/coinbase/coinbase.js +27 -8
  8. package/src/index.cjs +4 -26
  9. package/src/index.d.ts +0 -1
  10. package/src/index.js +4 -16
  11. package/src/injected/ExodusEvm.cjs +7 -4
  12. package/src/injected/ExodusEvm.d.ts +4 -2
  13. package/src/injected/ExodusEvm.js +7 -4
  14. package/src/injected/PhantomEvm.cjs +6 -4
  15. package/src/injected/PhantomEvm.d.ts +4 -2
  16. package/src/injected/PhantomEvm.js +6 -4
  17. package/src/injected/fetchInjectedWalletConnectors.cjs +13 -2
  18. package/src/injected/fetchInjectedWalletConnectors.d.ts +1 -0
  19. package/src/injected/fetchInjectedWalletConnectors.js +13 -3
  20. package/src/injected/index.d.ts +1 -11
  21. package/src/injected/BloctoInjected.cjs +0 -14
  22. package/src/injected/BloctoInjected.d.ts +0 -4
  23. package/src/injected/BloctoInjected.js +0 -10
  24. package/src/injected/BraveEvm.cjs +0 -14
  25. package/src/injected/BraveEvm.d.ts +0 -4
  26. package/src/injected/BraveEvm.js +0 -10
  27. package/src/injected/Dawn.cjs +0 -14
  28. package/src/injected/Dawn.d.ts +0 -4
  29. package/src/injected/Dawn.js +0 -10
  30. package/src/injected/Frame.cjs +0 -14
  31. package/src/injected/Frame.d.ts +0 -4
  32. package/src/injected/Frame.js +0 -10
  33. package/src/injected/GameStop.cjs +0 -14
  34. package/src/injected/GameStop.d.ts +0 -4
  35. package/src/injected/GameStop.js +0 -10
  36. package/src/injected/LegacyInjectedWalletBase.cjs +0 -83
  37. package/src/injected/LegacyInjectedWalletBase.d.ts +0 -24
  38. package/src/injected/LegacyInjectedWalletBase.js +0 -81
  39. package/src/injected/Opera.cjs +0 -14
  40. package/src/injected/Opera.d.ts +0 -4
  41. package/src/injected/Opera.js +0 -10
  42. package/src/injected/Rabby.cjs +0 -15
  43. package/src/injected/Rabby.d.ts +0 -5
  44. package/src/injected/Rabby.js +0 -11
  45. package/src/injected/Superb.cjs +0 -14
  46. package/src/injected/Superb.d.ts +0 -4
  47. package/src/injected/Superb.js +0 -10
  48. package/src/injected/Trust.cjs +0 -15
  49. package/src/injected/Trust.d.ts +0 -5
  50. package/src/injected/Trust.js +0 -11
  51. package/src/injected/Zerion.cjs +0 -15
  52. package/src/injected/Zerion.d.ts +0 -5
  53. package/src/injected/Zerion.js +0 -11
  54. package/src/injected/legacyInjectedWallets.cjs +0 -48
  55. package/src/injected/legacyInjectedWallets.d.ts +0 -3
  56. package/src/injected/legacyInjectedWallets.js +0 -43
  57. package/src/legacyEthProviderHelper.cjs +0 -187
  58. package/src/legacyEthProviderHelper.d.ts +0 -34
  59. package/src/legacyEthProviderHelper.js +0 -183
  60. package/src/utils/isUnsupportedProviderError/isUnsupportedProviderError.cjs +0 -13
  61. package/src/utils/isUnsupportedProviderError/isUnsupportedProviderError.js +0 -9
package/CHANGELOG.md CHANGED
@@ -1,4 +1,13 @@
1
1
 
2
+ ## [1.1.0-alpha.2](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.1...v1.1.0-alpha.2) (2023-12-18)
3
+
4
+
5
+ ### Bug Fixes
6
+
7
+ * increase timeout when fetching wallet network ([#4197](https://github.com/dynamic-labs/DynamicAuth/issues/4197)) ([bd43d45](https://github.com/dynamic-labs/DynamicAuth/commit/bd43d452dccf36f68bd012e5737480599b93c3b5))
8
+
9
+ ## [1.1.0-alpha.1](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.0...v1.1.0-alpha.1) (2023-12-15)
10
+
2
11
  ## [1.1.0-alpha.0](https://github.com/dynamic-labs/DynamicAuth/compare/v1.0.0-alpha.14...v1.1.0-alpha.0) (2023-12-12)
3
12
 
4
13
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dynamic-labs/ethereum",
3
- "version": "1.1.0-alpha.0",
3
+ "version": "1.1.0-alpha.2",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -32,15 +32,15 @@
32
32
  "@walletconnect/universal-provider": "2.10.6",
33
33
  "eventemitter3": "5.0.1",
34
34
  "buffer": "6.0.3",
35
- "@dynamic-labs/rpc-providers": "1.1.0-alpha.0",
36
- "@dynamic-labs/turnkey": "1.1.0-alpha.0",
37
- "@dynamic-labs/types": "1.1.0-alpha.0",
38
- "@dynamic-labs/utils": "1.1.0-alpha.0",
39
- "@dynamic-labs/wallet-book": "1.1.0-alpha.0",
40
- "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.0",
35
+ "@dynamic-labs/rpc-providers": "1.1.0-alpha.2",
36
+ "@dynamic-labs/turnkey": "1.1.0-alpha.2",
37
+ "@dynamic-labs/types": "1.1.0-alpha.2",
38
+ "@dynamic-labs/utils": "1.1.0-alpha.2",
39
+ "@dynamic-labs/wallet-book": "1.1.0-alpha.2",
40
+ "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.2",
41
41
  "stream": "0.0.2"
42
42
  },
43
43
  "peerDependencies": {
44
- "viem": "^1.1.0"
44
+ "viem": "^1.19.13"
45
45
  }
46
46
  }
@@ -66,6 +66,13 @@ class EthWalletConnector extends walletConnectorCore.WalletConnectorBase {
66
66
  }
67
67
  return utils.retryableFn(provider.getChainId, {
68
68
  fallbackValue: utils.FALLBACK_UNDEFINED,
69
+ /**
70
+ * The timeout is set to 1 second because the getChainId method
71
+ * takes around 500ms to resolve on Brave. If the timeout is not set
72
+ * it will use 100ms by default and the method will fail.
73
+ * QNTM-815
74
+ */
75
+ timeoutMs: 1000,
69
76
  });
70
77
  });
71
78
  }
@@ -62,6 +62,13 @@ class EthWalletConnector extends WalletConnectorBase {
62
62
  }
63
63
  return retryableFn(provider.getChainId, {
64
64
  fallbackValue: FALLBACK_UNDEFINED,
65
+ /**
66
+ * The timeout is set to 1 second because the getChainId method
67
+ * takes around 500ms to resolve on Brave. If the timeout is not set
68
+ * it will use 100ms by default and the method will fail.
69
+ * QNTM-815
70
+ */
71
+ timeoutMs: 1000,
65
72
  });
66
73
  });
67
74
  }
@@ -4,8 +4,16 @@ Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var _tslib = require('../../_virtual/_tslib.cjs');
6
6
  var viem = require('viem');
7
+ var walletBook = require('@dynamic-labs/wallet-book');
7
8
  var EthWalletConnector = require('../EthWalletConnector.cjs');
8
- var legacyEthProviderHelper = require('../legacyEthProviderHelper.cjs');
9
+ require('../polyfills.cjs');
10
+ require('@dynamic-labs/turnkey');
11
+ require('@dynamic-labs/utils');
12
+ var ethProviderHelper = require('../ethProviderHelper.cjs');
13
+ require('../walletConnect/walletConnectV2.cjs');
14
+ require('@walletconnect/ethereum-provider');
15
+ require('@dynamic-labs/wallet-connector-core');
16
+ require('@walletconnect/client');
9
17
  var client = require('./client/client.cjs');
10
18
 
11
19
  class Coinbase extends EthWalletConnector.EthWalletConnector {
@@ -21,18 +29,26 @@ class Coinbase extends EthWalletConnector.EthWalletConnector {
21
29
  appName: appName,
22
30
  evmNetworks: evmNetworks,
23
31
  };
32
+ const wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
33
+ if (!wallet)
34
+ return;
35
+ this.ethProviderHelper = new ethProviderHelper.EthProviderHelper(wallet);
24
36
  }
25
37
  setupEventListeners() {
26
- const provider = legacyEthProviderHelper.LegacyEthProviderHelper.findProvider(this.name);
38
+ var _a, _b, _c;
39
+ const provider = (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider();
27
40
  if (!provider) {
28
41
  return;
29
42
  }
30
- const { tearDownEventListeners } = legacyEthProviderHelper.LegacyEthProviderHelper._setupEventListeners(this.name, this, viem.createPublicClient({ transport: viem.custom(provider) }));
31
- this.teardownEventListeners = tearDownEventListeners;
43
+ const setupResponse = (_c = (_b = this.ethProviderHelper) === null || _b === void 0 ? void 0 : _b._setupEventListeners) === null || _c === void 0 ? void 0 : _c.call(_b, this, viem.createPublicClient({ transport: viem.custom(provider) }));
44
+ if (!(setupResponse === null || setupResponse === void 0 ? void 0 : setupResponse.tearDownEventListeners))
45
+ return;
46
+ this.teardownEventListeners = setupResponse.tearDownEventListeners;
32
47
  }
33
48
  getWalletClient() {
49
+ var _a;
34
50
  if (this.isInstalledOnBrowser()) {
35
- return legacyEthProviderHelper.LegacyEthProviderHelper.findWalletClient(this.name);
51
+ return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient();
36
52
  }
37
53
  return viem.createWalletClient({
38
54
  transport: viem.custom(client.getCoinbaseProvider({
@@ -41,20 +57,23 @@ class Coinbase extends EthWalletConnector.EthWalletConnector {
41
57
  });
42
58
  }
43
59
  isInstalledOnBrowser() {
44
- return legacyEthProviderHelper.LegacyEthProviderHelper.isInstalledHelper(this.name);
60
+ var _a;
61
+ return ((_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
45
62
  }
46
63
  fetchPublicAddress(opts) {
64
+ var _a;
47
65
  return _tslib.__awaiter(this, void 0, void 0, function* () {
48
66
  if (this.isInstalledOnBrowser()) {
49
- return legacyEthProviderHelper.LegacyEthProviderHelper.fetchPublicAddressWithName(this.name);
67
+ return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.fetchPublicAddress();
50
68
  }
51
69
  return client.fetchPublicAddress(this.coinbaseProviderOpts, opts);
52
70
  });
53
71
  }
54
72
  signMessage(messageToSign) {
73
+ var _a;
55
74
  return _tslib.__awaiter(this, void 0, void 0, function* () {
56
75
  if (this.isInstalledOnBrowser()) {
57
- return legacyEthProviderHelper.LegacyEthProviderHelper.signMessageWithName(messageToSign, this.name);
76
+ return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.signMessage(messageToSign);
58
77
  }
59
78
  return client.signMessage(this.coinbaseProviderOpts, messageToSign);
60
79
  });
@@ -1,5 +1,6 @@
1
1
  import { Chain, FetchPublicAddressOpts } from '@dynamic-labs/wallet-connector-core';
2
2
  import { EthWalletConnector, EthWalletConnectorOpts } from '../EthWalletConnector';
3
+ import { EthProviderHelper } from '..';
3
4
  type CoinbaseOpts = EthWalletConnectorOpts & {
4
5
  appLogoUrl?: string;
5
6
  appName?: string;
@@ -10,6 +11,7 @@ export declare class Coinbase extends EthWalletConnector {
10
11
  connectedChain: Chain;
11
12
  canConnectViaQrCode: boolean;
12
13
  private coinbaseProviderOpts;
14
+ ethProviderHelper: EthProviderHelper | undefined;
13
15
  constructor({ appName, appLogoUrl, evmNetworks, ...props }: CoinbaseOpts);
14
16
  setupEventListeners(): void;
15
17
  getWalletClient(): {
@@ -1,7 +1,15 @@
1
1
  import { __rest, __awaiter } from '../../_virtual/_tslib.js';
2
2
  import { createPublicClient, custom, createWalletClient } from 'viem';
3
+ import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
3
4
  import { EthWalletConnector } from '../EthWalletConnector.js';
4
- import { LegacyEthProviderHelper } from '../legacyEthProviderHelper.js';
5
+ import '../polyfills.js';
6
+ import '@dynamic-labs/turnkey';
7
+ import '@dynamic-labs/utils';
8
+ import { EthProviderHelper } from '../ethProviderHelper.js';
9
+ import '../walletConnect/walletConnectV2.js';
10
+ import '@walletconnect/ethereum-provider';
11
+ import '@dynamic-labs/wallet-connector-core';
12
+ import '@walletconnect/client';
5
13
  import { getCoinbaseProvider, fetchPublicAddress, signMessage, killCoinbaseSession } from './client/client.js';
6
14
 
7
15
  class Coinbase extends EthWalletConnector {
@@ -17,18 +25,26 @@ class Coinbase extends EthWalletConnector {
17
25
  appName: appName,
18
26
  evmNetworks: evmNetworks,
19
27
  };
28
+ const wallet = findWalletBookWallet(this.walletBook, this.key);
29
+ if (!wallet)
30
+ return;
31
+ this.ethProviderHelper = new EthProviderHelper(wallet);
20
32
  }
21
33
  setupEventListeners() {
22
- const provider = LegacyEthProviderHelper.findProvider(this.name);
34
+ var _a, _b, _c;
35
+ const provider = (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider();
23
36
  if (!provider) {
24
37
  return;
25
38
  }
26
- const { tearDownEventListeners } = LegacyEthProviderHelper._setupEventListeners(this.name, this, createPublicClient({ transport: custom(provider) }));
27
- this.teardownEventListeners = tearDownEventListeners;
39
+ const setupResponse = (_c = (_b = this.ethProviderHelper) === null || _b === void 0 ? void 0 : _b._setupEventListeners) === null || _c === void 0 ? void 0 : _c.call(_b, this, createPublicClient({ transport: custom(provider) }));
40
+ if (!(setupResponse === null || setupResponse === void 0 ? void 0 : setupResponse.tearDownEventListeners))
41
+ return;
42
+ this.teardownEventListeners = setupResponse.tearDownEventListeners;
28
43
  }
29
44
  getWalletClient() {
45
+ var _a;
30
46
  if (this.isInstalledOnBrowser()) {
31
- return LegacyEthProviderHelper.findWalletClient(this.name);
47
+ return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findWalletClient();
32
48
  }
33
49
  return createWalletClient({
34
50
  transport: custom(getCoinbaseProvider({
@@ -37,20 +53,23 @@ class Coinbase extends EthWalletConnector {
37
53
  });
38
54
  }
39
55
  isInstalledOnBrowser() {
40
- return LegacyEthProviderHelper.isInstalledHelper(this.name);
56
+ var _a;
57
+ return ((_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.findProvider()) !== undefined;
41
58
  }
42
59
  fetchPublicAddress(opts) {
60
+ var _a;
43
61
  return __awaiter(this, void 0, void 0, function* () {
44
62
  if (this.isInstalledOnBrowser()) {
45
- return LegacyEthProviderHelper.fetchPublicAddressWithName(this.name);
63
+ return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.fetchPublicAddress();
46
64
  }
47
65
  return fetchPublicAddress(this.coinbaseProviderOpts, opts);
48
66
  });
49
67
  }
50
68
  signMessage(messageToSign) {
69
+ var _a;
51
70
  return __awaiter(this, void 0, void 0, function* () {
52
71
  if (this.isInstalledOnBrowser()) {
53
- return LegacyEthProviderHelper.signMessageWithName(messageToSign, this.name);
72
+ return (_a = this.ethProviderHelper) === null || _a === void 0 ? void 0 : _a.signMessage(messageToSign);
54
73
  }
55
74
  return signMessage(this.coinbaseProviderOpts, messageToSign);
56
75
  });
package/src/index.cjs CHANGED
@@ -4,19 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  require('./polyfills.cjs');
6
6
  var turnkey = require('@dynamic-labs/turnkey');
7
- var BloctoInjected = require('./injected/BloctoInjected.cjs');
8
- var BraveEvm = require('./injected/BraveEvm.cjs');
9
- var Dawn = require('./injected/Dawn.cjs');
10
- var ExodusEvm = require('./injected/ExodusEvm.cjs');
11
- var Frame = require('./injected/Frame.cjs');
12
- var GameStop = require('./injected/GameStop.cjs');
13
- var Opera = require('./injected/Opera.cjs');
14
7
  var PhantomEvm = require('./injected/PhantomEvm.cjs');
15
- var Trust = require('./injected/Trust.cjs');
16
- var Zerion = require('./injected/Zerion.cjs');
17
- var Rabby = require('./injected/Rabby.cjs');
8
+ var ExodusEvm = require('./injected/ExodusEvm.cjs');
18
9
  var fetchInjectedWalletConnectors = require('./injected/fetchInjectedWalletConnectors.cjs');
19
- var legacyInjectedWallets = require('./injected/legacyInjectedWallets.cjs');
20
10
  require('./walletConnect/walletConnectV2.cjs');
21
11
  require('@walletconnect/ethereum-provider');
22
12
  require('viem');
@@ -29,10 +19,9 @@ require('@walletconnect/client');
29
19
  var fetchWalletConnectWallets = require('./walletConnect/fetchWalletConnectWallets.cjs');
30
20
  var coinbase = require('./coinbase/coinbase.cjs');
31
21
  var ethProviderHelper = require('./ethProviderHelper.cjs');
32
- var legacyEthProviderHelper = require('./legacyEthProviderHelper.cjs');
33
22
 
34
23
  const EthereumWalletConnectors = (props) => [
35
- ...legacyInjectedWallets.legacyInjectedWallets,
24
+ ...fetchInjectedWalletConnectors.injectedWalletOverrides,
36
25
  ...fetchInjectedWalletConnectors.fetchInjectedWalletConnector(props),
37
26
  ...fetchWalletConnectWallets.fetchWalletConnectWallets(props),
38
27
  ...turnkey.TurnkeyWalletConnectors(props),
@@ -40,22 +29,11 @@ const EthereumWalletConnectors = (props) => [
40
29
  fetchWalletConnectWallets.getWalletConnectConnector(props),
41
30
  ];
42
31
 
43
- exports.BloctoInjected = BloctoInjected.BloctoInjected;
44
- exports.BraveEvm = BraveEvm.BraveEvm;
45
- exports.Dawn = Dawn.Dawn;
46
- exports.ExodusEvm = ExodusEvm.ExodusEvm;
47
- exports.Frame = Frame.Frame;
48
- exports.GameStop = GameStop.GameStop;
49
- exports.Opera = Opera.Opera;
50
32
  exports.PhantomEvm = PhantomEvm.PhantomEvm;
51
- exports.Trust = Trust.Trust;
52
- exports.Zerion = Zerion.Zerion;
53
- exports.Rabby = Rabby.Rabby;
33
+ exports.ExodusEvm = ExodusEvm.ExodusEvm;
54
34
  exports.fetchInjectedWalletConnector = fetchInjectedWalletConnectors.fetchInjectedWalletConnector;
55
- exports.filteredLegacyInjectedWalletKeys = legacyInjectedWallets.filteredLegacyInjectedWalletKeys;
56
- exports.legacyInjectedWallets = legacyInjectedWallets.legacyInjectedWallets;
35
+ exports.injectedWalletOverrides = fetchInjectedWalletConnectors.injectedWalletOverrides;
57
36
  exports.EthWalletConnector = EthWalletConnector.EthWalletConnector;
58
37
  exports.INFURA_ID = constants.INFURA_ID;
59
38
  exports.EthProviderHelper = ethProviderHelper.EthProviderHelper;
60
- exports.LegacyEthProviderHelper = legacyEthProviderHelper.LegacyEthProviderHelper;
61
39
  exports.EthereumWalletConnectors = EthereumWalletConnectors;
package/src/index.d.ts CHANGED
@@ -3,7 +3,6 @@ import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core'
3
3
  export * from './injected';
4
4
  export * from './EthWalletConnector';
5
5
  export * from './ethProviderHelper';
6
- export * from './legacyEthProviderHelper';
7
6
  export * from './constants';
8
7
  export * from './types';
9
8
  export declare const EthereumWalletConnectors: (props: any) => WalletConnectorConstructor[];
package/src/index.js CHANGED
@@ -1,20 +1,9 @@
1
1
  import './polyfills.js';
2
2
  import { TurnkeyWalletConnectors } from '@dynamic-labs/turnkey';
3
- export { BloctoInjected } from './injected/BloctoInjected.js';
4
- export { BraveEvm } from './injected/BraveEvm.js';
5
- export { Dawn } from './injected/Dawn.js';
6
- export { ExodusEvm } from './injected/ExodusEvm.js';
7
- export { Frame } from './injected/Frame.js';
8
- export { GameStop } from './injected/GameStop.js';
9
- export { Opera } from './injected/Opera.js';
10
3
  export { PhantomEvm } from './injected/PhantomEvm.js';
11
- export { Trust } from './injected/Trust.js';
12
- export { Zerion } from './injected/Zerion.js';
13
- export { Rabby } from './injected/Rabby.js';
14
- import { fetchInjectedWalletConnector } from './injected/fetchInjectedWalletConnectors.js';
15
- export { fetchInjectedWalletConnector } from './injected/fetchInjectedWalletConnectors.js';
16
- import { legacyInjectedWallets } from './injected/legacyInjectedWallets.js';
17
- export { filteredLegacyInjectedWalletKeys, legacyInjectedWallets } from './injected/legacyInjectedWallets.js';
4
+ export { ExodusEvm } from './injected/ExodusEvm.js';
5
+ import { injectedWalletOverrides, fetchInjectedWalletConnector } from './injected/fetchInjectedWalletConnectors.js';
6
+ export { fetchInjectedWalletConnector, injectedWalletOverrides } from './injected/fetchInjectedWalletConnectors.js';
18
7
  import './walletConnect/walletConnectV2.js';
19
8
  import '@walletconnect/ethereum-provider';
20
9
  import 'viem';
@@ -27,10 +16,9 @@ import '@walletconnect/client';
27
16
  import { fetchWalletConnectWallets, getWalletConnectConnector } from './walletConnect/fetchWalletConnectWallets.js';
28
17
  import { Coinbase } from './coinbase/coinbase.js';
29
18
  export { EthProviderHelper } from './ethProviderHelper.js';
30
- export { LegacyEthProviderHelper } from './legacyEthProviderHelper.js';
31
19
 
32
20
  const EthereumWalletConnectors = (props) => [
33
- ...legacyInjectedWallets,
21
+ ...injectedWalletOverrides,
34
22
  ...fetchInjectedWalletConnector(props),
35
23
  ...fetchWalletConnectWallets(props),
36
24
  ...TurnkeyWalletConnectors(props),
@@ -2,13 +2,16 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- var LegacyInjectedWalletBase = require('./LegacyInjectedWalletBase.cjs');
5
+ var walletBook = require('@dynamic-labs/wallet-book');
6
+ var InjectedWalletBase = require('./InjectedWalletBase.cjs');
6
7
 
7
- class ExodusEvm extends LegacyInjectedWalletBase {
8
- constructor() {
9
- super(...arguments);
8
+ // leaving ExodusEvm in here due to a backwards compatibility issue with this one wallet and v18
9
+ class ExodusEvm extends InjectedWalletBase {
10
+ constructor(props) {
11
+ super(props);
10
12
  this.name = 'ExodusEvm';
11
13
  this.walletConnectorFallback = true;
14
+ this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
12
15
  }
13
16
  }
14
17
 
@@ -1,5 +1,7 @@
1
- import LegacyInjectedWalletBase from './LegacyInjectedWalletBase';
2
- export declare class ExodusEvm extends LegacyInjectedWalletBase {
1
+ import { EthWalletConnectorOpts } from '..';
2
+ import InjectedWalletBase from './InjectedWalletBase';
3
+ export declare class ExodusEvm extends InjectedWalletBase {
3
4
  name: string;
4
5
  walletConnectorFallback: boolean;
6
+ constructor(props: EthWalletConnectorOpts);
5
7
  }
@@ -1,10 +1,13 @@
1
- import LegacyInjectedWalletBase from './LegacyInjectedWalletBase.js';
1
+ import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
2
+ import InjectedWalletBase from './InjectedWalletBase.js';
2
3
 
3
- class ExodusEvm extends LegacyInjectedWalletBase {
4
- constructor() {
5
- super(...arguments);
4
+ // leaving ExodusEvm in here due to a backwards compatibility issue with this one wallet and v18
5
+ class ExodusEvm extends InjectedWalletBase {
6
+ constructor(props) {
7
+ super(props);
6
8
  this.name = 'ExodusEvm';
7
9
  this.walletConnectorFallback = true;
10
+ this.wallet = findWalletBookWallet(this.walletBook, this.key);
8
11
  }
9
12
  }
10
13
 
@@ -4,12 +4,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var _tslib = require('../../_virtual/_tslib.cjs');
6
6
  var utils = require('@dynamic-labs/utils');
7
- var LegacyInjectedWalletBase = require('./LegacyInjectedWalletBase.cjs');
7
+ var walletBook = require('@dynamic-labs/wallet-book');
8
+ var InjectedWalletBase = require('./InjectedWalletBase.cjs');
8
9
 
9
- class PhantomEvm extends LegacyInjectedWalletBase {
10
- constructor() {
11
- super(...arguments);
10
+ class PhantomEvm extends InjectedWalletBase {
11
+ constructor(props) {
12
+ super(props);
12
13
  this.name = 'PhantomEvm';
14
+ this.wallet = walletBook.findWalletBookWallet(this.walletBook, this.key);
13
15
  }
14
16
  fetchPublicAddress() {
15
17
  const _super = Object.create(null, {
@@ -1,5 +1,7 @@
1
- import LegacyInjectedWalletBase from './LegacyInjectedWalletBase';
2
- export declare class PhantomEvm extends LegacyInjectedWalletBase {
1
+ import { EthWalletConnectorOpts } from '..';
2
+ import InjectedWalletBase from './InjectedWalletBase';
3
+ export declare class PhantomEvm extends InjectedWalletBase {
3
4
  name: string;
5
+ constructor(props: EthWalletConnectorOpts);
4
6
  fetchPublicAddress(): Promise<string | undefined>;
5
7
  }
@@ -1,11 +1,13 @@
1
1
  import { __awaiter } from '../../_virtual/_tslib.js';
2
2
  import { isMobile, isSamsungBrowser } from '@dynamic-labs/utils';
3
- import LegacyInjectedWalletBase from './LegacyInjectedWalletBase.js';
3
+ import { findWalletBookWallet } from '@dynamic-labs/wallet-book';
4
+ import InjectedWalletBase from './InjectedWalletBase.js';
4
5
 
5
- class PhantomEvm extends LegacyInjectedWalletBase {
6
- constructor() {
7
- super(...arguments);
6
+ class PhantomEvm extends InjectedWalletBase {
7
+ constructor(props) {
8
+ super(props);
8
9
  this.name = 'PhantomEvm';
10
+ this.wallet = findWalletBookWallet(this.walletBook, this.key);
9
11
  }
10
12
  fetchPublicAddress() {
11
13
  const _super = Object.create(null, {
@@ -3,15 +3,25 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var InjectedWalletBase = require('./InjectedWalletBase.cjs');
6
- var legacyInjectedWallets = require('./legacyInjectedWallets.cjs');
6
+ var PhantomEvm = require('./PhantomEvm.cjs');
7
+ var ExodusEvm = require('./ExodusEvm.cjs');
7
8
 
9
+ const injectedWalletOverrides = [
10
+ PhantomEvm.PhantomEvm,
11
+ ExodusEvm.ExodusEvm,
12
+ ];
13
+ const filteredInjectedWalletKeysOverrides = [
14
+ 'phantomevm',
15
+ 'coinbase',
16
+ 'exodusevm',
17
+ ];
8
18
  const fetchInjectedWalletConnector = ({ walletBook, }) => {
9
19
  var _a;
10
20
  return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
11
21
  .filter(([key, wallet]) => {
12
22
  var _a;
13
23
  return ((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'evm')) &&
14
- !legacyInjectedWallets.filteredLegacyInjectedWalletKeys.includes(key);
24
+ !filteredInjectedWalletKeysOverrides.includes(key);
15
25
  })
16
26
  .map(([key, wallet]) => {
17
27
  const { shortName } = wallet;
@@ -31,3 +41,4 @@ const fetchInjectedWalletConnector = ({ walletBook, }) => {
31
41
  };
32
42
 
33
43
  exports.fetchInjectedWalletConnector = fetchInjectedWalletConnector;
44
+ exports.injectedWalletOverrides = injectedWalletOverrides;
@@ -1,5 +1,6 @@
1
1
  import { WalletConnectorConstructor } from '@dynamic-labs/wallet-connector-core';
2
2
  import { WalletBookSchema } from '@dynamic-labs/wallet-book';
3
+ export declare const injectedWalletOverrides: WalletConnectorConstructor[];
3
4
  export declare const fetchInjectedWalletConnector: ({ walletBook, }: {
4
5
  isWalletConnectV2Enabled: boolean;
5
6
  walletBook: WalletBookSchema;
@@ -1,13 +1,23 @@
1
1
  import InjectedWalletBase from './InjectedWalletBase.js';
2
- import { filteredLegacyInjectedWalletKeys } from './legacyInjectedWallets.js';
2
+ import { PhantomEvm } from './PhantomEvm.js';
3
+ import { ExodusEvm } from './ExodusEvm.js';
3
4
 
5
+ const injectedWalletOverrides = [
6
+ PhantomEvm,
7
+ ExodusEvm,
8
+ ];
9
+ const filteredInjectedWalletKeysOverrides = [
10
+ 'phantomevm',
11
+ 'coinbase',
12
+ 'exodusevm',
13
+ ];
4
14
  const fetchInjectedWalletConnector = ({ walletBook, }) => {
5
15
  var _a;
6
16
  return Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
7
17
  .filter(([key, wallet]) => {
8
18
  var _a;
9
19
  return ((_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'evm')) &&
10
- !filteredLegacyInjectedWalletKeys.includes(key);
20
+ !filteredInjectedWalletKeysOverrides.includes(key);
11
21
  })
12
22
  .map(([key, wallet]) => {
13
23
  const { shortName } = wallet;
@@ -26,4 +36,4 @@ const fetchInjectedWalletConnector = ({ walletBook, }) => {
26
36
  });
27
37
  };
28
38
 
29
- export { fetchInjectedWalletConnector };
39
+ export { fetchInjectedWalletConnector, injectedWalletOverrides };
@@ -1,13 +1,3 @@
1
- export * from './BloctoInjected';
2
- export * from './BraveEvm';
3
- export * from './Dawn';
4
- export * from './ExodusEvm';
5
- export * from './Frame';
6
- export * from './GameStop';
7
- export * from './Opera';
8
1
  export * from './PhantomEvm';
9
- export * from './Trust';
10
- export * from './Zerion';
11
- export * from './Rabby';
2
+ export * from './ExodusEvm';
12
3
  export * from './fetchInjectedWalletConnectors';
13
- export * from './legacyInjectedWallets';
@@ -1,14 +0,0 @@
1
- 'use strict';
2
-
3
- Object.defineProperty(exports, '__esModule', { value: true });
4
-
5
- var LegacyInjectedWalletBase = require('./LegacyInjectedWalletBase.cjs');
6
-
7
- class BloctoInjected extends LegacyInjectedWalletBase {
8
- constructor() {
9
- super(...arguments);
10
- this.name = 'bloctoInjected';
11
- }
12
- }
13
-
14
- exports.BloctoInjected = BloctoInjected;
@@ -1,4 +0,0 @@
1
- import LegacyInjectedWalletBase from './LegacyInjectedWalletBase';
2
- export declare class BloctoInjected extends LegacyInjectedWalletBase {
3
- name: string;
4
- }
@@ -1,10 +0,0 @@
1
- import LegacyInjectedWalletBase from './LegacyInjectedWalletBase.js';
2
-
3
- class BloctoInjected extends LegacyInjectedWalletBase {
4
- constructor() {
5
- super(...arguments);
6
- this.name = 'bloctoInjected';
7
- }
8
- }
9
-
10
- export { BloctoInjected };
@@ -1,14 +0,0 @@
1
- 'use strict';
2
-
3
- Object.defineProperty(exports, '__esModule', { value: true });
4
-
5
- var LegacyInjectedWalletBase = require('./LegacyInjectedWalletBase.cjs');
6
-
7
- class BraveEvm extends LegacyInjectedWalletBase {
8
- constructor() {
9
- super(...arguments);
10
- this.name = 'BraveEvm';
11
- }
12
- }
13
-
14
- exports.BraveEvm = BraveEvm;
@@ -1,4 +0,0 @@
1
- import LegacyInjectedWalletBase from './LegacyInjectedWalletBase';
2
- export declare class BraveEvm extends LegacyInjectedWalletBase {
3
- name: string;
4
- }
@@ -1,10 +0,0 @@
1
- import LegacyInjectedWalletBase from './LegacyInjectedWalletBase.js';
2
-
3
- class BraveEvm extends LegacyInjectedWalletBase {
4
- constructor() {
5
- super(...arguments);
6
- this.name = 'BraveEvm';
7
- }
8
- }
9
-
10
- export { BraveEvm };
@@ -1,14 +0,0 @@
1
- 'use strict';
2
-
3
- Object.defineProperty(exports, '__esModule', { value: true });
4
-
5
- var LegacyInjectedWalletBase = require('./LegacyInjectedWalletBase.cjs');
6
-
7
- class Dawn extends LegacyInjectedWalletBase {
8
- constructor() {
9
- super(...arguments);
10
- this.name = 'Dawn';
11
- }
12
- }
13
-
14
- exports.Dawn = Dawn;
@@ -1,4 +0,0 @@
1
- import LegacyInjectedWalletBase from './LegacyInjectedWalletBase';
2
- export declare class Dawn extends LegacyInjectedWalletBase {
3
- name: string;
4
- }
@@ -1,10 +0,0 @@
1
- import LegacyInjectedWalletBase from './LegacyInjectedWalletBase.js';
2
-
3
- class Dawn extends LegacyInjectedWalletBase {
4
- constructor() {
5
- super(...arguments);
6
- this.name = 'Dawn';
7
- }
8
- }
9
-
10
- export { Dawn };