thirdweb 5.37.1-nightly-26d825bc4f0475523ea761aa18ab979557295c28-20240722000339 → 5.38.1-nightly-5fabe6661399615b393d1055a722b9de59bf19bb-20240724000323

package/src/chains/chain-definitions/palm.ts

@@ -0,0 +1,17 @@
+import { defineChain } from "../utils.js";
+
+export const palm = /* @__PURE__ */ defineChain({
+  id: 11297108109,
+  name: "Palm",
+  nativeCurrency: {
+    name: "PALM",
+    symbol: "PALM",
+    decimals: 18,
+  },
+  blockExplorers: [
+    {
+      name: "Chainlens",
+      url: "https://palm.chainlens.com",
+    },
+  ],
+});

package/src/chains/chain-definitions/polygon-zkevm-testnet.ts

@@ -0,0 +1,14 @@
+import { defineChain } from "../utils.js";
+
+export const polygonZkEvmTestnet = /*@__PURE__*/ defineChain({
+  id: 1442,
+  name: "Polygon zkEVM Testnet",
+  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+  blockExplorers: [
+    {
+      name: "Polygon zkEVM explorer",
+      url: "https://explorer.public.zkevm-test.net",
+    },
+  ],
+  testnet: true,
+});

package/src/chains/chain-definitions/polygon-zkevm.ts

@@ -0,0 +1,13 @@
+import { defineChain } from "../utils.js";
+
+export const polygonZkEvm = /*@__PURE__*/ defineChain({
+  id: 1101,
+  name: "Polygon zkEVM",
+  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+  blockExplorers: [
+    {
+      name: "blockscout",
+      url: "https://zkevm.polygonscan.com",
+    },
+  ],
+});

package/src/chains/chain-definitions/rari-testnet.ts

@@ -0,0 +1,18 @@
+import { defineChain } from "../utils.js";
+
+export const rariTestnet = /*@__PURE__*/ defineChain({
+  id: 1918988905,
+  name: "RARIchain Testnet",
+  nativeCurrency: {
+    name: "Ether",
+    symbol: "ETH",
+    decimals: 18,
+  },
+  blockExplorers: [
+    {
+      name: "rarichain-testnet-explorer",
+      url: "https://explorer.rarichain.org",
+    },
+  ],
+  testnet: true,
+});

package/src/chains/chain-definitions/rari.ts

@@ -0,0 +1,17 @@
+import { defineChain } from "../utils.js";
+
+export const rari = /* @__PURE__ */ defineChain({
+  id: 1380012617,
+  name: "Rarichain",
+  nativeCurrency: {
+    name: "Ether",
+    symbol: "ETH",
+    decimals: 18,
+  },
+  blockExplorers: [
+    {
+      name: "rarichain-explorer",
+      url: "https://mainnet.explorer.rarichain.org",
+    },
+  ],
+});

package/src/chains/chain-definitions/scroll-alpha-testnet.ts

@@ -0,0 +1,18 @@
+import { defineChain } from "../utils.js";
+
+export const scrollAlphaTestnet = /*@__PURE__*/ defineChain({
+  id: 534353,
+  name: "Scroll Alpha Testnet",
+  nativeCurrency: {
+    name: "Ether",
+    symbol: "ETH",
+    decimals: 18,
+  },
+  blockExplorers: [
+    {
+      name: "Scroll Alpha Testnet Block Explorer",
+      url: "https://alpha-blockscout.scroll.io",
+    },
+  ],
+  testnet: true,
+});

package/src/chains/chain-definitions/scroll-sepolia-testnet.ts

@@ -0,0 +1,18 @@
+import { defineChain } from "../utils.js";
+
+export const scrollSepoliaTestnet = /*@__PURE__*/ defineChain({
+  id: 534353,
+  name: "Scroll Sepolia Testnet",
+  nativeCurrency: {
+    name: "Ether",
+    symbol: "ETH",
+    decimals: 18,
+  },
+  blockExplorers: [
+    {
+      name: "Scroll Sepolia Etherscan",
+      url: "https://sepolia.scrollscan.com",
+    },
+  ],
+  testnet: true,
+});

package/src/chains/chain-definitions/scroll.ts

@@ -0,0 +1,17 @@
+import { defineChain } from "../utils.js";
+
+export const scroll = /*@__PURE__*/ defineChain({
+  id: 534352,
+  name: "Scroll",
+  nativeCurrency: {
+    name: "Ether",
+    symbol: "ETH",
+    decimals: 18,
+  },
+  blockExplorers: [
+    {
+      name: "Scrollscan",
+      url: "https://scrollscan.com",
+    },
+  ],
+});

package/src/chains/chain-definitions/xai-sepolia.ts

@@ -0,0 +1,14 @@
+import { defineChain } from "../utils.js";
+
+export const xaiSepolia = /* @__PURE__ */ defineChain({
+  id: 37714555429,
+  name: "Xai Sepolia",
+  nativeCurrency: { name: "sXAI", symbol: "sXAI", decimals: 18 },
+  blockExplorers: [
+    {
+      name: "Blockscout",
+      url: "https://testnet-explorer-v2.xai-chain.net",
+    },
+  ],
+  testnet: true,
+});

package/src/chains/chain-definitions/xai.ts

@@ -0,0 +1,17 @@
+import { defineChain } from "../utils.js";
+
+export const xai = /*@__PURE__*/ defineChain({
+  id: 660279,
+  name: "Xai Mainnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "XAI token",
+    symbol: "XAI",
+  },
+  blockExplorers: [
+    {
+      name: "Blockscout",
+      url: "https://explorer.xai-chain.net",
+    },
+  ],
+});

package/src/chains/chain-definitions/zk-candy-sepolia.ts

@@ -0,0 +1,18 @@
+import { defineChain } from "../utils.js";
+
+export const zkCandySepolia = /*@__PURE__*/ defineChain({
+  id: 302,
+  name: "zkCandy Sepolia Testnet",
+  nativeCurrency: {
+    decimals: 18,
+    name: "Ether",
+    symbol: "ETH",
+  },
+  blockExplorers: [
+    {
+      name: "zkCandy Block Explorer",
+      url: "https://sepolia.explorer.zkcandy.io",
+    },
+  ],
+  testnet: true,
+});

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.1-nightly-5fabe6661399615b393d1055a722b9de59bf19bb-20240724000323";

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}`);
     }
   }