@dynamic-labs/multi-wallet 0.16.0-RC.12 → 0.16.0-RC.14

package/src/wallets/ethereum/MagicConnector/EmailMagicWalletConnector/EmailMagicWalletConnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"EmailMagicWalletConnector.js","sourceRoot":"","sources":["../../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/EmailMagicWalletConnector/EmailMagicWalletConnector.ts"],"names":[],"mappings":";;;;AAEA,kEAAgF;AAEhF,MAAa,yBACX,SAAQ,2CAAoB;IAD9B;;QAIE,uBAAkB,GAAG,IAAI,CAAC;IA+C5B,CAAC;IA5CC,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,YAAY,CAAC,OAAO,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;IAED,UAAU;QACR,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,YAAY,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAC9C,CAAC;IAEc,UAAU;;;;;YACvB,MAAM,OAAM,UAAU,WAAE,CAAC;YAEzB,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,CAAC;KAAA;IAED,mBAAmB;;QACjB,MAAA,IAAI,CAAC,8BAA8B,0CAAE,MAAM,EAAE,CAAC;IAChD,CAAC;IAEK,cAAc;;;YAClB,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YAEjC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAE1C,IAAI,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE;gBAC9B,IAAI,CAAC,QAAQ,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,KAAI,EAAE,CAAC,CAAC;gBACjC,OAAO,IAAI,CAAC,aAAa,CAAC;aAC3B;YAED,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;YAEvB,IAAI,CAAC,KAAK;gBAAE,OAAO;YAEnB,OAAO,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC;gBACpC,KAAK;gBACL,WAAW,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,WAAW;gBACtC,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;;KACJ;CACF;AAnDD,8DAmDC"}
+{"version":3,"file":"EmailMagicWalletConnector.js","sourceRoot":"","sources":["../../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/EmailMagicWalletConnector/EmailMagicWalletConnector.ts"],"names":[],"mappings":";;;;AAEA,kEAAgF;AAEhF,MAAa,yBACX,SAAQ,2CAAoB;IAD9B;;QAIE,uBAAkB,GAAG,IAAI,CAAC;IA+C5B,CAAC;IA5CC,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,YAAY,CAAC,OAAO,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;IAED,UAAU;QACR,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,YAAY,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAC9C,CAAC;IAEc,UAAU;;;;;YACvB,MAAM,OAAM,UAAU,WAAE,CAAC;YAEzB,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,CAAC;KAAA;IAED,mBAAmB;;QACjB,MAAA,IAAI,CAAC,8BAA8B,0CAAE,MAAM,EAAE,CAAC;IAChD,CAAC;IAEK,cAAc;;;YAClB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAEhC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAE1C,IAAI,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE;gBAC9B,IAAI,CAAC,QAAQ,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,KAAI,EAAE,CAAC,CAAC;gBACjC,OAAO,IAAI,CAAC,aAAa,CAAC;aAC3B;YAED,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;YAEvB,IAAI,CAAC,KAAK;gBAAE,OAAO;YAEnB,OAAO,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC;gBACpC,KAAK;gBACL,WAAW,EAAE,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW;gBACrC,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;;KACJ;CACF;AAnDD,8DAmDC"}

package/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js

@@ -32,7 +32,7 @@ class EmailOTPMagicWalletConnector extends EmailMagicWalletConnector_1.EmailMagi
     loginWithMagic() {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const client = this._getClient();
+            const client = this.getClient();
             const user = yield this.getUserMetadata();
             if (user && user.publicAddress) {
                 this.setEmail((user === null || user === void 0 ? void 0 : user.email) || '');

package/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"EmailOTPMagicWalletConnector.js","sourceRoot":"","sources":["../../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.ts"],"names":[],"mappings":";;;;AAIA,qDAAkD;AAClD,4EAAyE;AAOzE,MAAa,4BACX,SAAQ,qDAAyB;IAK3B,qBAAqB,CAAC,GAAW;;YACrC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;YAC5B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,eAAe,GAAG,IAAI,KAAK,CAC/B,6CAA6C,CAC9C,CAAC;YAEF,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;aAC1D;YAED,MAAM,cAAc,GAAG,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC9D,UAAU,CAAC,GAAG,EAAE;oBACd,MAAM,CAAC,eAAe,CAAC,CAAC;gBAC1B,CAAC,EAAE,SAAS,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACvD,MAAM;qBACH,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;qBAC/B,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;qBACtD,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;qBACnB,KAAK,CAAC,MAAM,CAAC;qBACb,IAAI,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;YAEH,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;QACjD,CAAC;KAAA;IAEc,cAAc;;;YAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YAEjC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAE1C,IAAI,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE;gBAC9B,IAAI,CAAC,QAAQ,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,KAAI,EAAE,CAAC,CAAC;gBACjC,OAAO,IAAI,CAAC,aAAa,CAAC;aAC3B;YAED,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;YAEvB,IAAI,CAAC,KAAK;gBAAE,OAAO;YAEnB,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAE7B,IAAI;gBACF,MAAM,IAAI,CAAC,OAAO,CAAC;aACpB;YAAC,OAAO,GAAG,EAAE;gBACZ,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACnB;YAED,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBAC3C,KAAK;gBACL,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,OAAO,CAAC;;KACrB;CACF;AAhED,oEAgEC"}
+{"version":3,"file":"EmailOTPMagicWalletConnector.js","sourceRoot":"","sources":["../../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.ts"],"names":[],"mappings":";;;;AAIA,qDAAkD;AAClD,4EAAyE;AAOzE,MAAa,4BACX,SAAQ,qDAAyB;IAK3B,qBAAqB,CAAC,GAAW;;YACrC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;YAC5B,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YAC5B,MAAM,eAAe,GAAG,IAAI,KAAK,CAC/B,6CAA6C,CAC9C,CAAC;YAEF,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;aAC1D;YAED,MAAM,cAAc,GAAG,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC9D,UAAU,CAAC,GAAG,EAAE;oBACd,MAAM,CAAC,eAAe,CAAC,CAAC;gBAC1B,CAAC,EAAE,SAAS,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACvD,MAAM;qBACH,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;qBAC/B,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;qBACtD,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;qBACnB,KAAK,CAAC,MAAM,CAAC;qBACb,IAAI,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;YAEH,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;QACjD,CAAC;KAAA;IAEc,cAAc;;;YAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAEhC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAE1C,IAAI,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE;gBAC9B,IAAI,CAAC,QAAQ,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,KAAI,EAAE,CAAC,CAAC;gBACjC,OAAO,IAAI,CAAC,aAAa,CAAC;aAC3B;YAED,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;YAEvB,IAAI,CAAC,KAAK;gBAAE,OAAO;YAEnB,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAE7B,IAAI;gBACF,MAAM,IAAI,CAAC,OAAO,CAAC;aACpB;YAAC,OAAO,GAAG,EAAE;gBACZ,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACnB;YAED,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBAC3C,KAAK;gBACL,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,OAAO,CAAC;;KACrB;CACF;AAhED,oEAgEC"}

package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.d.ts

@@ -0,0 +1,24 @@
+import { Magic, MagicSDKAdditionalConfiguration, MagicSDKExtensionsOption } from 'magic-sdk';
+import { MagicConnectorProps } from '../MagicWalletConnector';
+import { EvmNetwork } from '../../evm-network';
+export type MagicLinkConfig = Pick<MagicSDKAdditionalConfiguration<string, MagicSDKExtensionsOption<string>>, 'network' | 'testMode' | 'locale'> & {
+    redirectURI?: string;
+};
+export type MagicClientNetworkHandlerProps = Pick<MagicConnectorProps, 'apiKey' | 'config' | 'evmNetworks'>;
+export declare abstract class MagicClientNetworkHandler {
+    private _apiKey;
+    private _clients;
+    private _networkId;
+    private _config;
+    evmNetworks: EvmNetwork[];
+    constructor({ apiKey, evmNetworks, config }: MagicClientNetworkHandlerProps);
+    abstract onChainChanged?(networkChainId: number): void;
+    selectNetwork(networkChainId: number): Promise<void>;
+    get networkId(): number;
+    get config(): MagicLinkConfig | undefined;
+    getClient(): Magic<MagicSDKExtensionsOption<string>>;
+    getConfigForNetwork(networkId: number): MagicSDKAdditionalConfiguration<string, MagicSDKExtensionsOption<string>> | undefined;
+    private get configNetworkId();
+    private _getRpcUrlByNetworkId;
+    private _getChainIdByNetworkId;
+}

package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MagicClientNetworkHandler = void 0;
+const tslib_1 = require("tslib");
+const magic_sdk_1 = require("magic-sdk");
+// these are based off of Magic's EthNetworkName type
+const chainNameToChainIdMap = {
+    arbitrum: 42161,
+    avalance: 43114,
+    bsc: 56,
+    gnosis: 100,
+    goerli: 5,
+    mainnet: 1,
+    optimism: 10,
+    polygon: 137,
+    sepolia: 11155111,
+};
+class MagicClientNetworkHandler {
+    constructor({ apiKey, evmNetworks, config }) {
+        var _a, _b;
+        this._clients = {};
+        this.evmNetworks = [];
+        this._config = config;
+        this._apiKey = apiKey;
+        this.evmNetworks = evmNetworks;
+        this._networkId =
+            typeof (config === null || config === void 0 ? void 0 : config.network) === 'string'
+                ? chainNameToChainIdMap[config.network]
+                : (_b = (_a = config === null || config === void 0 ? void 0 : config.network) === null || _a === void 0 ? void 0 : _a.chainId) !== null && _b !== void 0 ? _b : 1;
+    }
+    selectNetwork(networkChainId) {
+        var _a;
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            this._networkId = networkChainId;
+            (_a = this.onChainChanged) === null || _a === void 0 ? void 0 : _a.call(this, networkChainId);
+        });
+    }
+    get networkId() {
+        return this._networkId;
+    }
+    get config() {
+        return this._config;
+    }
+    getClient() {
+        const networkId = this._networkId;
+        const client = this._clients[networkId];
+        if (client) {
+            return client;
+        }
+        const config = this.getConfigForNetwork(networkId);
+        const newClient = new magic_sdk_1.Magic(this._apiKey, config);
+        this._clients[networkId] = newClient;
+        return newClient;
+    }
+    getConfigForNetwork(networkId) {
+        const rpcUrl = this._getRpcUrlByNetworkId(networkId);
+        // Should prioritize custom rpc config form dashboard
+        if (rpcUrl) {
+            return Object.assign(Object.assign({}, this._config), { network: {
+                    chainId: this._getChainIdByNetworkId(networkId),
+                    rpcUrl,
+                } });
+        }
+        // Next should return configuration provided through settings
+        if (this.configNetworkId === networkId) {
+            return this._config;
+        }
+        if (networkId === 1) {
+            return Object.assign(Object.assign({}, this._config), { network: 'mainnet' });
+        }
+        if (networkId === 5) {
+            return Object.assign(Object.assign({}, this._config), { network: 'goerli' });
+        }
+        return this._config;
+    }
+    get configNetworkId() {
+        var _a, _b, _c;
+        if (typeof ((_a = this._config) === null || _a === void 0 ? void 0 : _a.network) !== 'string') {
+            return (_c = (_b = this._config) === null || _b === void 0 ? void 0 : _b.network) === null || _c === void 0 ? void 0 : _c.chainId;
+        }
+        return undefined;
+    }
+    _getRpcUrlByNetworkId(networkId) {
+        var _a;
+        const evm = this.evmNetworks.find((evmNetwork) => evmNetwork.networkId === networkId);
+        return ((_a = evm === null || evm === void 0 ? void 0 : evm.privateCustomerRpcUrls) === null || _a === void 0 ? void 0 : _a[0]) || (evm === null || evm === void 0 ? void 0 : evm.rpcUrls[0]);
+    }
+    _getChainIdByNetworkId(networkId) {
+        var _a;
+        return (_a = this.evmNetworks.find((evmNetwork) => evmNetwork.networkId === networkId)) === null || _a === void 0 ? void 0 : _a.chainId;
+    }
+}
+exports.MagicClientNetworkHandler = MagicClientNetworkHandler;
+//# sourceMappingURL=MagicClientNetworkHandler.js.map

package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MagicClientNetworkHandler.js","sourceRoot":"","sources":["../../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.ts"],"names":[],"mappings":"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"}

package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/index.d.ts

@@ -0,0 +1,2 @@
+export { MagicClientNetworkHandler } from './MagicClientNetworkHandler';
+export type { MagicLinkConfig } from './MagicClientNetworkHandler';

package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/index.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MagicClientNetworkHandler = void 0;
+var MagicClientNetworkHandler_1 = require("./MagicClientNetworkHandler");
+Object.defineProperty(exports, "MagicClientNetworkHandler", { enumerable: true, get: function () { return MagicClientNetworkHandler_1.MagicClientNetworkHandler; } });
+//# sourceMappingURL=index.js.map

package/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/MagicClientNetworkHandler/index.ts"],"names":[],"mappings":";;;AAAA,yEAAwE;AAA/D,sIAAA,yBAAyB,OAAA"}

package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.d.ts

@@ -1,12 +1,10 @@
-import { LoginWithMagicLinkEvents, Magic as MagicClient, MagicSDKAdditionalConfiguration, MagicSDKExtensionsOption, MagicUserMetadata, PromiEvent } from 'magic-sdk';
+import { LoginWithMagicLinkEvents, MagicUserMetadata, PromiEvent } from 'magic-sdk';
 import { ethers } from 'ethers';
 import { Chain, WalletConnector, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
 import { WalletUiUtils } from '../../../../types';
 import { CancellablePromise } from '../../../../utils/CancellablePromise';
+import { MagicLinkConfig, MagicClientNetworkHandler } from '../MagicClientNetworkHandler';
 import { EvmNetwork } from './../../evm-network';
-export type MagicLinkConfig = Pick<MagicSDKAdditionalConfiguration<string, MagicSDKExtensionsOption<string>>, 'network' | 'testMode' | 'locale'> & {
-    redirectURI?: string;
-};
 export type MagicConnectorProps = {
     apiKey: string;
     config?: MagicLinkConfig;
@@ -18,7 +16,7 @@ export type MagicPromiEvent = PromiEvent<string | null, LoginWithMagicLinkEvents
     error: (reason: any) => void;
     settled: () => void;
 }>;
-export declare abstract class MagicWalletConnector implements WalletConnector {
+export declare abstract class MagicWalletConnector extends MagicClientNetworkHandler implements WalletConnector {
     key: string;
     canConnectViaCustodialService: boolean;
     canConnectViaQrCode: boolean;
@@ -27,16 +25,10 @@ export declare abstract class MagicWalletConnector implements WalletConnector {
     isWalletConnect: boolean;
     name: string;
     switchNetworkOnlyFromWallet?: boolean;
-    evmNetworks: EvmNetwork[];
     providerResources?: string[];
-    _apiKey: string;
-    _magicSdk: MagicClient | undefined;
     _walletUiUtils: WalletUiUtils;
-    _provider: ethers.providers.Web3Provider | undefined;
-    _config: MagicLinkConfig | undefined;
     _listeners: WalletEventListeners | undefined;
     _currentAuthCancellablePromise: CancellablePromise<MagicPromiEvent | undefined> | undefined;
-    _networkId: number;
     constructor({ apiKey, walletUiUtils, evmNetworks, config, }: MagicConnectorProps);
     abstract loginWithMagic(): Promise<MagicPromiEvent | undefined>;
     getDeepLink(): string | undefined;
@@ -53,11 +45,13 @@ export declare abstract class MagicWalletConnector implements WalletConnector {
     isInstalledOnBrowser(): boolean;
     proveOwnership(messageToSign: string): Promise<string | undefined>;
     setupEventListeners(listeners: WalletEventListeners): void;
+    onChainChanged(networkChainId: number): void;
     signMessage(messageToSign: string): Promise<string | undefined>;
     supportsNetworkSwitching(): boolean;
-    switchNetwork(): Promise<void>;
+    switchNetwork({ networkChainId, }: {
+        networkChainId?: number;
+    }): Promise<void>;
     teardownEventListeners(): void;
-    _getClient(): MagicClient<MagicSDKExtensionsOption<string>>;
     _isLoggedIn(): Promise<boolean>;
     _checkIfLoggedIn(): Promise<boolean>;
 }

package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.js

@@ -2,29 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MagicWalletConnector = void 0;
 const tslib_1 = require("tslib");
-const magic_sdk_1 = require("magic-sdk");
 const ethers_1 = require("ethers");
 const errors_1 = require("../../../../errors");
 const logger_1 = require("../../../../utils/logger");
 const assignConfirmationScreenToProvider_1 = require("../../../../utils/assignConfirmationScreenToProvider");
 const CancellablePromise_1 = require("../../../../utils/CancellablePromise");
-// these are based off of Magic's EthNetworkName type,
-// which at the time of writing, is a union over mainnet and goerli
-const chainNameToChainIdMap = {
-    arbitrum: 42161,
-    avalance: 43114,
-    bsc: 56,
-    gnosis: 100,
-    goerli: 5,
-    mainnet: 1,
-    optimism: 10,
-    polygon: 137,
-    sepolia: 11155111,
-};
+const MagicClientNetworkHandler_1 = require("../MagicClientNetworkHandler");
 const storedAddressKey = 'dynamic_magic_address';
-class MagicWalletConnector {
+class MagicWalletConnector extends MagicClientNetworkHandler_1.MagicClientNetworkHandler {
     constructor({ apiKey, walletUiUtils, evmNetworks, config, }) {
-        var _a, _b;
+        super({
+            apiKey,
+            config,
+            evmNetworks,
+        });
         this.key = 'magiclink';
         this.canConnectViaCustodialService = true;
         this.canConnectViaQrCode = false;
@@ -32,17 +23,8 @@ class MagicWalletConnector {
         this.supportedChains = ['ETH', 'EVM'];
         this.isWalletConnect = false;
         this.name = 'Magic Link';
-        this.evmNetworks = [];
         this.providerResources = undefined;
-        this._magicSdk = undefined;
-        this._config = config;
-        this._apiKey = apiKey;
         this._walletUiUtils = walletUiUtils;
-        this.evmNetworks = evmNetworks;
-        this._networkId =
-            typeof (config === null || config === void 0 ? void 0 : config.network) === 'string'
-                ? chainNameToChainIdMap[config.network]
-                : (_b = (_a = config === null || config === void 0 ? void 0 : config.network) === null || _a === void 0 ? void 0 : _a.chainId) !== null && _b !== void 0 ? _b : 1;
     }
     getDeepLink() {
         return undefined;
@@ -55,14 +37,14 @@ class MagicWalletConnector {
     endSession() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             localStorage.removeItem(storedAddressKey);
-            const client = this._getClient();
+            const client = this.getClient();
             yield client.user.logout();
         });
     }
     getUserMetadata() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (yield this._isLoggedIn()) {
-                const client = this._getClient();
+                const client = this.getClient();
                 return client.user.getMetadata();
             }
             return undefined;
@@ -73,7 +55,7 @@ class MagicWalletConnector {
             const address = localStorage.getItem(storedAddressKey);
             if (address)
                 return address;
-            const client = this._getClient();
+            const client = this.getClient();
             try {
                 try {
                     this._currentAuthCancellablePromise = CancellablePromise_1.CancellablePromise.fromPromise(this.loginWithMagic());
@@ -118,7 +100,7 @@ class MagicWalletConnector {
     }
     getNetwork() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return this._networkId;
+            return this.networkId;
         });
     }
     getRpcProvider() {
@@ -134,14 +116,10 @@ class MagicWalletConnector {
     }
     getWeb3Provider() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (this._provider) {
-                return this._provider;
-            }
-            const client = this._getClient();
+            const client = this.getClient();
             const provider = new ethers_1.ethers.providers.Web3Provider(client.rpcProvider);
             (0, assignConfirmationScreenToProvider_1.assignConfirmationScreenToProvider)(provider, this._walletUiUtils);
-            this._provider = provider;
-            return this._provider;
+            return provider;
         });
     }
     isInstalledOnBrowser() {
@@ -154,6 +132,10 @@ class MagicWalletConnector {
         this._listeners = listeners;
         this._checkIfLoggedIn();
     }
+    onChainChanged(networkChainId) {
+        var _a, _b;
+        (_b = (_a = this._listeners) === null || _a === void 0 ? void 0 : _a.onChainChange) === null || _b === void 0 ? void 0 : _b.call(_a, networkChainId.toString());
+    }
     signMessage(messageToSign) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const provider = yield this.getWeb3Provider();
@@ -161,23 +143,22 @@ class MagicWalletConnector {
         });
     }
     supportsNetworkSwitching() {
-        return false;
+        return true;
     }
-    switchNetwork() {
-        throw new Error('Method not implemented.');
+    switchNetwork({ networkChainId, }) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (!networkChainId) {
+                return;
+            }
+            this.selectNetwork(networkChainId);
+        });
     }
     teardownEventListeners() {
         this._listeners = undefined;
     }
-    _getClient() {
-        if (!this._magicSdk) {
-            this._magicSdk = new magic_sdk_1.Magic(this._apiKey, this._config);
-        }
-        return this._magicSdk;
-    }
     _isLoggedIn() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const client = this._getClient();
+            const client = this.getClient();
             return client.user.isLoggedIn();
         });
     }

package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"MagicWalletConnector.js","sourceRoot":"","sources":["../../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MagicWalletConnector.js","sourceRoot":"","sources":["../../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/MagicWalletConnector/MagicWalletConnector.ts"],"names":[],"mappings":";;;;AAKA,mCAAgC;AAQhC,+CAAkD;AAClD,qDAAkD;AAElD,6GAA0G;AAC1G,6EAA0E;AAC1E,4EAGsC;AAoBtC,MAAM,gBAAgB,GAAG,uBAAuB,CAAC;AAEjD,MAAsB,oBACpB,SAAQ,qDAAyB;IAkBjC,YAAY,EACV,MAAM,EACN,aAAa,EACb,WAAW,EACX,MAAM,GACc;QACpB,KAAK,CAAC;YACJ,MAAM;YACN,MAAM;YACN,WAAW;SACZ,CAAC,CAAC;QAzBL,QAAG,GAAG,WAAW,CAAC;QAClB,kCAA6B,GAAG,IAAI,CAAC;QACrC,wBAAmB,GAAG,KAAK,CAAC;QAC5B,mBAAc,GAAU,KAAK,CAAC;QAC9B,oBAAe,GAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1C,oBAAe,GAAG,KAAK,CAAC;QACxB,SAAI,GAAG,YAAY,CAAC;QAEpB,sBAAiB,GAAc,SAAS,CAAC;QAmBvC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;IACtC,CAAC;IAID,WAAW;QACT,OAAO,SAAS,CAAC;IACnB,CAAC;IAEK,OAAO;;YACX,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClC,CAAC;KAAA;IAEK,UAAU;;YACd,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;YAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAChC,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QAC7B,CAAC;KAAA;IAEK,eAAe;;YACnB,IAAI,MAAM,IAAI,CAAC,WAAW,EAAE,EAAE;gBAC5B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;gBAChC,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;aAClC;YAED,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;IAEK,kBAAkB;;YACtB,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YACvD,IAAI,OAAO;gBAAE,OAAO,OAAO,CAAC;YAE5B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAEhC,IAAI;gBACF,IAAI;oBACF,IAAI,CAAC,8BAA8B,GAAG,uCAAkB,CAAC,WAAW,CAClE,IAAI,CAAC,cAAc,EAAE,CACtB,CAAC;oBAEF,MAAM,IAAI,CAAC,8BAA8B,CAAC;iBAC3C;gBAAC,OAAO,GAAG,EAAE;oBACZ,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAElB,OAAO;iBACR;gBAED,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;gBAEjD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE;oBACxC,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;iBACtC;gBAED,IAAI,QAAQ,CAAC,MAAM,EAAE;oBACnB,IAAI,CAAC,iBAAiB,GAAG,CAAC,qBAAqB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;iBACnE;gBAED,YAAY,CAAC,OAAO,CAAC,gBAAgB,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAE/D,OAAO,QAAQ,CAAC,aAAa,CAAC;aAC/B;YAAC,OAAO,GAAG,EAAE;gBACZ,OAAO,SAAS,CAAC;aAClB;QACH,CAAC;KAAA;IAEK,UAAU;;YACd,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAE9C,IAAI,CAAC,QAAQ;gBAAE,MAAM,IAAI,qBAAY,CAAC,aAAa,CAAC,CAAC;YAErD,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,EAAE,CAAC;YACpC,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;YAE9C,OAAO,eAAM,CAAC,KAAK,CAAC,WAAW,CAC7B,MAAM,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,CACvC,CAAC;QACJ,CAAC;KAAA;IAEK,oBAAoB;;YACxB,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;YACvD,IAAI,CAAC,OAAO;gBAAE,OAAO,EAAE,CAAC;YACxB,OAAO,CAAC,OAAO,CAAC,CAAC;QACnB,CAAC;KAAA;IAEK,UAAU;;YACd,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;KAAA;IAEK,cAAc;;YAGlB,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;IAEK,SAAS;;YACb,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAE9C,OAAO,QAAQ,CAAC,SAAS,EAAE,CAAC;QAC9B,CAAC;KAAA;IAEK,eAAe;;YACnB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAEhC,MAAM,QAAQ,GAAG,IAAI,eAAM,CAAC,SAAS,CAAC,YAAY,CAChD,MAAM,CAAC,WAA2D,CACnE,CAAC;YAEF,IAAA,uEAAkC,EAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;YAElE,OAAO,QAAQ,CAAC;QAClB,CAAC;KAAA;IAED,oBAAoB;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,cAAc,CAAC,aAAqB;QAClC,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IACzC,CAAC;IAED,mBAAmB,CAAC,SAA+B;QACjD,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAE5B,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAEQ,cAAc,CAAC,cAAsB;;QAC5C,MAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,aAAa,mDAAG,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9D,CAAC;IAEK,WAAW,CAAC,aAAqB;;YACrC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAE9C,OAAO,QAAQ,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QACzD,CAAC;KAAA;IAED,wBAAwB;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAEK,aAAa,CAAC,EAClB,cAAc,GAGf;;YACC,IAAI,CAAC,cAAc,EAAE;gBACnB,OAAO;aACR;YAED,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;QACrC,CAAC;KAAA;IAED,sBAAsB;QACpB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAEK,WAAW;;YACf,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;YAChC,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,CAAC;KAAA;IAEK,gBAAgB;;;YACpB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YAE5C,IAAI,CAAC,UAAU,EAAE;gBACf,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;gBAC1C,MAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,YAAY,kDAAI,CAAC;aACnC;YAED,OAAO,UAAU,CAAC;;KACnB;CACF;AA1MD,oDA0MC"}

package/src/wallets/ethereum/MagicConnector/MagicWalletConnector/index.d.ts

@@ -1,2 +1,2 @@
 export { MagicWalletConnector } from './MagicWalletConnector';
-export type { MagicConnectorProps, MagicLinkConfig, MagicPromiEvent, } from './MagicWalletConnector';
+export type { MagicConnectorProps, MagicPromiEvent, } from './MagicWalletConnector';

package/src/wallets/ethereum/MagicConnector/index.d.ts

@@ -1,3 +1,4 @@
 export * from './EmailMagicWalletConnector';
 export * from './MagicWalletConnector';
 export * from './EmailOTPMagicWalletConnector';
+export * from './MagicClientNetworkHandler';

package/src/wallets/ethereum/MagicConnector/index.js

@@ -4,4 +4,5 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./EmailMagicWalletConnector"), exports);
 tslib_1.__exportStar(require("./MagicWalletConnector"), exports);
 tslib_1.__exportStar(require("./EmailOTPMagicWalletConnector"), exports);
+tslib_1.__exportStar(require("./MagicClientNetworkHandler"), exports);
 //# sourceMappingURL=index.js.map

package/src/wallets/ethereum/MagicConnector/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/index.ts"],"names":[],"mappings":";;;AAAA,sEAA4C;AAC5C,iEAAuC;AACvC,yEAA+C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/multi-wallet/src/wallets/ethereum/MagicConnector/index.ts"],"names":[],"mappings":";;;AAAA,sEAA4C;AAC5C,iEAAuC;AACvC,yEAA+C;AAC/C,sEAA4C"}

package/src/wallets/starknet/argentx.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const starknetProvider_1 = tslib_1.__importDefault(require("./starknetProvider"));
 class ArgentX extends starknetProvider_1.default {
     constructor() {
-        super('Argent X');
+        super('Argent X', 'argentX');
     }
 }
 exports.default = ArgentX;

package/src/wallets/starknet/argentx.js.map

@@ -1 +1 @@
-{"version":3,"file":"argentx.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/starknet/argentx.ts"],"names":[],"mappings":";;;AAEA,kFAAkD;AAElD,MAAM,OAAQ,SAAQ,0BAAgB;IACpC;QACE,KAAK,CAAC,UAAU,CAAC,CAAC;IACpB,CAAC;CACF;AAED,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"argentx.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/starknet/argentx.ts"],"names":[],"mappings":";;;AAEA,kFAAkD;AAElD,MAAM,OAAQ,SAAQ,0BAAgB;IACpC;QACE,KAAK,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;IAC/B,CAAC;CACF;AAED,kBAAe,OAAO,CAAC"}

package/src/wallets/starknet/braavos.js

@@ -5,7 +5,7 @@ const isMobile_1 = require("../../utils/isMobile");
 const starknetProvider_1 = tslib_1.__importDefault(require("./starknetProvider"));
 class Braavos extends starknetProvider_1.default {
     constructor() {
-        super('Braavos');
+        super('Braavos', 'braavos');
     }
     fetchPublicAddress() {
         const _super = Object.create(null, {

package/src/wallets/starknet/braavos.js.map

@@ -1 +1 @@
-{"version":3,"file":"braavos.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/starknet/braavos.ts"],"names":[],"mappings":";;;AAEA,mDAAgD;AAEhD,kFAAkD;AAElD,MAAM,OAAQ,SAAQ,0BAAgB;IACpC;QACE,KAAK,CAAC,SAAS,CAAC,CAAC;IACnB,CAAC;IAEc,kBAAkB;;;;;YAC/B,IAAI,IAAI,CAAC,oBAAoB,EAAE,EAAE;gBAC/B,OAAO,OAAM,kBAAkB,YAAG;aACnC;YAED;;;eAGG;YACH,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;YACpE,MAAM,SAAS,GAAG,mBAAmB,GAAG,EAAE,CAAC;YAE3C,IAAI,IAAA,mBAAQ,GAAE,EAAE;gBACd,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;aACnC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;KAAA;CACF;AAED,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"braavos.js","sourceRoot":"","sources":["../../../../../../packages/multi-wallet/src/wallets/starknet/braavos.ts"],"names":[],"mappings":";;;AAEA,mDAAgD;AAEhD,kFAAkD;AAElD,MAAM,OAAQ,SAAQ,0BAAgB;IACpC;QACE,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC9B,CAAC;IAEc,kBAAkB;;;;;YAC/B,IAAI,IAAI,CAAC,oBAAoB,EAAE,EAAE;gBAC/B,OAAO,OAAM,kBAAkB,YAAG;aACnC;YAED;;;eAGG;YACH,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;YACpE,MAAM,SAAS,GAAG,mBAAmB,GAAG,EAAE,CAAC;YAE3C,IAAI,IAAA,mBAAQ,GAAE,EAAE;gBACd,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;aACnC;YAED,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC;KAAA;CACF;AAED,kBAAe,OAAO,CAAC"}

package/src/wallets/starknet/starknetProvider.d.ts

@@ -1,32 +1,44 @@
-import { SignerInterface } from 'starknet';
+import { IStarknetWindowObject } from 'get-starknet';
+import { AccountInterface, ProviderInterface } from 'starknet';
 import { Chain, WalletConnector, WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
-import { StarknetProviderHelper } from './starknetProviderHelper';
-declare class StarknetProvider extends StarknetProviderHelper implements WalletConnector {
+type AccountChangeEventHandler = (address: {
+    toString(): string;
+}) => Promise<void>;
+type NetworkChangeEventHandler = (network: {
+    toString(): string;
+}) => Promise<void>;
+type WalletKeys = 'braavos' | 'argentX';
+declare abstract class StarknetProvider implements WalletConnector {
     name: string;
+    windowKey: WalletKeys;
     connectedChain: Chain;
     supportedChains: Chain[];
     canConnectViaQrCode: boolean;
     canConnectViaCustodialService: boolean;
     isWalletConnect: boolean;
-    protected starknetProviderHelper: StarknetProviderHelper;
-    constructor(name: string);
-    getDeepLink(): string | undefined;
+    wallet: IStarknetWindowObject | undefined;
+    handleAccountChange: AccountChangeEventHandler | undefined;
+    handleNetworkChange: NetworkChangeEventHandler | undefined;
+    constructor(name: string, windowKey: WalletKeys);
     get key(): string;
     connect(): Promise<void>;
     fetchPublicAddress(): Promise<string | undefined>;
     getNetwork(): Promise<number | undefined>;
-    getSigner(): Promise<SignerInterface | undefined>;
-    getWeb3Provider(): void;
+    getSigner(): Promise<AccountInterface | undefined>;
+    getWallet(): Promise<IStarknetWindowObject | undefined>;
+    getWeb3Provider(): Promise<ProviderInterface | undefined>;
     getRpcProvider(): Promise<void>;
     signMessage(messageToSign: string): Promise<string | undefined>;
     proveOwnership(messageToSign: string): Promise<string | undefined>;
     getBalance(): Promise<string | undefined>;
     endSession(): Promise<void>;
+    getStarknetWindowObject(): IStarknetWindowObject | undefined;
     isInstalledOnBrowser(): boolean;
     supportsNetworkSwitching(): boolean;
     switchNetwork(): Promise<void>;
-    setupEventListeners(listeners: WalletEventListeners): void;
-    teardownEventListeners(): void;
     getConnectedAccounts(): Promise<string[]>;
+    setupEventListeners(listeners: WalletEventListeners): void;
+    teardownEventListeners(): Promise<void>;
+    getDeepLink(): string | undefined;
 }
 export default StarknetProvider;