fix deepsource lint errors

packages/@magic-ext/web3modal-ethers5/src/index.ts

@@ -2,9 +2,9 @@ import { Extension, ThirdPartyWalletEvents } from '@magic-sdk/commons';
 import { Web3Modal, createWeb3Modal, defaultConfig } from '@web3modal/ethers5';
 import { Web3ModalExtensionOptions } from './types';
 
-export class Web3ModalExtension extends Extension.Internal<'web3modal', any> {
+export class Web3ModalExtension extends Extension.Internal<'web3modal'> {
  name = 'web3modal' as const;
- config: any = {};
+ config = {};
  modal: Web3Modal;
 
  static eventsListenerAdded = false;
@@ -35,7 +35,7 @@ export class Web3ModalExtension extends Extension.Internal<'web3modal', any> {
 
  public initialize() {
  this.sdk.thirdPartyWallet.enabledWallets.web3modal = true;
- this.sdk.thirdPartyWallet.isConnected = !!localStorage.getItem('3pw_address');
+ this.sdk.thirdPartyWallet.isConnected = Boolean(localStorage.getItem('3pw_address'));
  this.sdk.thirdPartyWallet.eventListeners.push({
  event: ThirdPartyWalletEvents.Web3ModalSelected,
  callback: async (payloadId) => {
@@ -69,7 +69,7 @@ export class Web3ModalExtension extends Extension.Internal<'web3modal', any> {
  private connectToWeb3modal(payloadId: string) {
  const { modal } = this;
 
- const promiEvent = this.utils.createPromiEvent<string[]>(async () => {
+ const promiEvent = this.utils.createPromiEvent<string[]>(() => {
  // Listen for wallet connected
  const unsubscribeFromProviderEvents = modal.subscribeProvider(({ address, error }) => {
  // User rejected connection request
@@ -80,7 +80,7 @@ export class Web3ModalExtension extends Extension.Internal<'web3modal', any> {
  // If user connected wallet, keep listeners active
  if (address) {
  this.setIsConnected();
- this.createIntermediaryEvent(ThirdPartyWalletEvents.WalletConnected as any, payloadId as any)(address);
+ this.createIntermediaryEvent(ThirdPartyWalletEvents.WalletConnected, payloadId)(address);
  unsubscribeFromProviderEvents();
  this.setEip1193EventListeners();
  }

packages/@magic-ext/web3modal-ethers5/src/types.ts

@@ -1,4 +1,4 @@
-// @ts-ignore
+// @ts-expect-error Module '"@web3modal/ethers5"' has no exported member 'ConfigOptions'.
 import { ConfigOptions, Web3ModalOptions } from '@web3modal/ethers5';
 
 export interface Web3ModalExtensionOptions {

packages/@magic-ext/web3modal-ethers5/test/spec/accountsChanged.spec.ts

@@ -30,7 +30,7 @@ const web3modalParams = {
  },
 };
 
-test('setEip1193EventListeners emits accountsChanged', async () => {
+test('setEip1193EventListeners emits accountsChanged', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.modal.subscribeProvider = jest.fn(
  (callback: (provider: { address: string; chainId: number }) => void) => {

packages/@magic-ext/web3modal-ethers5/test/spec/chainChanged.spec.ts

@@ -30,7 +30,7 @@ const web3modalParams = {
  },
 };
 
-test('setEip1193EventListeners emits chainChanged', async () => {
+test('setEip1193EventListeners emits chainChanged', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  localStorage.setItem('3pw_address', '0x123');
  magic.web3modal.modal.subscribeProvider = jest.fn(

packages/@magic-ext/web3modal-ethers5/test/spec/connectToWeb3Modal.spec.ts

@@ -33,31 +33,31 @@ const web3modalParams = {
  },
 };
 
-test('connectToWeb3modal returns promiEvent', async () => {
+test('connectToWeb3modal returns promiEvent', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  expect(isPromiEvent(magic.web3modal.connectToWeb3modal())).toBeTruthy();
 });
 
-test('connectToWeb3modal calls subscribeProvider', async () => {
+test('connectToWeb3modal calls subscribeProvider', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.connectToWeb3modal();
  expect(magic.web3modal.modal.subscribeProvider).toBeCalled();
 });
 
-test('connectToWeb3modal calls subscribeEvents', async () => {
+test('connectToWeb3modal calls subscribeEvents', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.connectToWeb3modal();
  expect(magic.web3modal.modal.subscribeEvents).toBeCalled();
 });
 
-test('connectToWeb3modal calls `open`', async () => {
+test('connectToWeb3modal calls `open`', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.connectToWeb3modal();
  expect(magic.web3modal.modal.open).toBeCalled();
 });
 
 // skip because it does not like calling the unsubscribe function
-test.skip('connectToWeb3modal emits wallet_rejected event on subscribeProvider error', async () => {
+test.skip('connectToWeb3modal emits wallet_rejected event on subscribeProvider error', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.modal.subscribeProvider = jest.fn((callback: (provider: { error: boolean }) => void) => {
  callback({ error: true });
@@ -70,7 +70,7 @@ test.skip('connectToWeb3modal emits wallet_rejected event on subscribeProvider e
 });
 
 // skip because it does not like calling the unsubscribe function
-test.skip('connectToWeb3modal emits wallet_connected event on `address` event', async () => {
+test.skip('connectToWeb3modal emits wallet_connected event on `address` event', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.modal.subscribeProvider = jest.fn((callback: (provider: { address: string }) => void) => {
  callback({ address: '0x123' });
@@ -90,7 +90,7 @@ test.skip('connectToWeb3modal emits wallet_connected event on `address` event',
 });
 
 // skip because it does not like calling the unsubscribe function
-test.skip('connectToWeb3modal emits wallet_rejected event on "MODAL_CLOSE" event', async () => {
+test.skip('connectToWeb3modal emits wallet_rejected event on "MODAL_CLOSE" event', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.modal.subscribeEvents = jest.fn(
  (

packages/@magic-ext/web3modal-ethers5/test/spec/constructor.spec.ts

@@ -31,14 +31,14 @@ const web3modalParams = {
  },
 };
 
-test('constructor sets up modal and getIsConnected is false', async () => {
+test('constructor sets up modal and getIsConnected is false', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.modal.getIsConnected.mockReturnValueOnce(false);
  expect(magic.web3modal.modal).toBeDefined();
  expect(magic.web3modal.modal.getIsConnected()).toBeFalsy();
 });
 
-test('constructor sets event listeners when getIsConnected is true', async () => {
+test('constructor sets event listeners when getIsConnected is true', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.modal.getIsConnected = jest.fn().mockReturnValue(true);
  const setIsConnectedSpy = jest.spyOn(magic.web3modal, 'setIsConnected').mockImplementation(() => Promise.resolve({}));
@@ -49,70 +49,3 @@ test('constructor sets event listeners when getIsConnected is true', async () =>
  expect(setIsConnectedSpy).toBeCalled();
  expect(setEip1193EventListenersSpy).toBeCalled();
 });
-
-// test('setIsConnected', async () => {
-// const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
-// magic.web3modal.setIsConnected();
-// expect(localStorage.getItem('3pw_provider')).toEqual('web3modal');
-// expect(localStorage.getItem('3pw_address')).toEqual('0x123');
-// expect(localStorage.getItem('3pw_chainId')).toEqual('1');
-// expect(magic.thirdPartyWallet.isConnected).toBeTruthy();
-// });
-
-// test('initialize', async () => {
-// const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
-// magic.web3modal.initialize();
-// expect(magic.thirdPartyWallet.enabledWallets.web3modal).toBeTruthy();
-// expect(magic.thirdPartyWallet.isConnected).toBeFalsy();
-// expect(magic.thirdPartyWallet.eventListeners.length).toEqual(1);
-// });
-
-// // this one is triggering the callback console.log
-// test('setEip1193EventListeners calls subscribeProvider', async () => {
-// const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
-// magic.web3modal.setEip1193EventListeners();
-// expect(magic.web3modal.modal.subscribeProvider).toBeCalled();
-// });
-
-// test('setEip1193EventListeners emits accountsChanged', async () => {
-// const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
-// magic.web3modal.modal.subscribeProvider = jest.fn(
-// (callback: (provider: { address: string; chainId: number }) => void) => {
-// callback({ address: '0x123', chainId: 1 });
-// },
-// );
-// const emitSpy = jest.spyOn(magic.rpcProvider, 'emit').mockImplementation(() => Promise.resolve({}));
-// magic.web3modal.setEip1193EventListeners();
-// expect(emitSpy).toBeCalledWith('accountsChanged', ['0x123']);
-// });
-
-// test('setEip1193EventListeners emits chainChanged', async () => {
-// const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
-// localStorage.setItem('3pw_address', '0x123');
-// magic.web3modal.modal.subscribeProvider = jest.fn(
-// (callback: (provider: { address: string; chainId: number }) => void) => {
-// callback({ address: '0x123', chainId: 1 });
-// },
-// );
-// const emitSpy = jest.spyOn(magic.rpcProvider, 'emit').mockImplementation(() => Promise.resolve({}));
-// magic.web3modal.setEip1193EventListeners();
-// expect(magic.web3modal.modal.subscribeProvider).toBeCalled();
-// expect(emitSpy).toBeCalledWith('chainChanged', [1]);
-// });
-
-// test('setEip1193EventListeners does not set listeners if they were already set', async () => {
-// const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
-// magic.web3modal.eventsListenerAdded = true;
-// const subscribeProviderSpy = jest.spyOn(magic.web3modal.modal, 'subscribeProvider');
-// magic.web3modal.setEip1193EventListeners();
-// expect(subscribeProviderSpy).toBeCalledTimes(0);
-// });
-
-// test('calls subscribeProvider callback', async () => {
-// const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
-// const callback = jest.fn();
-// magic.web3modal.eventsListenerAdded = false;
-// jest.spyOn(magic.web3modal.modal, 'subscribeProvider').mockImplementation(callback);
-// magic.web3modal.setEip1193EventListeners();
-// expect(callback).toBeCalled();
-// });

packages/@magic-ext/web3modal-ethers5/test/spec/initialize.spec.ts

@@ -24,7 +24,7 @@ const web3modalParams = {
  },
 };
 
-test('initialize updates `enabledWallets`, `isConnected`, and `eventListeners`', async () => {
+test('initialize updates `enabledWallets`, `isConnected`, and `eventListeners`', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.initialize();
  expect(magic.thirdPartyWallet.enabledWallets.web3modal).toBeTruthy();

packages/@magic-ext/web3modal-ethers5/test/spec/setEventListeners.spec.ts

@@ -30,13 +30,13 @@ const web3modalParams = {
  },
 };
 
-test('setEip1193EventListeners calls subscribeProvider', async () => {
+test('setEip1193EventListeners calls subscribeProvider', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.setEip1193EventListeners();
  expect(magic.web3modal.modal.subscribeProvider).toBeCalled();
 });
 
-test('setEip1193EventListeners does not set listeners if they were already set', async () => {
+test('setEip1193EventListeners does not set listeners if they were already set', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.eventsListenerAdded = true;
  const subscribeProviderSpy = jest.spyOn(magic.web3modal.modal, 'subscribeProvider');

packages/@magic-ext/web3modal-ethers5/test/spec/setIsConnected.spec.ts

@@ -29,7 +29,7 @@ const web3modalParams = {
  },
 };
 
-test('setIsConnected sets localStorage values', async () => {
+test('setIsConnected sets localStorage values', () => {
  const magic = createMagicSDKWithExtension({}, [new Web3ModalExtension(web3modalParams)]);
  magic.web3modal.setIsConnected();
  expect(localStorage.getItem('3pw_provider')).toEqual('web3modal');

packages/@magic-sdk/provider/src/modules/third-party-wallet.ts

@@ -42,7 +42,7 @@ export class ThirdPartyWalletModule extends BaseModule {
 
  /* Core Method Overrides */
 
- private isLoggedIn(payload: Partial<JsonRpcRequestPayload>): PromiEvent<boolean, any> {
+ private isLoggedIn(payload: Partial<JsonRpcRequestPayload>): PromiEvent<boolean> {
  switch (localStorage.getItem('3pw_provider')) {
  case 'web3modal':
  return this.web3modalIsLoggedIn();
@@ -52,7 +52,7 @@ export class ThirdPartyWalletModule extends BaseModule {
  }
  }
 
- private getInfo(payload: Partial<JsonRpcRequestPayload>): PromiEvent<MagicUserMetadata, any> {
+ private getInfo(payload: Partial<JsonRpcRequestPayload>): PromiEvent<MagicUserMetadata> {
  switch (localStorage.getItem('3pw_provider')) {
  case 'web3modal':
  return this.web3modalGetInfo();
@@ -62,7 +62,7 @@ export class ThirdPartyWalletModule extends BaseModule {
  }
  }
 
- private logout(payload: Partial<JsonRpcRequestPayload>): PromiEvent<boolean, any> {
+ private logout(payload: Partial<JsonRpcRequestPayload>): PromiEvent<boolean> {
  const provider = localStorage.getItem('3pw_provider');
  this.resetState();
  switch (provider) {
@@ -77,46 +77,46 @@ export class ThirdPartyWalletModule extends BaseModule {
  /* Web3Modal Methods */
 
  private web3modalRequest(payload: Partial<JsonRpcRequestPayload>) {
- return createPromiEvent<any, any>((resolve, reject) => {
- // @ts-ignore
+ return createPromiEvent<unknown>((resolve, reject) => {
+ // @ts-expect-error Property 'web3modal' does not exist on type 'SDKBase'.
  this.sdk.web3modal.modal.getWalletProvider().request(payload).then(resolve).catch(reject);
  });
  }
 
  private web3modalIsLoggedIn() {
- return createPromiEvent<boolean, any>((resolve) => {
+ return createPromiEvent<boolean>((resolve) => {
  // Required delay to allow web3modal to register connection
  setTimeout(() => {
- // @ts-ignore
+ // @ts-expect-error Property 'web3modal' does not exist on type 'SDKBase'.
  const isLoggedIn: boolean = this.sdk.web3modal.modal.getIsConnected();
  resolve(isLoggedIn);
  }, 50);
  });
  }
 
  private web3modalGetInfo() {
- return createPromiEvent<MagicUserMetadata, any>((resolve) => {
- // @ts-ignore
+ return createPromiEvent<MagicUserMetadata>((resolve) => {
+ // @ts-expect-error Property 'web3modal' does not exist on type 'SDKBase'.
  const walletType = this.sdk.web3modal.modal.getWalletInfo()?.name;
- // @ts-ignore
+ // @ts-expect-error Property 'web3modal' does not exist on type 'SDKBase'.
  const userAddress = this.sdk.web3modal.modal.getAddress();
  resolve({
  publicAddress: userAddress,
  email: null,
  issuer: `$did:ethr:${userAddress}`,
  phoneNumber: null,
  isMfaEnabled: false,
- recoveryFactors: [] as any,
+ recoveryFactors: [],
  walletType,
  });
  });
  }
 
- private web3modalLogout(): PromiEvent<boolean, any> {
- return createPromiEvent<boolean, any>(async (resolve) => {
+ private web3modalLogout(): PromiEvent<boolean> {
+ return createPromiEvent<boolean>(async (resolve) => {
  try {
- // @ts-ignore
- await this.sdk.web3modal.modal?.disconnect();
+ // @ts-expect-error Property 'web3modal' does not exist on type 'SDKBase'.
+ await this.sdk.web3modal.modal.disconnect();
  } catch (error) {
  console.error(error);
  }

packages/@magic-sdk/provider/src/modules/wallet.ts

@@ -80,7 +80,7 @@ export class WalletModule extends BaseModule {
 
  /* Get user info such as the wallet type they are logged in with */
  // deprecating
- public async getInfo() {
+ public getInfo() {
  createDeprecationWarning({
  method: 'wallet.getInfo()',
  removalVersions: ProductConsolidationMethodRemovalVersions,

packages/@magic-sdk/provider/test/mocks.ts

@@ -44,10 +44,12 @@ export function mockLocalStorage() {
  ls[key] = value.toString();
  }),
  removeItem: jest.fn((key) => {
- delete ls[key];
+ ls[key] = undefined;
  }),
  clear: jest.fn(() => {
- Object.keys(ls).forEach((key) => delete ls[key]);
+ Object.keys(ls).forEach((key) => {
+ ls[key] = undefined;
+ });
  }),
  };
 

packages/@magic-sdk/provider/test/spec/modules/base-module/request.spec.ts

@@ -324,7 +324,7 @@ test('Calls third party wallet request override if third party wallet is connect
  expect(spy).toBeCalledTimes(1);
 });
 
-test('Does not call thirdPartyWallet requestOverride if method is magic_intermediary_event', async () => {
+test('Does not call thirdPartyWallet requestOverride if method is magic_intermediary_event', () => {
  mockLocalStorage();
  const response = new JsonRpcResponse(requestPayload).applyResult('magic_intermediary_event');
  const { baseModule } = createBaseModule(jest.fn().mockImplementation(() => Promise.resolve(response)));
@@ -335,7 +335,7 @@ test('Does not call thirdPartyWallet requestOverride if method is magic_intermed
  expect(spy).toBeCalledTimes(0);
 });
 
-test('Does not call thirdPartyWallet requestOverride if method is magic_nft_checkout', async () => {
+test('Does not call thirdPartyWallet requestOverride if method is magic_nft_checkout', () => {
  mockLocalStorage();
  const response = new JsonRpcResponse(requestPayload).applyResult('magic_nft_checkout');
  const { baseModule } = createBaseModule(jest.fn().mockImplementation(() => Promise.resolve(response)));
@@ -346,7 +346,7 @@ test('Does not call thirdPartyWallet requestOverride if method is magic_nft_chec
  expect(spy).toBeCalledTimes(0);
 });
 
-test('Does not call thirdPartyWallet requestOverride if method is mc_login', async () => {
+test('Does not call thirdPartyWallet requestOverride if method is mc_login', () => {
  mockLocalStorage();
  const response = new JsonRpcResponse(requestPayload).applyResult('mc_login');
  const { baseModule } = createBaseModule(jest.fn().mockImplementation(() => Promise.resolve(response)));

packages/@magic-sdk/provider/test/spec/modules/third-party-wallet/getInfo.spec.ts

@@ -23,7 +23,8 @@ describe('third party wallet getInfo', () => {
  const payload = { method: 'getInfo' };
  const magic = createMagicSDK();
  const requestMock = jest.fn();
- (BaseModule as any).prototype.request = requestMock;
+ // @ts-expect-error 'request' is protected
+ BaseModule.prototype.request = requestMock;
  magic.thirdPartyWallet.getInfo(payload);
  expect(requestMock).toHaveBeenCalled();
  });

packages/@magic-sdk/provider/test/spec/modules/third-party-wallet/isLoggedIn.spec.ts

@@ -23,7 +23,8 @@ describe('third party wallet isLoggedIn', () => {
  const payload = { method: 'isLoggedIn' };
  const magic = createMagicSDK();
  const requestMock = jest.fn();
- (BaseModule as any).prototype.request = requestMock;
+ // @ts-expect-error 'request' is protected
+ BaseModule.prototype.request = requestMock;
  magic.thirdPartyWallet.isLoggedIn(payload);
  expect(requestMock).toHaveBeenCalled();
  });