@dynamic-labs/multi-wallet 0.16.11 → 0.16.12

package/CHANGELOG.md

@@ -1,4 +1,16 @@
 
+### [0.16.12](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.11...v0.16.12) (2023-05-05)
+
+
+### Features
+
+* **DYN-1820:** support allow list in email authorization ([#1916](https://github.com/dynamic-labs/DynamicAuth/issues/1916)) ([#2039](https://github.com/dynamic-labs/DynamicAuth/issues/2039)) ([3aafb9d](https://github.com/dynamic-labs/DynamicAuth/commit/3aafb9d57e4125048f8b972624625b4a109eb9b1)), closes [#2040](https://github.com/dynamic-labs/DynamicAuth/issues/2040)
+
+
+### Bug Fixes
+
+* **MagicClientNetworkHandler:** save last used network id ([#2046](https://github.com/dynamic-labs/DynamicAuth/issues/2046)) ([bdd9f87](https://github.com/dynamic-labs/DynamicAuth/commit/bdd9f87060905730d76e4aabf7caeee30b310b9e))
+
 ### [0.16.11](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.10...v0.16.11) (2023-05-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/multi-wallet",
-  "version": "0.16.11",
+  "version": "0.16.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -28,8 +28,8 @@
     "magic-sdk": "^16.0.1",
     "@keplr-wallet/provider": "0.11.56",
     "@keplr-wallet/types": "^0.11.51",
-    "@dynamic-labs/logger": "0.16.11",
-    "@dynamic-labs/wallet-connector-core": "0.16.11"
+    "@dynamic-labs/logger": "0.16.12",
+    "@dynamic-labs/wallet-connector-core": "0.16.12"
   },
   "devDependencies": {
     "@walletconnect/types": "^2.2.1"

package/src/errors.cjs

@@ -14,9 +14,10 @@ class EmailVerificationError extends DynamicError {
     }
 }
 class NoAccessError extends DynamicError {
-    constructor(walletPublicKey) {
+    constructor({ walletPublicKey, email, }) {
         super('User does not have access');
         this.name = 'NoAccessError';
+        this.email = email;
         this.walletPublicKey = walletPublicKey;
     }
 }

package/src/errors.d.ts

@@ -7,8 +7,12 @@ export declare class EmailVerificationError extends DynamicError {
     constructor(code: string);
 }
 export declare class NoAccessError extends DynamicError {
-    walletPublicKey: string | undefined;
-    constructor(walletPublicKey: string);
+    walletPublicKey?: string;
+    email?: string;
+    constructor({ walletPublicKey, email, }: {
+        email?: string;
+        walletPublicKey?: string;
+    });
 }
 export declare class ChainalysisError extends DynamicError {
     walletPublicKey: string | undefined;

package/src/errors.js

@@ -10,9 +10,10 @@ class EmailVerificationError extends DynamicError {
     }
 }
 class NoAccessError extends DynamicError {
-    constructor(walletPublicKey) {
+    constructor({ walletPublicKey, email, }) {
         super('User does not have access');
         this.name = 'NoAccessError';
+        this.email = email;
         this.walletPublicKey = walletPublicKey;
     }
 }

package/src/multi-wallet.cjs

@@ -36,7 +36,7 @@ var Dawn = require('./wallets/ethereum/injected/Dawn.cjs');
 var PhantomEvm = require('./wallets/ethereum/injected/PhantomEvm.cjs');
 require('ethers');
 require('./utils/logger.cjs');
-require('magic-sdk');
+require('./wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.cjs');
 var EmailOTPMagicWalletConnector = require('./wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.cjs');
 var isEmailWalletConnector = require('./utils/isEmailWalletConnector/isEmailWalletConnector.cjs');
 var getKeplrConnector = require('./wallets/cosmos/getKeplrConnector.cjs');

package/src/multi-wallet.js

@@ -33,7 +33,7 @@ import Dawn from './wallets/ethereum/injected/Dawn.js';
 import PhantomEvm from './wallets/ethereum/injected/PhantomEvm.js';
 import 'ethers';
 import './utils/logger.js';
-import 'magic-sdk';
+import './wallets/ethereum/MagicConnector/MagicClientNetworkHandler/MagicClientNetworkHandler.js';
 import { EmailOTPMagicWalletConnector } from './wallets/ethereum/MagicConnector/EmailOTPMagicWalletConnector/EmailOTPMagicWalletConnector.js';
 import { isEmailWalletConnector } from './utils/isEmailWalletConnector/isEmailWalletConnector.js';
 import { getKeplerConnector } from './wallets/cosmos/getKeplrConnector.js';

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var magicSdk = require('magic-sdk');
+var logger = require('../../../../utils/logger.cjs');
 
 // these are based off of Magic's EthNetworkName type
 const chainNameToChainIdMap = {
@@ -25,15 +26,21 @@ class MagicClientNetworkHandler {
         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;
+        if (this.lastUsedNetworkId) {
+            this._networkId = this.lastUsedNetworkId;
+        }
+        else {
+            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.__awaiter(this, void 0, void 0, function* () {
             this._networkId = networkChainId;
+            this.lastUsedNetworkId = networkChainId;
             (_a = this.onChainChanged) === null || _a === void 0 ? void 0 : _a.call(this, networkChainId);
         });
     }
@@ -91,6 +98,31 @@ class MagicClientNetworkHandler {
         var _a;
         return (_a = this.evmNetworks.find((evmNetwork) => evmNetwork.networkId === networkId)) === null || _a === void 0 ? void 0 : _a.chainId;
     }
-}
+    get lastUsedNetworkId() {
+        const savedNetworkIdText = localStorage.getItem(MagicClientNetworkHandler.lastUsedNetworkIdStorageKey);
+        if (!savedNetworkIdText)
+            return undefined;
+        try {
+            const networkId = parseInt(savedNetworkIdText);
+            if (isNaN(networkId)) {
+                return undefined;
+            }
+            return networkId;
+        }
+        catch (err) {
+            logger.logger.error(err);
+            return undefined;
+        }
+    }
+    set lastUsedNetworkId(networkId) {
+        if (networkId === undefined) {
+            localStorage.removeItem(MagicClientNetworkHandler.lastUsedNetworkIdStorageKey);
+        }
+        else {
+            localStorage.setItem(MagicClientNetworkHandler.lastUsedNetworkIdStorageKey, networkId.toString());
+        }
+    }
+}
+MagicClientNetworkHandler.lastUsedNetworkIdStorageKey = 'magic-last-used-network-id';
 
 exports.MagicClientNetworkHandler = MagicClientNetworkHandler;

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

@@ -11,6 +11,7 @@ export declare abstract class MagicClientNetworkHandler {
     private _networkId;
     private _config;
     evmNetworks: EvmNetwork[];
+    static lastUsedNetworkIdStorageKey: string;
     constructor({ apiKey, evmNetworks, config }: MagicClientNetworkHandlerProps);
     abstract onChainChanged?(networkChainId: number): void;
     selectNetwork(networkChainId: number): Promise<void>;
@@ -21,4 +22,6 @@ export declare abstract class MagicClientNetworkHandler {
     private get configNetworkId();
     private _getRpcUrlByNetworkId;
     private _getChainIdByNetworkId;
+    get lastUsedNetworkId(): number | undefined;
+    set lastUsedNetworkId(networkId: number | undefined);
 }

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

@@ -1,5 +1,6 @@
 import { __awaiter } from 'tslib';
 import { Magic } from 'magic-sdk';
+import { logger } from '../../../../utils/logger.js';
 
 // these are based off of Magic's EthNetworkName type
 const chainNameToChainIdMap = {
@@ -21,15 +22,21 @@ class MagicClientNetworkHandler {
         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;
+        if (this.lastUsedNetworkId) {
+            this._networkId = this.lastUsedNetworkId;
+        }
+        else {
+            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 __awaiter(this, void 0, void 0, function* () {
             this._networkId = networkChainId;
+            this.lastUsedNetworkId = networkChainId;
             (_a = this.onChainChanged) === null || _a === void 0 ? void 0 : _a.call(this, networkChainId);
         });
     }
@@ -87,6 +94,31 @@ class MagicClientNetworkHandler {
         var _a;
         return (_a = this.evmNetworks.find((evmNetwork) => evmNetwork.networkId === networkId)) === null || _a === void 0 ? void 0 : _a.chainId;
     }
-}
+    get lastUsedNetworkId() {
+        const savedNetworkIdText = localStorage.getItem(MagicClientNetworkHandler.lastUsedNetworkIdStorageKey);
+        if (!savedNetworkIdText)
+            return undefined;
+        try {
+            const networkId = parseInt(savedNetworkIdText);
+            if (isNaN(networkId)) {
+                return undefined;
+            }
+            return networkId;
+        }
+        catch (err) {
+            logger.error(err);
+            return undefined;
+        }
+    }
+    set lastUsedNetworkId(networkId) {
+        if (networkId === undefined) {
+            localStorage.removeItem(MagicClientNetworkHandler.lastUsedNetworkIdStorageKey);
+        }
+        else {
+            localStorage.setItem(MagicClientNetworkHandler.lastUsedNetworkIdStorageKey, networkId.toString());
+        }
+    }
+}
+MagicClientNetworkHandler.lastUsedNetworkIdStorageKey = 'magic-last-used-network-id';
 
 export { MagicClientNetworkHandler };