thirdweb 5.63.3-nightly-50f98d7486809c541252a9cfc6979d102960366b-20241022000337 → 5.64.0-nightly-cdb907f175f7472d1fb3dea6547d946514564085-20241023000322

package/src/extensions/unstoppable-domains/read/resolveName.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { TEST_CLIENT } from "~test/test-clients.js";
+import { TEST_ACCOUNT_D } from "~test/test-wallets.js";
 import { resolveName } from "./resolveName.js";
 
 // Double check: https://unstoppabledomains.com/d/thirdwebsdk.unstoppable
@@ -13,4 +14,12 @@ describe("Unstoppable Domain: resolve name", () => {
       }),
     ).toBe("thirdwebsdk.unstoppable");
   });
+
+  it("should throw error on addresses that dont own any UD", async () => {
+    await expect(() =>
+      resolveName({ client: TEST_CLIENT, address: TEST_ACCOUNT_D.address }),
+    ).rejects.toThrowError(
+      `Failed to retrieve domain for address: ${TEST_ACCOUNT_D.address}. Make sure you have set the Reverse Resolution address for your domain at https://unstoppabledomains.com/manage?page=reverseResolution&domain=your-domain`,
+    );
+  });
 });

package/src/react/core/utils/walletIcon.ts

@@ -17,6 +17,8 @@ const telegramIconUri =
   "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTAwMHB4IiBoZWlnaHQ9IjEwMDBweCIgdmlld0JveD0iMCAwIDEwMDAgMTAwMCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDwhLS0gR2VuZXJhdG9yOiBTa2V0Y2ggNTMuMiAoNzI2NDMpIC0gaHR0cHM6Ly9za2V0Y2hhcHAuY29tIC0tPgogICAgPHRpdGxlPkFydGJvYXJkPC90aXRsZT4KICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPgogICAgPGRlZnM+CiAgICAgICAgPGxpbmVhckdyYWRpZW50IHgxPSI1MCUiIHkxPSIwJSIgeDI9IjUwJSIgeTI9Ijk5LjI1ODM0MDQlIiBpZD0ibGluZWFyR3JhZGllbnQtMSI+CiAgICAgICAgICAgIDxzdG9wIHN0b3AtY29sb3I9IiMyQUFCRUUiIG9mZnNldD0iMCUiPjwvc3RvcD4KICAgICAgICAgICAgPHN0b3Agc3RvcC1jb2xvcj0iIzIyOUVEOSIgb2Zmc2V0PSIxMDAlIj48L3N0b3A+CiAgICAgICAgPC9saW5lYXJHcmFkaWVudD4KICAgIDwvZGVmcz4KICAgIDxnIGlkPSJBcnRib2FyZCIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGNpcmNsZSBpZD0iT3ZhbCIgZmlsbD0idXJsKCNsaW5lYXJHcmFkaWVudC0xKSIgY3g9IjUwMCIgY3k9IjUwMCIgcj0iNTAwIj48L2NpcmNsZT4KICAgICAgICA8cGF0aCBkPSJNMjI2LjMyODQxOSw0OTQuNzIyMDY5IEMzNzIuMDg4NTczLDQzMS4yMTY2ODUgNDY5LjI4NDgzOSwzODkuMzUwMDQ5IDUxNy45MTcyMTYsMzY5LjEyMjE2MSBDNjU2Ljc3MjUzNSwzMTEuMzY3NDMgNjg1LjYyNTQ4MSwzMDEuMzM0ODE1IDcwNC40MzE0MjcsMzAxLjAwMzUzMiBDNzA4LjU2NzYyMSwzMDAuOTMwNjcgNzE3LjgxNTgzOSwzMDEuOTU1NzQzIDcyMy44MDY0NDYsMzA2LjgxNjcwNyBDNzI4Ljg2NDc5NywzMTAuOTIxMjEgNzMwLjI1NjU1MiwzMTYuNDY1ODEgNzMwLjkyMjU1MSwzMjAuMzU3MzI5IEM3MzEuNTg4NTUxLDMyNC4yNDg4NDggNzMyLjQxNzg3OSwzMzMuMTEzODI4IDczMS43NTg2MjYsMzQwLjA0MDY2NiBDNzI0LjIzNDAwNyw0MTkuMTAyNDg2IDY5MS42NzUxMDQsNjEwLjk2NDY3NCA2NzUuMTEwOTgyLDY5OS41MTUyNjcgQzY2OC4xMDIwOCw3MzYuOTg0MzQyIDY1NC4zMDEzMzYsNzQ5LjU0NzUzMiA2NDAuOTQwNjE4LDc1MC43NzcwMDYgQzYxMS45MDQ2ODQsNzUzLjQ0ODkzOCA1ODkuODU2MTE1LDczMS41ODgwMzUgNTYxLjczMzM5Myw3MTMuMTUzMjM3IEM1MTcuNzI2ODg2LDY4NC4zMDY0MTYgNDkyLjg2NjAwOSw2NjYuMzQ5MTgxIDQ1MC4xNTAwNzQsNjM4LjIwMDAxMyBDNDAwLjc4NDQyLDYwNS42Njg3OCA0MzIuNzg2MTE5LDU4Ny43ODkwNDggNDYwLjkxOTQ2Miw1NTguNTY4NTYzIEM0NjguMjgyMDkxLDU1MC45MjE0MjMgNTk2LjIxNTA4LDQzNC41NTY0NzkgNTk4LjY5MTIyNyw0MjQuMDAwMzU1IEM1OTkuMDAwOTEsNDIyLjY4MDEzNSA1OTkuMjg4MzEyLDQxNy43NTg5ODEgNTk2LjM2NDc0LDQxNS4xNjA0MzEgQzU5My40NDExNjgsNDEyLjU2MTg4MSA1ODkuMTI2MjI5LDQxMy40NTA0ODQgNTg2LjAxMjQ0OCw0MTQuMTU3MTk4IEM1ODEuNTk4NzU4LDQxNS4xNTg5NDMgNTExLjI5Nzc5Myw0NjEuNjI1Mjc0IDM3NS4xMDk1NTMsNTUzLjU1NjE4OSBDMzU1LjE1NDg1OCw1NjcuMjU4NjIzIDMzNy4wODA1MTUsNTczLjkzNDkwOCAzMjAuODg2NTI0LDU3My41ODUwNDYgQzMwMy4wMzM5NDgsNTczLjE5OTM1MSAyNjguNjkyNzU0LDU2My40OTA5MjggMjQzLjE2MzYwNiw1NTUuMTkyNDA4IEMyMTEuODUxMDY3LDU0NS4wMTM5MzYgMTg2Ljk2NDQ4NCw1MzkuNjMyNTA0IDE4OS4xMzE1NDcsNTIyLjM0NjMwOSBDMTkwLjI2MDI4Nyw1MTMuMzQyNTg5IDIwMi42NTkyNDQsNTA0LjEzNDUwOSAyMjYuMzI4NDE5LDQ5NC43MjIwNjkgWiIgaWQ9IlBhdGgtMyIgZmlsbD0iI0ZGRkZGRiI+PC9wYXRoPgogICAgPC9nPgo8L3N2Zz4=";
 const twitchIconUri =
   "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJMYXllcl8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4PSIwcHgiIHk9IjBweCIKCSB2aWV3Qm94PSIwIDAgMjQwMCAyODAwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAyNDAwIDI4MDA7IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5zdDB7ZmlsbDojRkZGRkZGO30KCS5zdDF7ZmlsbDojOTE0NkZGO30KPC9zdHlsZT4KPHRpdGxlPkFzc2V0IDI8L3RpdGxlPgo8Zz4KCTxwb2x5Z29uIGNsYXNzPSJzdDAiIHBvaW50cz0iMjIwMCwxMzAwIDE4MDAsMTcwMCAxNDAwLDE3MDAgMTA1MCwyMDUwIDEwNTAsMTcwMCA2MDAsMTcwMCA2MDAsMjAwIDIyMDAsMjAwIAkiLz4KCTxnPgoJCTxnIGlkPSJMYXllcl8xLTIiPgoJCQk8cGF0aCBjbGFzcz0ic3QxIiBkPSJNNTAwLDBMMCw1MDB2MTgwMGg2MDB2NTAwbDUwMC01MDBoNDAwbDkwMC05MDBWMEg1MDB6IE0yMjAwLDEzMDBsLTQwMCw0MDBoLTQwMGwtMzUwLDM1MHYtMzUwSDYwMFYyMDBoMTYwMAoJCQkJVjEzMDB6Ii8+CgkJCTxyZWN0IHg9IjE3MDAiIHk9IjU1MCIgY2xhc3M9InN0MSIgd2lkdGg9IjIwMCIgaGVpZ2h0PSI2MDAiLz4KCQkJPHJlY3QgeD0iMTE1MCIgeT0iNTUwIiBjbGFzcz0ic3QxIiB3aWR0aD0iMjAwIiBoZWlnaHQ9IjYwMCIvPgoJCTwvZz4KCTwvZz4KPC9nPgo8L3N2Zz4K";
+const githubIconUri =
+  "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTA2IiBoZWlnaHQ9IjEwNiIgdmlld0JveD0iMCAwIDEwNiAxMDYiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxjaXJjbGUgY3g9IjUzIiBjeT0iNTMiIHI9IjUzIiBmaWxsPSJ3aGl0ZSIvPgo8cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZD0iTTUyLjg1NCA0QzI1LjgzOSA0IDQgMjYgNCA1My4yMTdDNCA3NC45NzMgMTcuOTkzIDkzLjM4OSAzNy40MDUgOTkuOTA3QzM5LjgzMiAxMDAuMzk3IDQwLjcyMSA5OC44NDggNDAuNzIxIDk3LjU0NUM0MC43MjEgOTYuNDA0IDQwLjY0MSA5Mi40OTMgNDAuNjQxIDg4LjQxOEMyNy4wNTEgOTEuMzUyIDI0LjIyMSA4Mi41NTEgMjQuMjIxIDgyLjU1MUMyMi4wMzcgNzYuODQ3IDE4LjgwMSA3NS4zODEgMTguODAxIDc1LjM4MUMxNC4zNTMgNzIuMzY2IDE5LjEyNSA3Mi4zNjYgMTkuMTI1IDcyLjM2NkMyNC4wNTkgNzIuNjkyIDI2LjY0OCA3Ny40MTggMjYuNjQ4IDc3LjQxOEMzMS4wMTUgODQuOTE0IDM4LjA1MiA4Mi43OTYgNDAuODgzIDgxLjQ5MkM0MS4yODcgNzguMzE0IDQyLjU4MiA3Ni4xMTQgNDMuOTU3IDc0Ljg5MkMzMy4xMTggNzMuNzUxIDIxLjcxNCA2OS41MTQgMjEuNzE0IDUwLjYwOUMyMS43MTQgNDUuMjMxIDIzLjY1NCA0MC44MzEgMjYuNzI4IDM3LjQwOUMyNi4yNDMgMzYuMTg3IDI0LjU0NCAzMS4xMzQgMjcuMjE0IDI0LjM3MUMyNy4yMTQgMjQuMzcxIDMxLjMzOSAyMy4wNjcgNDAuNjQgMjkuNDIzQzQ0LjYyMjEgMjguMzQ1NyA0OC43Mjg4IDI3Ljc5NzYgNTIuODU0IDI3Ljc5M0M1Ni45NzkgMjcuNzkzIDYxLjE4NCAyOC4zNjQgNjUuMDY3IDI5LjQyM0M3NC4zNjkgMjMuMDY3IDc4LjQ5NCAyNC4zNzEgNzguNDk0IDI0LjM3MUM4MS4xNjQgMzEuMTM0IDc5LjQ2NCAzNi4xODcgNzguOTc5IDM3LjQwOUM4Mi4xMzQgNDAuODMxIDgzLjk5NCA0NS4yMzEgODMuOTk0IDUwLjYwOUM4My45OTQgNjkuNTE0IDcyLjU5IDczLjY2OSA2MS42NyA3NC44OTJDNjMuNDUgNzYuNDQgNjQuOTg2IDc5LjM3MyA2NC45ODYgODQuMDE4QzY0Ljk4NiA5MC42MTggNjQuOTA2IDk1LjkxNSA2NC45MDYgOTcuNTQ0QzY0LjkwNiA5OC44NDggNjUuNzk2IDEwMC4zOTcgNjguMjIyIDk5LjkwOEM4Ny42MzQgOTMuMzg4IDEwMS42MjcgNzQuOTczIDEwMS42MjcgNTMuMjE3QzEwMS43MDcgMjYgNzkuNzg4IDQgNTIuODU0IDRaIiBmaWxsPSIjMjQyOTJGIi8+Cjwvc3ZnPgo=";
 const xIcon =
   "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzIwIiBoZWlnaHQ9IjMyMCIgdmlld0JveD0iMCAwIDMyMCAzMjAiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CjxyZWN0IHdpZHRoPSIzMjAiIGhlaWdodD0iMzIwIiByeD0iMjQiIGZpbGw9ImJsYWNrIi8+CjxwYXRoIGQ9Ik0xNzcuMzE1IDE0NS4zMzVMMjQ1LjA2OCA2N0gyMjkuMDEzTDE3MC4xODIgMTM1LjAxN0wxMjMuMTk1IDY3SDY5TDE0MC4wNTUgMTY5Ljg1NEw2OSAyNTJIODUuMDU2M0wxNDcuMTgzIDE4MC4xNzJMMTk2LjgwNSAyNTJIMjUxTDE3Ny4zMTEgMTQ1LjMzNUgxNzcuMzE1Wk0xNTUuMzIzIDE3MC43NkwxNDguMTI0IDE2MC41MThMOTAuODQxNyA3OS4wMjJIMTE1LjUwM0wxNjEuNzMxIDE0NC43OTJMMTY4LjkzIDE1NS4wMzRMMjI5LjAyIDI0MC41MjVIMjA0LjM1OUwxNTUuMzIzIDE3MC43NjRWMTcwLjc2WiIgZmlsbD0id2hpdGUiLz4KPC9zdmc+Cg==";
 export const emailIcon =
@@ -43,6 +45,7 @@ export const socialIcons = {
   farcaster: farcasterIconUri,
   telegram: telegramIconUri,
   twitch: twitchIconUri,
+  github: githubIconUri,
 };
 
 // TODO: this should return actual <svg> elements so they can be themed
@@ -74,6 +77,8 @@ export function getWalletIcon(provider: string) {
       return telegramIconUri;
     case "twitch":
       return twitchIconUri;
+    case "github":
+      return githubIconUri;
     case "guest":
       return guestIcon;
     default:

package/src/react/native/ui/components/WalletImage.tsx

@@ -13,6 +13,7 @@ import {
   EMAIL_ICON,
   FACEBOOK_ICON,
   FARCASTER_ICON,
+  GITHUB_ICON,
   GOOGLE_ICON,
   GUEST_ICON,
   LINE_ICON,
@@ -103,6 +104,8 @@ export function getAuthProviderImage(authProvider: string | null): string {
       return FARCASTER_ICON;
     case "telegram":
       return TELEGRAM_ICON;
+    case "github":
+      return GITHUB_ICON;
     case "twitch":
       return TWITCH_ICON;
     case "guest":

package/src/react/native/ui/connect/InAppWalletUI.tsx

@@ -34,6 +34,7 @@ import {
   DISCORD_ICON,
   FACEBOOK_ICON,
   FARCASTER_ICON,
+  GITHUB_ICON,
   GOOGLE_ICON,
   LINE_ICON,
   TELEGRAM_ICON,
@@ -62,6 +63,7 @@ const socialIcons = {
   x: X_ICON,
   farcaster: FARCASTER_ICON,
   telegram: TELEGRAM_ICON,
+  github: GITHUB_ICON,
   twitch: TWITCH_ICON,
 };
 

package/src/react/native/ui/icons/svgs.ts

@@ -71,6 +71,11 @@ export const TELEGRAM_ICON = `<svg width={width} height={height} viewBox="0 0 10
     </g>
 </svg>`;
 
+export const GITHUB_ICON = `<svg width="106" height="106" viewBox="0 0 106 106" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="53" cy="53" r="53" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M52.854 4C25.839 4 4 26 4 53.217C4 74.973 17.993 93.389 37.405 99.907C39.832 100.397 40.721 98.848 40.721 97.545C40.721 96.404 40.641 92.493 40.641 88.418C27.051 91.352 24.221 82.551 24.221 82.551C22.037 76.847 18.801 75.381 18.801 75.381C14.353 72.366 19.125 72.366 19.125 72.366C24.059 72.692 26.648 77.418 26.648 77.418C31.015 84.914 38.052 82.796 40.883 81.492C41.287 78.314 42.582 76.114 43.957 74.892C33.118 73.751 21.714 69.514 21.714 50.609C21.714 45.231 23.654 40.831 26.728 37.409C26.243 36.187 24.544 31.134 27.214 24.371C27.214 24.371 31.339 23.067 40.64 29.423C44.6221 28.3457 48.7288 27.7976 52.854 27.793C56.979 27.793 61.184 28.364 65.067 29.423C74.369 23.067 78.494 24.371 78.494 24.371C81.164 31.134 79.464 36.187 78.979 37.409C82.134 40.831 83.994 45.231 83.994 50.609C83.994 69.514 72.59 73.669 61.67 74.892C63.45 76.44 64.986 79.373 64.986 84.018C64.986 90.618 64.906 95.915 64.906 97.544C64.906 98.848 65.796 100.397 68.222 99.908C87.634 93.388 101.627 74.973 101.627 53.217C101.707 26 79.788 4 52.854 4Z" fill="#24292F"/>
+</svg>`;
+
 export const TWITCH_ICON = `<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 2400 2800" style="enable-background:new 0 0 2400 2800;" xml:space="preserve">
 <style type="text/css">

package/src/react/web/wallets/shared/ConnectWalletSocialOptions.tsx

@@ -5,7 +5,7 @@ import { useMemo, useState } from "react";
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import { webLocalStorage } from "../../../../utils/storage/webStorage.js";
-import { getEcosystemWalletAuthOptions } from "../../../../wallets/ecosystem/get-ecosystem-wallet-auth-options.js";
+import { getEcosystemOptions } from "../../../../wallets/ecosystem/get-ecosystem-wallet-auth-options.js";
 import { isEcosystemWallet } from "../../../../wallets/ecosystem/is-ecosystem-wallet.js";
 import type { Profile } from "../../../../wallets/in-app/core/authentication/types.js";
 import { linkProfile } from "../../../../wallets/in-app/web/lib/auth/index.js";
@@ -114,6 +114,7 @@ export const ConnectWalletSocialOptions = (
     coinbase: "Coinbase",
     farcaster: "Farcaster",
     telegram: "Telegram",
+    github: "GitHub",
     twitch: "Twitch",
   };
 
@@ -121,7 +122,8 @@ export const ConnectWalletSocialOptions = (
     queryKey: ["auth-options", wallet.id],
     queryFn: async () => {
       if (isEcosystemWallet(wallet)) {
-        return getEcosystemWalletAuthOptions(wallet.id);
+        const options = await getEcosystemOptions(wallet.id);
+        return options?.authOptions ?? null;
       }
       return null;
     },

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

@@ -38,6 +38,7 @@ function getOauthLoginPath(
     case "google":
     case "farcaster":
     case "telegram":
+    case "github":
     case "twitch":
     case "line":
     case "x":

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.63.3-nightly-50f98d7486809c541252a9cfc6979d102960366b-20241022000337";
+export const version = "5.64.0-nightly-cdb907f175f7472d1fb3dea6547d946514564085-20241023000322";

package/src/wallets/ecosystem/get-ecosystem-wallet-auth-options.ts

@@ -2,15 +2,26 @@ import { getThirdwebBaseUrl } from "../../utils/domains.js";
 import type { AuthOption } from "../types.js";
 import type { EcosystemWalletId } from "../wallet-types.js";
 
+export type EcosystemOptions = {
+  authOptions: AuthOption[];
+  smartAccountOptions: SmartAccountOptions;
+};
+
+type SmartAccountOptions = {
+  chainIds: number[];
+  sponsorGas: boolean;
+  accountFactoryAddress: string;
+};
+
 /**
  * Retrieves the specified auth options for a given ecosystem wallet, if any.
  * @param walletId The ecosystem wallet ID.
  * @returns {AuthOption[] | undefined} The auth options for the ecosystem wallet.
  * @internal
  */
-export async function getEcosystemWalletAuthOptions(
+export async function getEcosystemOptions(
   walletId: EcosystemWalletId,
-): Promise<AuthOption[] | undefined> {
+): Promise<EcosystemOptions | null> {
   const res = await fetch(
     `${getThirdwebBaseUrl("inAppWallet")}/api/2024-05-05/ecosystem-wallet`,
     {
@@ -29,5 +40,5 @@ export async function getEcosystemWalletAuthOptions(
     );
   }
 
-  return data.authOptions ?? undefined;
+  return data ?? null;
 }

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

@@ -101,6 +101,7 @@ export type AuthProvider =
   | "X"
   | "Line"
   | "Twitch"
+  | "GitHub"
   | "Farcaster"
   | "Telegram";
 

package/src/wallets/in-app/core/wallet/in-app-core.ts

@@ -70,6 +70,7 @@ export function createInAppWallet(args: {
         options,
         createOptions,
         connector,
+        ecosystem,
       );
 
       // set the states
@@ -96,6 +97,7 @@ export function createInAppWallet(args: {
         options,
         createOptions,
         connector,
+        ecosystem,
       );
       // set the states
       client = options.client;
@@ -142,6 +144,7 @@ export function createInAppWallet(args: {
           },
           createOptions,
           connector,
+          ecosystem,
         );
         account = connectedAccount;
         chain = connectedChain;

package/src/wallets/in-app/core/wallet/index.ts

@@ -1,10 +1,12 @@
 import { ethereum } from "../../../../chains/chain-definitions/ethereum.js";
 import type { Chain } from "../../../../chains/types.js";
+import { getCachedChain } from "../../../../chains/utils.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import {
   type SocialAuthOption,
   socialAuthOptions,
 } from "../../../../wallets/types.js";
+import { getEcosystemOptions } from "../../../ecosystem/get-ecosystem-wallet-auth-options.js";
 import type { Account, Wallet } from "../../../interfaces/wallet.js";
 import type { EcosystemWalletId, WalletId } from "../../../wallet-types.js";
 import type {
@@ -13,6 +15,7 @@ import type {
   WalletConnectionOption,
 } from "../../../wallet-types.js";
 import type { InAppConnector } from "../interfaces/connector.js";
+import type { Ecosystem } from "./types.js";
 
 /**
  * Checks if the provided wallet is an in-app wallet.
@@ -37,6 +40,7 @@ export async function connectInAppWallet(
     | CreateWalletArgs<"inApp">[1]
     | CreateWalletArgs<EcosystemWalletId>[1],
   connector: InAppConnector,
+  ecosystem: Ecosystem | undefined,
 ): Promise<[Account, Chain]> {
   if (
     // if auth mode is not specified, the default is popup
@@ -73,6 +77,33 @@ export async function connectInAppWallet(
     });
   }
 
+  if (ecosystem) {
+    const ecosystemOptions = await getEcosystemOptions(ecosystem.id);
+    const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
+    if (smartAccountOptions) {
+      const allowedChains = smartAccountOptions.chainIds;
+      const firstAllowedChain = allowedChains[0];
+      if (!firstAllowedChain) {
+        throw new Error(
+          "At least one chain must be allowed for ecosystem smart account",
+        );
+      }
+      const preferredChain =
+        options.chain && allowedChains.includes(options.chain.id)
+          ? options.chain
+          : getCachedChain(firstAllowedChain);
+      return convertToSmartAccount({
+        client: options.client,
+        authAccount,
+        smartAccountOptions: {
+          chain: preferredChain,
+          sponsorGas: smartAccountOptions.sponsorGas,
+          factoryAddress: smartAccountOptions.accountFactoryAddress,
+        },
+      });
+    }
+  }
+
   return [authAccount, options.chain || ethereum] as const;
 }
 
@@ -87,6 +118,7 @@ export async function autoConnectInAppWallet(
     | CreateWalletArgs<"inApp">[1]
     | CreateWalletArgs<EcosystemWalletId>[1],
   connector: InAppConnector,
+  ecosystem: Ecosystem | undefined,
 ): Promise<[Account, Chain]> {
   if (options.authResult && connector.loginWithAuthToken) {
     await connector.loginWithAuthToken(options.authResult);
@@ -112,6 +144,33 @@ export async function autoConnectInAppWallet(
     });
   }
 
+  if (ecosystem) {
+    const ecosystemOptions = await getEcosystemOptions(ecosystem.id);
+    const smartAccountOptions = ecosystemOptions?.smartAccountOptions;
+    if (smartAccountOptions) {
+      const allowedChains = smartAccountOptions.chainIds;
+      const firstAllowedChain = allowedChains[0];
+      if (!firstAllowedChain) {
+        throw new Error(
+          "At least one chain must be allowed for ecosystem smart account",
+        );
+      }
+      const preferredChain =
+        options.chain && allowedChains.includes(options.chain.id)
+          ? options.chain
+          : getCachedChain(firstAllowedChain);
+      return convertToSmartAccount({
+        client: options.client,
+        authAccount,
+        smartAccountOptions: {
+          chain: preferredChain,
+          sponsorGas: smartAccountOptions.sponsorGas,
+          factoryAddress: smartAccountOptions.accountFactoryAddress,
+        },
+      });
+    }
+  }
+
   return [authAccount, options.chain || ethereum] as const;
 }
 

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

@@ -318,6 +318,7 @@ export class InAppWebConnector implements InAppConnector {
       case "facebook":
       case "google":
       case "telegram":
+      case "github":
       case "twitch":
       case "farcaster":
       case "line":
@@ -390,6 +391,7 @@ export class InAppWebConnector implements InAppConnector {
       case "google":
       case "farcaster":
       case "telegram":
+      case "github":
       case "line":
       case "x":
       case "guest":

package/src/wallets/smart/index.ts

@@ -8,6 +8,7 @@ import {
 } from "viem";
 import type { Chain } from "../../chains/types.js";
 import { getCachedChain } from "../../chains/utils.js";
+import type { ThirdwebClient } from "../../client/client.js";
 import { type ThirdwebContract, getContract } from "../../contract/contract.js";
 import { allowance } from "../../extensions/erc20/__generated__/IERC20/read/allowance.js";
 import { approve } from "../../extensions/erc20/write/approve.js";
@@ -18,6 +19,7 @@ import {
   signEip712Transaction,
 } from "../../transaction/actions/zksync/send-eip712-transaction.js";
 import type { PreparedTransaction } from "../../transaction/prepare-transaction.js";
+import { readContract } from "../../transaction/read-contract.js";
 import { getAddress } from "../../utils/address.js";
 import { isZkSyncChain } from "../../utils/any-evm/zksync/isZkSyncChain.js";
 import { concatHex } from "../../utils/encoding/helpers/concat-hex.js";
@@ -97,10 +99,26 @@ export async function connectSmartWallet(
   }
 
   const options = creationOptions;
+  const chain = connectChain ?? options.chain;
+
+  // if factory is passed, but no entrypoint, try to resolve entrypoint from factory
+  if (options.factoryAddress && !options.overrides?.entrypointAddress) {
+    const entrypointAddress = await getEntrypointFromFactory(
+      options.factoryAddress,
+      client,
+      chain,
+    );
+    if (entrypointAddress) {
+      options.overrides = {
+        ...options.overrides,
+        entrypointAddress,
+      };
+    }
+  }
+
   const factoryAddress =
     options.factoryAddress ??
-    getDefaultAccountFactory(creationOptions.overrides?.entrypointAddress);
-  const chain = connectChain ?? options.chain;
+    getDefaultAccountFactory(options.overrides?.entrypointAddress);
   const sponsorGas =
     "gasless" in options ? options.gasless : options.sponsorGas;
 
@@ -638,3 +656,23 @@ async function confirmContractDeployment(args: {
     isDeployed = await isContractDeployed(accountContract);
   }
 }
+async function getEntrypointFromFactory(
+  factoryAddress: string,
+  client: ThirdwebClient,
+  chain: Chain,
+) {
+  const factoryContract = getContract({
+    address: factoryAddress,
+    client,
+    chain,
+  });
+  try {
+    const entrypointAddress = await readContract({
+      contract: factoryContract,
+      method: "function entrypoint() public view returns (address)",
+    });
+    return entrypointAddress;
+  } catch {
+    return undefined;
+  }
+}

package/src/wallets/smart/smart-wallet-integration-v07.test.ts

@@ -23,7 +23,7 @@ import { isContractDeployed } from "../../utils/bytecode/is-contract-deployed.js
 import { sleep } from "../../utils/sleep.js";
 import type { Account, Wallet } from "../interfaces/wallet.js";
 import { generateAccount } from "../utils/generateAccount.js";
-import { ENTRYPOINT_ADDRESS_v0_7 } from "./lib/constants.js";
+import { DEFAULT_ACCOUNT_FACTORY_V0_7 } from "./lib/constants.js";
 import { smartWallet } from "./smart-wallet.js";
 
 let wallet: Wallet;
@@ -54,9 +54,7 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       wallet = smartWallet({
         chain,
         gasless: true,
-        overrides: {
-          entrypointAddress: ENTRYPOINT_ADDRESS_v0_7,
-        },
+        factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_7,
       });
       smartAccount = await wallet.connect({
         client: TEST_CLIENT,

package/src/wallets/smart/smart-wallet.ts

@@ -85,21 +85,18 @@ import { getDefaultAccountFactory } from "./lib/constants.js";
  *
  * ## Using v0.7 Entrypoint
  *
- * Both v0.6 (default) and v0.7 ERC4337 Entrypoints are supported. To use the v0.7 Entrypoint, you can pass the `entrypointAddress` option to the `smartWallet` function, as well as a compatible account factory.
+ * Both v0.6 (default) and v0.7 ERC4337 Entrypoints are supported. To use the v0.7 Entrypoint, simply pass in a compatible account factory.
  *
  * You can use the predeployed `DEFAULT_ACCOUNT_FACTORY_V0_7` or deploy your own [AccountFactory  v0.7](https://thirdweb.com/thirdweb.eth/AccountFactory_0_7).
  *
  * ```ts
- * import { smartWallet, DEFAULT_ACCOUNT_FACTORY_V0_7, ENTRYPOINT_ADDRESS_v0_7 } from "thirdweb/wallets/smart";
+ * import { smartWallet, DEFAULT_ACCOUNT_FACTORY_V0_7 } from "thirdweb/wallets/smart";
  * import { sepolia } from "thirdweb/chains";
  *
  * const wallet = smartWallet({
  *  chain: sepolia,
  *  sponsorGas: true, // enable sponsored transactions
- *  factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_7,
- *  overrides: {
- *    entrypointAddress: ENTRYPOINT_ADDRESS_v0_7
- *  }
+ *  factoryAddress: DEFAULT_ACCOUNT_FACTORY_V0_7, // 0.7 factory address
  * });
  * ```
  *

package/src/wallets/types.ts

@@ -29,6 +29,7 @@ export const socialAuthOptions = [
   "coinbase",
   "farcaster",
   "telegram",
+  "github",
   "twitch",
 ] as const;
 export type SocialAuthOption = (typeof socialAuthOptions)[number];