thirdweb 5.37.1-nightly-26d825bc4f0475523ea761aa18ab979557295c28-20240722000339 → 5.38.0

package/src/exports/chains.ts

@@ -26,6 +26,22 @@ export { optimismSepolia } from "../chains/chain-definitions/optimism-sepolia.js
 export { optimism } from "../chains/chain-definitions/optimism.js";
 export { lineaSepolia } from "../chains/chain-definitions/linea-sepolia.js";
 export { linea } from "../chains/chain-definitions/linea.js";
+export { astriaEvmDusknet } from "../chains/chain-definitions/astria-evm-dusknet.js";
+export { fantom } from "../chains/chain-definitions/fantom.js";
+export { polygonZkEvm } from "../chains/chain-definitions/polygon-zkevm.js";
+export { gnosis } from "../chains/chain-definitions/gnosis.js";
+export { mantaPacific } from "../chains/chain-definitions/manta-pacific.js";
+export { xai } from "../chains/chain-definitions/xai.js";
+export { celo } from "../chains/chain-definitions/celo.js";
+export { cronos } from "../chains/chain-definitions/cronos.js";
+export { degen } from "../chains/chain-definitions/degen.js";
+export { scroll } from "../chains/chain-definitions/scroll.js";
+export { moonbeam } from "../chains/chain-definitions/moonbeam.js";
+export { loot } from "../chains/chain-definitions/loot.js";
+export { palm } from "../chains/chain-definitions/palm.js";
+export { rari } from "../chains/chain-definitions/rari.js";
+export { godWoken } from "../chains/chain-definitions/god-woken.js";
+
 // mumbai = alias for polygonMumbai
 export {
   polygonMumbai,
@@ -40,3 +56,18 @@ export { bsc } from "../chains/chain-definitions/bsc.js";
 export { bscTestnet } from "../chains/chain-definitions/bsc-testnet.js";
 export { zkSync } from "../chains/chain-definitions/zksync.js";
 export { zkSyncSepolia } from "../chains/chain-definitions/zksync-sepolia.js";
+export { localhost } from "../chains/chain-definitions/localhost.js";
+export { zkCandySepolia } from "../chains/chain-definitions/zk-candy-sepolia.js";
+export { fantomTestnet } from "../chains/chain-definitions/fantom-testnet.js";
+export { polygonZkEvmTestnet } from "../chains/chain-definitions/polygon-zkevm-testnet.js";
+export { gnosisChiadoTestnet } from "../chains/chain-definitions/gnosis-chiado-testnet.js";
+export { blastSepolia } from "../chains/chain-definitions/blast-sepolia.js";
+export { mantaPacificTestnet } from "../chains/chain-definitions/manta-pacific-testnet.js";
+export { xaiSepolia } from "../chains/chain-definitions/xai-sepolia.js";
+export { scrollAlphaTestnet } from "../chains/chain-definitions/scroll-alpha-testnet.js";
+export { scrollSepoliaTestnet } from "../chains/chain-definitions/scroll-sepolia-testnet.js";
+export { palmTestnet } from "../chains/chain-definitions/palm-testnet.js";
+export { rariTestnet } from "../chains/chain-definitions/rari-testnet.js";
+export { frameTestnet } from "../chains/chain-definitions/frame-testnet.js";
+export { hokumTestnet } from "../chains/chain-definitions/hokum-testnet.js";
+export { godWokenTestnetV1 } from "../chains/chain-definitions/god-woken-testnet-v1.js";

package/src/react/web/wallets/shared/openOauthSignInWindow.ts

@@ -1,5 +1,5 @@
 import type { ThirdwebClient } from "../../../../client/client.js";
-import { getDiscordLoginPath } from "../../../../wallets/in-app/core/authentication/getLoginPath.js";
+import { getSocialAuthLoginPath } from "../../../../wallets/in-app/core/authentication/getLoginPath.js";
 import type { InAppWalletSocialAuth } from "../../../../wallets/in-app/core/wallet/types.js";
 import type { Ecosystem } from "../../../../wallets/in-app/web/types.js";
 import type { Theme } from "../../../core/design-system/index.js";
@@ -30,8 +30,11 @@ function getOauthLoginPath(
   ecosystem?: Ecosystem,
 ) {
   switch (authOption) {
+    case "apple":
+    case "facebook":
+    case "google":
     case "discord":
-      return getDiscordLoginPath(client, ecosystem);
+      return getSocialAuthLoginPath(authOption, client, ecosystem);
     default:
       return "";
   }

package/src/utils/any-evm/compute-published-contract-deploy-info.ts

@@ -24,6 +24,7 @@ export async function computeDeploymentInfoFromContractId(args: {
     client,
     contractId,
     publisher: args.publisher,
+    version: args.version,
   });
   return computeDeploymentInfoFromMetadata({
     client,

package/src/utils/bytecode/resolveImplementation.test.ts

@@ -0,0 +1,53 @@
+import type { AbiConstructor } from "abitype";
+import { describe, expect, it } from "vitest";
+import {
+  DUMMY_BYTECODE,
+  ERC1967_PROXY_BYTECODE,
+  ERC1967_PROXY_CONSTRUCTOR_ABI,
+} from "../../../test/src/abis/proxy.js";
+import { ANVIL_CHAIN } from "../../../test/src/chains.js";
+import { TEST_CLIENT } from "../../../test/src/test-clients.js";
+import {
+  NFT_DROP_CONTRACT,
+  NFT_DROP_IMPLEMENTATION,
+} from "../../../test/src/test-contracts.js";
+import { TEST_ACCOUNT_A } from "../../../test/src/test-wallets.js";
+import { getContract } from "../../contract/contract.js";
+import { deployContract } from "../../contract/deployment/deploy-with-abi.js";
+import { resolveImplementation } from "./resolveImplementation.js";
+
+describe("Resolve implementation", async () => {
+  it("should extract implementation address for minimal proxy contract", async () => {
+    const resolved = resolveImplementation(NFT_DROP_CONTRACT);
+    expect((await resolved).address).to.equal(NFT_DROP_IMPLEMENTATION);
+  });
+
+  it("should extract implementation address for ERC1967 proxy contract", async () => {
+    const implementationAddress = await deployContract({
+      client: TEST_CLIENT,
+      chain: ANVIL_CHAIN,
+      account: TEST_ACCOUNT_A,
+      bytecode: DUMMY_BYTECODE,
+      constructorAbi: {} as AbiConstructor,
+      constructorParams: [],
+    });
+
+    const proxyAddress = await deployContract({
+      client: TEST_CLIENT,
+      chain: ANVIL_CHAIN,
+      account: TEST_ACCOUNT_A,
+      bytecode: ERC1967_PROXY_BYTECODE,
+      constructorAbi: ERC1967_PROXY_CONSTRUCTOR_ABI as AbiConstructor,
+      constructorParams: [implementationAddress, ""],
+    });
+
+    const proxy = getContract({
+      chain: ANVIL_CHAIN,
+      address: proxyAddress,
+      client: TEST_CLIENT,
+    });
+
+    const resolved = await resolveImplementation(proxy);
+    expect(resolved.address).to.equal(implementationAddress);
+  });
+});

package/src/utils/bytecode/resolveImplementation.ts

@@ -42,40 +42,39 @@ export async function resolveImplementation(
   }
 
   // check other proxy types
+  let implementationAddress: string | undefined;
   if (beacon && beacon !== AddressZero) {
     // In case of a BeaconProxy, it is setup as BeaconProxy --> Beacon --> Implementation
     // Hence we replace the proxy address with Beacon address, and continue further resolving below
     // biome-ignore lint/style/noParameterAssign: we purposefully mutate the contract object here
     contract = { ...contract, address: beacon };
+
+    implementationAddress = await getImplementationFromContractCall(contract);
+  } else {
+    implementationAddress = await getImplementationFromStorageSlot(contract);
   }
-  const implementations = await Promise.all([
-    getImplementationFromStorageSlot(contract),
-    getImplementationFromContractCall(contract),
-  ]);
-  // this seems inefficient
-  for (const implementationAddress of implementations) {
-    if (
-      implementationAddress &&
-      isAddress(implementationAddress) &&
-      implementationAddress !== AddressZero
-    ) {
-      const implementationBytecode = await getBytecode({
-        ...contract,
-        address: implementationAddress,
-      });
-      // return the original contract bytecode if the implementation bytecode is empty
-      if (implementationBytecode === "0x") {
-        return {
-          address: contract.address,
-          bytecode: originalBytecode,
-        };
-      }
 
+  if (
+    implementationAddress &&
+    isAddress(implementationAddress) &&
+    implementationAddress !== AddressZero
+  ) {
+    const implementationBytecode = await getBytecode({
+      ...contract,
+      address: implementationAddress,
+    });
+    // return the original contract bytecode if the implementation bytecode is empty
+    if (implementationBytecode === "0x") {
       return {
-        address: implementationAddress,
-        bytecode: implementationBytecode,
+        address: contract.address,
+        bytecode: originalBytecode,
       };
     }
+
+    return {
+      address: implementationAddress,
+      bytecode: implementationBytecode,
+    };
   }
 
   return { address: contract.address, bytecode: originalBytecode };

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.37.1-nightly-26d825bc4f0475523ea761aa18ab979557295c28-20240722000339";
+export const version = "5.38.0";

package/src/wallets/in-app/core/authentication/getLoginPath.ts

@@ -1,13 +1,14 @@
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
+import type { SocialAuthOption } from "../../../../wallets/types.js";
 import type { Ecosystem } from "../../web/types.js";
 
-// TODO: make this generic for all auth providers
-export const getDiscordLoginPath = (
+export const getSocialAuthLoginPath = (
+  authOption: SocialAuthOption,
   client: ThirdwebClient,
   ecosystem?: Ecosystem,
 ) => {
-  const baseUrl = `${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/login/discord?clientId=${client.clientId}`;
+  const baseUrl = `${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/login/${authOption}?clientId=${client.clientId}`;
   if (ecosystem?.partnerId) {
     return `${baseUrl}&ecosystemId=${ecosystem.id}&ecosystemPartnerId=${ecosystem.partnerId}`;
   }

package/src/wallets/in-app/core/authentication/type.ts

@@ -65,7 +65,7 @@ export enum AuthProvider {
 }
 
 export type OauthOption = {
-  provider: AuthProvider;
+  strategy: SocialAuthOption;
   redirectUrl: string;
 };
 
@@ -207,13 +207,3 @@ export type GetUser =
 export type GetAuthenticatedUserParams = {
   client: ThirdwebClient;
 };
-
-export const oauthStrategyToAuthProvider: Record<
-  SocialAuthOption,
-  AuthProvider
-> = {
-  google: AuthProvider.GOOGLE,
-  facebook: AuthProvider.FACEBOOK,
-  apple: AuthProvider.APPLE,
-  discord: AuthProvider.DISCORD,
-};

package/src/wallets/in-app/native/auth/native-auth.ts

@@ -3,7 +3,7 @@ import type { CognitoUser } from "amazon-cognito-identity-js";
 import { Auth } from "aws-amplify";
 import * as WebBrowser from "expo-web-browser";
 import type { ThirdwebClient } from "../../../../client/client.js";
-import { getDiscordLoginPath } from "../../core/authentication/getLoginPath.js";
+import { getSocialAuthLoginPath } from "../../core/authentication/getLoginPath.js";
 import {
   AuthProvider,
   type AuthStoredTokenWithCookieReturnType,
@@ -30,10 +30,8 @@ import {
   preAuth,
 } from "../helpers/auth/middleware.js";
 import {
-  DOMAIN_URL_2023,
   ROUTE_AUTH_ENDPOINT_CALLBACK,
   ROUTE_AUTH_JWT_CALLBACK,
-  ROUTE_HEADLESS_OAUTH_LOGIN,
 } from "../helpers/constants.js";
 import { createErrorMessage } from "../helpers/errors.js";
 import { isDeviceSharePresentForUser } from "../helpers/storage/local.js";
@@ -207,48 +205,14 @@ export async function validateEmailOTP(options: {
 }
 
 export async function socialLogin(
-  oauthOptions: OauthOption,
+  auth: OauthOption,
   client: ThirdwebClient,
 ): Promise<AuthStoredTokenWithCookieReturnType> {
-  const encodedProvider = encodeURIComponent(oauthOptions.provider);
-  const headlessLoginLinkWithParams = `${ROUTE_HEADLESS_OAUTH_LOGIN}?authProvider=${encodedProvider}&baseUrl=${encodeURIComponent(
-    DOMAIN_URL_2023,
-  )}&platform=${encodeURIComponent("mobile")}`;
+  const loginUrl = `${getSocialAuthLoginPath(auth.strategy, client)}&redirectUrl=${encodeURIComponent(auth.redirectUrl)}`;
 
-  const resp = await fetch(headlessLoginLinkWithParams, {
-    headers: {
-      ...getSessionHeaders(),
-    },
-  });
-
-  if (!resp.ok) {
-    const error = await resp.json();
-    throw new Error(`Error getting headless sign in link: ${error.message}`);
-  }
-
-  const json = await resp.json();
-
-  const { platformLoginLink } = json;
-
-  // Temporary fork for discord until we migrate all methods to the new auth flow
-  const loginUrl = (() => {
-    if (oauthOptions.provider === AuthProvider.DISCORD) {
-      return `${getDiscordLoginPath(client)}&redirectUrl=${encodeURIComponent(
-        oauthOptions.redirectUrl,
-      )}`;
-    } else {
-      return `${platformLoginLink}?developerClientId=${encodeURIComponent(
-        client.clientId,
-      )}&platform=${encodeURIComponent("mobile")}&redirectUrl=${encodeURIComponent(
-        oauthOptions.redirectUrl,
-      )}&authOption=${encodedProvider}`;
-    }
-  })();
-
-  // TODO platform specific code should be extracted out
   const result = await WebBrowser.openAuthSessionAsync(
     loginUrl,
-    oauthOptions.redirectUrl,
+    auth.redirectUrl,
     {
       preferEphemeralSession: false,
       showTitle: false,
@@ -262,19 +226,18 @@ export async function socialLogin(
   }
 
   if (result.type !== "success") {
-    throw new Error(`Can't sign in with ${oauthOptions.provider}: ${result}`);
+    throw new Error(`Can't sign in with ${auth.strategy}: ${result}`);
   }
 
-  const decodedUrl = decodeURIComponent(result.url);
+  const resultURL = new URL(result.url);
+  const authResult = resultURL.searchParams.get("authResult");
+  const error = resultURL.searchParams.get("error");
 
-  const parts = decodedUrl.split("?authResult=");
-  if (parts.length < 2) {
-    // assume error
-    const error = decodedUrl.split("?error=")?.[1];
+  // assume error
+  if (error) {
     throw new Error(`Something went wrong: ${error}`);
   }
 
-  const authResult = parts[1];
   if (!authResult) {
     throw new Error("No auth result found");
   }

package/src/wallets/in-app/native/helpers/auth/middleware.ts

@@ -11,10 +11,7 @@ import {
   setWallerUserDetails,
 } from "../storage/local.js";
 import { setUpNewUserWallet } from "../wallet/creation.js";
-import {
-  getCognitoRecoveryPasswordV1,
-  getCognitoRecoveryPasswordV2,
-} from "../wallet/recoveryCode.js";
+import { getCognitoRecoveryPasswordV2 } from "../wallet/recoveryCode.js";
 import { setUpShareForNewDevice } from "../wallet/retrieval.js";
 
 export async function preAuth(args: {
@@ -154,11 +151,7 @@ async function getRecoveryCode(
       return recoveryCode;
     } else {
       try {
-        // temporary fork for discord until we migrate all methods to the new auth flow
-        const code = await (storedToken.authProvider === AuthProvider.DISCORD
-          ? getCognitoRecoveryPasswordV2(client)
-          : getCognitoRecoveryPasswordV1(client));
-        return code;
+        return await getCognitoRecoveryPasswordV2(client);
       } catch (e) {
         throw new Error("Something went wrong getting cognito recovery code");
       }

package/src/wallets/in-app/native/native-connector.ts

@@ -9,7 +9,6 @@ import {
   type PreAuthArgsType,
   type SendEmailOtpReturnType,
   UserWalletStatus,
-  oauthStrategyToAuthProvider,
 } from "../core/authentication/type.js";
 import type { InAppConnector } from "../core/interfaces/connector.js";
 import {
@@ -114,9 +113,8 @@ export class InAppNativeConnector implements InAppConnector {
         const ExpoLinking = require("expo-linking");
         const redirectUrl =
           params.redirectUrl || (ExpoLinking.createURL("") as string);
-        const oauthProvider = oauthStrategyToAuthProvider[strategy];
         return this.socialLogin({
-          provider: oauthProvider,
+          strategy,
           redirectUrl,
         });
       }
@@ -181,14 +179,9 @@ export class InAppNativeConnector implements InAppConnector {
     return deleteActiveAccount({ client: this.options.client });
   }
 
-  private async socialLogin(
-    oauthOption: OauthOption,
-  ): Promise<AuthLoginReturnType> {
+  private async socialLogin(auth: OauthOption): Promise<AuthLoginReturnType> {
     try {
-      const { storedToken } = await socialLogin(
-        oauthOption,
-        this.options.client,
-      );
+      const { storedToken } = await socialLogin(auth, this.options.client);
       const account = await this.getAccount();
       return {
         user: {
@@ -199,17 +192,11 @@ export class InAppNativeConnector implements InAppConnector {
         },
       };
     } catch (error) {
-      console.error(
-        `Error while signing in with: ${oauthOption.provider}. ${error}`,
-      );
+      console.error(`Error while signing in with: ${auth}. ${error}`);
       if (error instanceof Error) {
-        throw new Error(
-          `Error signing in with ${oauthOption.provider}: ${error.message}`,
-        );
+        throw new Error(`Error signing in with ${auth}: ${error.message}`);
       }
-      throw new Error(
-        `An unknown error occurred signing in with ${oauthOption.provider}`,
-      );
+      throw new Error(`An unknown error occurred signing in with ${auth}`);
     }
   }
 

package/src/wallets/in-app/web/lib/auth/{discord.ts → oauth.ts}

@@ -1,23 +1,62 @@
 import type { ThirdwebClient } from "../../../../../client/client.js";
 import { getThirdwebBaseUrl } from "../../../../../utils/domains.js";
 import type { AuthStoredTokenWithCookieReturnType } from "../../../../../wallets/in-app/core/authentication/type.js";
-import { getDiscordLoginPath } from "../../../core/authentication/getLoginPath.js";
+import type { SocialAuthOption } from "../../../../../wallets/types.js";
 import type { Ecosystem } from "../../types.js";
 import { DEFAULT_POP_UP_SIZE } from "./constants.js";
-import { closeWindow } from "./utils.js";
 
-export async function loginWithDiscord(options: {
+const closeWindow = ({
+  isWindowOpenedByFn,
+  win,
+  closeOpenedWindow,
+}: {
+  win?: Window | null;
+  isWindowOpenedByFn: boolean;
+  closeOpenedWindow?: (openedWindow: Window) => void;
+}) => {
+  if (isWindowOpenedByFn) {
+    win?.close();
+  } else {
+    if (win && closeOpenedWindow) {
+      closeOpenedWindow(win);
+    } else if (win) {
+      win.close();
+    }
+  }
+};
+
+export const getSocialAuthLoginPath = (
+  authOption: SocialAuthOption,
+  client: ThirdwebClient,
+  ecosystem?: Ecosystem,
+) => {
+  const baseUrl = `${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/login/${authOption}?clientId=${client.clientId}`;
+  if (ecosystem?.partnerId) {
+    return `${baseUrl}&ecosystemId=${ecosystem.id}&ecosystemPartnerId=${ecosystem.partnerId}`;
+  }
+  if (ecosystem) {
+    return `${baseUrl}&ecosystemId=${ecosystem.id}`;
+  }
+  return baseUrl;
+};
+
+export const loginWithOauth = async (options: {
+  authOption: SocialAuthOption;
   client: ThirdwebClient;
   ecosystem?: Ecosystem;
   openedWindow?: Window | null | undefined;
   closeOpenedWindow?: ((openedWindow: Window) => void) | undefined;
-}): Promise<AuthStoredTokenWithCookieReturnType> {
+}): Promise<AuthStoredTokenWithCookieReturnType> => {
   let win = options.openedWindow;
   let isWindowOpenedByFn = false;
   if (!win) {
     win = window.open(
-      getDiscordLoginPath(options.client, options.ecosystem),
-      "Login to discord",
+      getSocialAuthLoginPath(
+        options.authOption,
+        options.client,
+        options.ecosystem,
+      ),
+      `Login to ${options.authOption}`,
       DEFAULT_POP_UP_SIZE,
     );
     isWindowOpenedByFn = true;
@@ -30,9 +69,6 @@ export async function loginWithDiscord(options: {
     (resolve, reject) => {
       // detect when the user closes the login window
       const pollTimer = window.setInterval(async () => {
-        if (!win) {
-          return;
-        }
         if (win.closed) {
           clearInterval(pollTimer);
           window.removeEventListener("message", messageListener);
@@ -89,4 +125,4 @@ export async function loginWithDiscord(options: {
     },
   );
   return result;
-}
+};

package/src/wallets/in-app/web/lib/web-connector.ts

@@ -10,13 +10,12 @@ import {
   type SendEmailOtpReturnType,
   type SingleStepAuthArgsType,
   UserWalletStatus,
-  oauthStrategyToAuthProvider,
 } from "../../core/authentication/type.js";
 import type { InAppConnector } from "../../core/interfaces/connector.js";
 import type { InAppWalletConstructorType } from "../types.js";
 import { InAppWalletIframeCommunicator } from "../utils/iFrameCommunication/InAppWalletIframeCommunicator.js";
-import { loginWithDiscord } from "./auth/discord.js";
 import { Auth, type AuthQuerierTypes } from "./auth/iframe-auth.js";
+import { loginWithOauth } from "./auth/oauth.js";
 import { loginWithPasskey, registerPasskey } from "./auth/passkeys.js";
 import { IFrameWallet } from "./in-app-account.js";
 
@@ -169,16 +168,6 @@ export class InAppWebConnector implements InAppConnector {
           phoneNumber: args.phoneNumber,
         });
       }
-      case "apple":
-      case "facebook":
-      case "google": {
-        const oauthProvider = oauthStrategyToAuthProvider[strategy];
-        return this.auth.loginWithOauth({
-          oauthProvider,
-          closeOpenedWindow: args.closeOpenedWindow,
-          openedWindow: args.openedWindow,
-        });
-      }
       case "jwt": {
         return this.auth.loginWithCustomJwt({
           jwt: args.jwt,
@@ -216,8 +205,12 @@ export class InAppWebConnector implements InAppConnector {
         });
         return this.auth.loginWithAuthToken(authToken);
       }
+      case "apple":
+      case "facebook":
+      case "google":
       case "discord": {
-        const authToken = await loginWithDiscord({
+        const authToken = await loginWithOauth({
+          authOption: strategy,
           client: this.wallet.client,
           ecosystem: this.wallet.ecosystem,
           closeOpenedWindow: args.closeOpenedWindow,

package/dist/cjs/wallets/in-app/web/lib/auth/discord.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"discord.js","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/discord.ts"],"names":[],"mappings":"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"}

package/dist/cjs/wallets/in-app/web/lib/auth/utils.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.closeWindow = void 0;
-const closeWindow = ({ isWindowOpenedByFn, win, closeOpenedWindow, }) => {
-    if (isWindowOpenedByFn) {
-        win?.close();
-    }
-    else {
-        if (win && closeOpenedWindow) {
-            closeOpenedWindow(win);
-        }
-        else if (win) {
-            win.close();
-        }
-    }
-};
-exports.closeWindow = closeWindow;
-//# sourceMappingURL=utils.js.map

package/dist/cjs/wallets/in-app/web/lib/auth/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/utils.ts"],"names":[],"mappings":";;;AAAO,MAAM,WAAW,GAAG,CAAC,EAC1B,kBAAkB,EAClB,GAAG,EACH,iBAAiB,GAKlB,EAAE,EAAE;IACH,IAAI,kBAAkB,EAAE,CAAC;QACvB,GAAG,EAAE,KAAK,EAAE,CAAC;IACf,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAC7B,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;aAAM,IAAI,GAAG,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAlBW,QAAA,WAAW,eAkBtB"}

package/dist/esm/wallets/in-app/web/lib/auth/discord.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"discord.js","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/discord.ts"],"names":[],"mappings":"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"}

package/dist/esm/wallets/in-app/web/lib/auth/utils.js

@@ -1,14 +0,0 @@
-export const closeWindow = ({ isWindowOpenedByFn, win, closeOpenedWindow, }) => {
-    if (isWindowOpenedByFn) {
-        win?.close();
-    }
-    else {
-        if (win && closeOpenedWindow) {
-            closeOpenedWindow(win);
-        }
-        else if (win) {
-            win.close();
-        }
-    }
-};
-//# sourceMappingURL=utils.js.map

package/dist/esm/wallets/in-app/web/lib/auth/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/utils.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAC1B,kBAAkB,EAClB,GAAG,EACH,iBAAiB,GAKlB,EAAE,EAAE;IACH,IAAI,kBAAkB,EAAE,CAAC;QACvB,GAAG,EAAE,KAAK,EAAE,CAAC;IACf,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,IAAI,iBAAiB,EAAE,CAAC;YAC7B,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;aAAM,IAAI,GAAG,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,CAAC;IACH,CAAC;AACH,CAAC,CAAC"}

package/dist/types/wallets/in-app/web/lib/auth/discord.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"discord.d.ts","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/discord.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,2DAA2D,CAAC;AAErH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIhD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE;IAC9C,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACzC,iBAAiB,CAAC,EAAE,CAAC,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;CAClE,GAAG,OAAO,CAAC,mCAAmC,CAAC,CA8E/C"}

package/dist/types/wallets/in-app/web/lib/auth/utils.d.ts

@@ -1,6 +0,0 @@
-export declare const closeWindow: ({ isWindowOpenedByFn, win, closeOpenedWindow, }: {
-    win?: Window | null;
-    isWindowOpenedByFn: boolean;
-    closeOpenedWindow?: (openedWindow: Window) => void;
-}) => void;
-//# sourceMappingURL=utils.d.ts.map

package/dist/types/wallets/in-app/web/lib/auth/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../src/wallets/in-app/web/lib/auth/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,oDAIrB;IACD,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,iBAAiB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;CACpD,SAUA,CAAC"}

package/src/wallets/in-app/web/lib/auth/utils.ts

@@ -1,19 +0,0 @@
-export const closeWindow = ({
-  isWindowOpenedByFn,
-  win,
-  closeOpenedWindow,
-}: {
-  win?: Window | null;
-  isWindowOpenedByFn: boolean;
-  closeOpenedWindow?: (openedWindow: Window) => void;
-}) => {
-  if (isWindowOpenedByFn) {
-    win?.close();
-  } else {
-    if (win && closeOpenedWindow) {
-      closeOpenedWindow(win);
-    } else if (win) {
-      win.close();
-    }
-  }
-};