thirdweb 5.48.3-nightly-b661ce7b2fd58e7ff01faf47cf8fb3bb232841ec-20240827000337 → 5.48.3-nightly-e14af15191629d1d4b219d0373551e1956dab225-20240829000400

package/src/react/web/ui/ConnectWallet/Modal/TOS.tsx

@@ -1,4 +1,5 @@
 "use client";
+import { spacing } from "../../../../core/design-system/index.js";
 import { Container } from "../../components/basic.js";
 import { Link } from "../../components/text.js";
 import { Text } from "../../components/text.js";
@@ -11,10 +12,14 @@ export function TOS(props: {
   termsOfServiceUrl?: string;
   privacyPolicyUrl?: string;
   locale: ConnectLocale["agreement"];
+  requireApproval?: boolean;
+  isApproved?: boolean;
+  onApprove?: () => void;
 }) {
-  const { termsOfServiceUrl, privacyPolicyUrl, locale } = props;
+  const { termsOfServiceUrl, privacyPolicyUrl, locale, requireApproval } =
+    props;
 
-  if (!termsOfServiceUrl && !privacyPolicyUrl) {
+  if (!termsOfServiceUrl && !privacyPolicyUrl && !requireApproval) {
     return null;
   }
 
@@ -32,6 +37,18 @@ export function TOS(props: {
           maxWidth: "250px",
         }}
       >
+        {requireApproval && (
+          <input
+            style={{
+              transform: "translateY(3px)",
+              marginRight: spacing["3xs"],
+            }}
+            type="checkbox"
+            onChange={props.onApprove}
+            checked={props.isApproved}
+            disabled={!requireApproval}
+          />
+        )}
         {locale.prefix}{" "}
         {termsOfServiceUrl && (
           <Link
@@ -53,6 +70,11 @@ export function TOS(props: {
             {locale.privacyPolicy}
           </Link>
         )}
+        {!privacyPolicyUrl && !termsOfServiceUrl && (
+          <Text inline size="xs">
+            Terms of Service and Privacy Policy
+          </Text>
+        )}
       </Text>
     </Container>
   );

package/src/react/web/ui/ConnectWallet/WalletSelector.tsx

@@ -67,6 +67,7 @@ export type WalletSelectorProps = {
     showThirdwebBranding?: boolean;
     termsOfServiceUrl?: string;
     privacyPolicyUrl?: string;
+    requireApproval?: boolean;
   };
   client: ThirdwebClient;
   connectLocale: ConnectLocale;
@@ -136,6 +137,8 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
   const { walletIdsToHide } = props;
   const isCompact = props.size === "compact";
   const [isWalletGroupExpanded, setIsWalletGroupExpanded] = useState(false);
+  // This is only used if requireApproval is true
+  const [approvedTOS, setApprovedTOS] = useState(false);
 
   const installedWallets = getInstalledWallets();
   const propsWallets = props.wallets;
@@ -253,11 +256,16 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
   );
 
   const tos =
-    props.meta.termsOfServiceUrl || props.meta.privacyPolicyUrl ? (
+    props.meta.requireApproval ||
+    props.meta.termsOfServiceUrl ||
+    props.meta.privacyPolicyUrl ? (
       <TOS
         termsOfServiceUrl={props.meta.termsOfServiceUrl}
         privacyPolicyUrl={props.meta.privacyPolicyUrl}
         locale={props.connectLocale.agreement}
+        requireApproval={props.meta.requireApproval}
+        isApproved={approvedTOS}
+        onApprove={() => setApprovedTOS(!approvedTOS)}
       />
     ) : undefined;
 
@@ -280,6 +288,7 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
         chain={props.chain}
         showAllWallets={props.showAllWallets}
         diableSelectionDataReset={props.disableSelectionDataReset}
+        disabled={props.meta.requireApproval && !approvedTOS}
       />
     );
 
@@ -308,6 +317,7 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
           chain={props.chain}
           showAllWallets={props.showAllWallets}
           diableSelectionDataReset={props.disableSelectionDataReset}
+          disabled={props.meta.requireApproval && !approvedTOS}
         />
       );
 
@@ -352,6 +362,7 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
               chain={props.chain}
               showAllWallets={props.showAllWallets}
               diableSelectionDataReset={props.disableSelectionDataReset}
+              disabled={props.meta.requireApproval && !approvedTOS}
             />
             {eoaWallets.length > 0 && (
               <>
@@ -423,6 +434,7 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
                     chain={props.chain}
                     showAllWallets={props.showAllWallets}
                     diableSelectionDataReset={props.disableSelectionDataReset}
+                    disabled={props.meta.requireApproval && !approvedTOS}
                   />
                 </Container>
 
@@ -462,6 +474,7 @@ const WalletSelectorInner: React.FC<WalletSelectorProps> = (props) => {
             chain={props.chain}
             showAllWallets={props.showAllWallets}
             diableSelectionDataReset={props.disableSelectionDataReset}
+            disabled={props.meta.requireApproval && !approvedTOS}
           />
         );
 
@@ -586,6 +599,8 @@ const WalletSelection: React.FC<{
   client: ThirdwebClient;
   chain: Chain | undefined;
   diableSelectionDataReset?: boolean;
+  // If true, all options will be disabled. Used for things like requiring TOS approval.
+  disabled?: boolean;
 }> = (props) => {
   const wallets = sortWallets(props.wallets, props.recommendedWallets);
   const { screen } = useScreenContext();
@@ -618,6 +633,7 @@ const WalletSelection: React.FC<{
                   size={props.size}
                   recommendedWallets={props.recommendedWallets}
                   chain={props.chain}
+                  disabled={props.disabled}
                 />
               </Suspense>
             ) : (

package/src/react/web/ui/ConnectWallet/WalletTypeRowButton.tsx

@@ -14,6 +14,7 @@ type WalletTypeRowProps = {
   onClick: () => void;
   title: string;
   icon: string;
+  disabled?: boolean;
 };
 
 export function WalletTypeRowButton(props: WalletTypeRowProps) {
@@ -29,6 +30,7 @@ export function WalletTypeRowButton(props: WalletTypeRowProps) {
       onClick={() => {
         props.onClick();
       }}
+      disabled={props.disabled}
     >
       <Container flex="row" gap="sm" center="y" color="accentText">
         <Img

package/src/react/web/ui/TransactionButton/index.tsx

@@ -115,6 +115,19 @@ import { Button } from "../components/buttons.js";
  *   ...
  * </TransactionButton>
  * ```
+ *
+ * ### Gasless usage with OpenZeppelin
+ * ```tsx
+ * <TransactionButton
+ *   gasless={{
+ *     provider: "openzeppelin",
+ *     relayerUrl: "https://...",
+ *     relayerForwarderAddress: "0x...",
+ *   }}
+ * >
+ *   ...
+ * </TransactionButton>
+ * ```
  * @component
  */
 export function TransactionButton(props: TransactionButtonProps) {

package/src/react/web/ui/prebuilt/thirdweb/ClaimButton/ClaimButton.test.tsx

@@ -3,7 +3,6 @@ import { ANVIL_CHAIN } from "~test/chains.js";
 import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
 import { render, screen } from "~test/react-render.js";
 import { TEST_CLIENT } from "~test/test-clients.js";
-import { DOODLES_CONTRACT, USDT_CONTRACT } from "~test/test-contracts.js";
 import { TEST_ACCOUNT_A } from "~test/test-wallets.js";
 import { getContract } from "../../../../../../contract/contract.js";
 import { deployERC20Contract } from "../../../../../../extensions/prebuilts/deploy-erc20.js";
@@ -26,27 +25,6 @@ const chain = ANVIL_CHAIN;
  */
 describe.runIf(process.env.TW_SECRET_KEY)("ClaimButton", () => {
   // ERC721
-  it("should throw an error if not an ERC721 contract", async () => {
-    const contract = USDT_CONTRACT;
-    await expect(() =>
-      getERC721ClaimTo({
-        contract,
-        account,
-        claimParams: { type: "ERC721", quantity: 1n },
-      }),
-    ).rejects.toThrowError("Not an ERC721 contract");
-  });
-
-  it("should throw an error if is an ERC721 but not an NFT Drop contract", async () => {
-    const contract = DOODLES_CONTRACT;
-    await expect(() =>
-      getERC721ClaimTo({
-        contract,
-        account,
-        claimParams: { type: "ERC721", quantity: 1n },
-      }),
-    ).rejects.toThrowError("Not a valid NFT Drop (ERC721) contract");
-  });
 
   it("should work for an NFT Drop contract", async () => {
     const address = await deployERC721Contract({
@@ -86,43 +64,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("ClaimButton", () => {
     expect(screen.getByRole("button")).toBeInTheDocument();
   });
 
-  // ERC1155
-  it("should throw an error if not an ERC1155 contract", async () => {
-    const contract = USDT_CONTRACT;
-    await expect(() =>
-      getERC1155ClaimTo({
-        contract,
-        account,
-        claimParams: { type: "ERC1155", quantity: 1n, tokenId: 0n },
-      }),
-    ).rejects.toThrowError("Not a valid ERC1155 contract");
-  });
-
-  it("should throw an error if is an ERC1155 but not an Edition Drop contract", async () => {
-    const address = await deployERC1155Contract({
-      client,
-      chain,
-      account,
-      type: "TokenERC1155",
-      params: {
-        name: "",
-        contractURI: TEST_CONTRACT_URI,
-      },
-    });
-    const contract = getContract({
-      address,
-      client,
-      chain,
-    });
-    await expect(() =>
-      getERC1155ClaimTo({
-        contract,
-        account,
-        claimParams: { type: "ERC1155", quantity: 1n, tokenId: 0n },
-      }),
-    ).rejects.toThrowError("Not a valid thirdweb Edition Drop contract");
-  });
-
   it("should work for an Edition Drop contract", async () => {
     const address = await deployERC1155Contract({
       client,
@@ -160,18 +101,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("ClaimButton", () => {
     expect(screen.getByRole("button")).toBeInTheDocument();
   });
 
-  // ERC20
-  it("should throw an error if not an DropERC20 contract", async () => {
-    const contract = DOODLES_CONTRACT;
-    await expect(() =>
-      getERC20ClaimTo({
-        contract,
-        account,
-        claimParams: { type: "ERC20", quantity: "1" },
-      }),
-    ).rejects.toThrowError("Not a valid thirdweb Token Drop contract");
-  });
-
   it("should throw an error if claim quantity / quantityInWei is not passed", async () => {
     const address = await deployERC20Contract({
       client,

package/src/react/web/ui/prebuilt/thirdweb/ClaimButton/index.tsx

@@ -226,23 +226,10 @@ export async function getERC721ClaimTo({
   account: Account | undefined;
   claimParams: Erc721ClaimParams;
 }) {
-  const [{ isERC721 }, { isClaimSupported }, { claimTo }] = await Promise.all([
-    import("../../../../../../extensions/erc721/read/isERC721.js"),
-    import(
-      "../../../../../../extensions/erc721/__generated__/IDrop/write/claim.js"
-    ),
-    import("../../../../../../extensions/erc721/drops/write/claimTo.js"),
-  ]);
-  const [is721, claimSupported] = await Promise.all([
-    isERC721({ contract }).catch(() => false),
-    isClaimSupported(contract).catch(() => false),
-  ]);
-  if (!is721) {
-    throw new Error("Not an ERC721 contract");
-  }
-  if (!claimSupported) {
-    throw new Error("Not a valid NFT Drop (ERC721) contract");
-  }
+  const { claimTo } = await import(
+    "../../../../../../extensions/erc721/drops/write/claimTo.js"
+  );
+
   return claimTo({
     contract,
     to: account?.address || "",
@@ -262,23 +249,10 @@ export async function getERC1155ClaimTo({
   account: Account | undefined;
   claimParams: Erc1155ClaimParams;
 }) {
-  const [{ isERC1155 }, { isClaimSupported }, { claimTo }] = await Promise.all([
-    import("../../../../../../extensions/erc1155/read/isERC1155.js"),
-    import(
-      "../../../../../../extensions/erc1155/__generated__/IDrop1155/write/claim.js"
-    ),
-    import("../../../../../../extensions/erc1155/drops/write/claimTo.js"),
-  ]);
-  const [is1155, claimSupported] = await Promise.all([
-    isERC1155({ contract }).catch(() => false),
-    isClaimSupported(contract).catch(() => false),
-  ]);
-  if (!is1155) {
-    throw new Error("Not a valid ERC1155 contract");
-  }
-  if (!claimSupported) {
-    throw new Error("Not a valid thirdweb Edition Drop contract");
-  }
+  const { claimTo } = await import(
+    "../../../../../../extensions/erc1155/drops/write/claimTo.js"
+  );
+
   return claimTo({
     contract,
     to: account?.address || "",
@@ -301,16 +275,10 @@ export async function getERC20ClaimTo({
 }) {
   // Ideally we should check if the contract is ERC20 using `isERC20`
   // however TokenDrop doesn't have `supportsInterface` so it doesn't work
-  const [{ isClaimSupported }, { claimTo }] = await Promise.all([
-    import(
-      "../../../../../../extensions/erc20/__generated__/IDropERC20/write/claim.js"
-    ),
-    import("../../../../../../extensions/erc20/drops/write/claimTo.js"),
-  ]);
-  const claimSupported = await isClaimSupported(contract).catch(() => false);
-  if (!claimSupported) {
-    throw new Error("Not a valid thirdweb Token Drop contract");
-  }
+  const { claimTo } = await import(
+    "../../../../../../extensions/erc20/drops/write/claimTo.js"
+  );
+
   if ("quantity" in claimParams) {
     return claimTo({
       contract,

package/src/react/web/wallets/ecosystem/EcosystemWalletFormUI.tsx

@@ -1,4 +1,5 @@
 "use client";
+import { useState } from "react";
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
@@ -26,6 +27,7 @@ export type EcosystemWalletFormUIProps = {
     showThirdwebBranding?: boolean;
     termsOfServiceUrl?: string;
     privacyPolicyUrl?: string;
+    requireApproval?: boolean;
   };
   client: ThirdwebClient;
   chain: Chain | undefined;
@@ -39,6 +41,8 @@ export type EcosystemWalletFormUIProps = {
 export function EcosystemWalletFormUIScreen(props: EcosystemWalletFormUIProps) {
   const isCompact = props.size === "compact";
   const { initialScreen, screen } = useScreenContext();
+  // This is only used when requireApproval is true to accept the TOS
+  const [isApproved, setIsApproved] = useState(false);
 
   const onBack =
     screen === props.wallet && initialScreen === props.wallet
@@ -75,7 +79,10 @@ export function EcosystemWalletFormUIScreen(props: EcosystemWalletFormUIProps) {
         center="y"
         p={isCompact ? undefined : "lg"}
       >
-        <ConnectWalletSocialOptions {...props} />
+        <ConnectWalletSocialOptions
+          disabled={props.meta.requireApproval && !isApproved}
+          {...props}
+        />
       </Container>
 
       {isCompact &&
@@ -88,6 +95,11 @@ export function EcosystemWalletFormUIScreen(props: EcosystemWalletFormUIProps) {
           termsOfServiceUrl={props.meta.termsOfServiceUrl}
           privacyPolicyUrl={props.meta.privacyPolicyUrl}
           locale={props.connectLocale.agreement}
+          requireApproval={props.meta.requireApproval}
+          onApprove={() => {
+            setIsApproved(!isApproved);
+          }}
+          isApproved={isApproved}
         />
 
         {props.meta.showThirdwebBranding !== false && <PoweredByThirdweb />}

package/src/react/web/wallets/in-app/InAppWalletFormUI.tsx

@@ -1,4 +1,5 @@
 "use client";
+import { useState } from "react";
 import type { Chain } from "../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../client/client.js";
 import type { Wallet } from "../../../../wallets/interfaces/wallet.js";
@@ -28,6 +29,7 @@ export type InAppWalletFormUIProps = {
     showThirdwebBranding?: boolean;
     termsOfServiceUrl?: string;
     privacyPolicyUrl?: string;
+    requireApproval?: boolean;
   };
   client: ThirdwebClient;
   chain: Chain | undefined;
@@ -40,6 +42,8 @@ export type InAppWalletFormUIProps = {
 export function InAppWalletFormUIScreen(props: InAppWalletFormUIProps) {
   const isCompact = props.size === "compact";
   const { initialScreen, screen } = useScreenContext();
+  // This is only used when requireApproval is true to accept the TOS
+  const [isApproved, setIsApproved] = useState(false);
 
   const isInitialScreen =
     screen === props.wallet && initialScreen === props.wallet;
@@ -84,7 +88,6 @@ export function InAppWalletFormUIScreen(props: InAppWalletFormUIProps) {
         ) : (
           <ModalHeader onBack={onBack} title={props.inAppWalletLocale.signIn} />
         ))}
-
       <Container
         expand
         flex="column"
@@ -94,6 +97,7 @@ export function InAppWalletFormUIScreen(props: InAppWalletFormUIProps) {
         <ConnectWalletSocialOptions
           {...props}
           locale={props.inAppWalletLocale}
+          disabled={props.meta?.requireApproval && !isApproved}
         />
       </Container>
 
@@ -101,12 +105,16 @@ export function InAppWalletFormUIScreen(props: InAppWalletFormUIProps) {
         (props.meta?.showThirdwebBranding !== false ||
           props.meta?.termsOfServiceUrl ||
           props.meta?.privacyPolicyUrl) && <Spacer y="xl" />}
-
       <Container flex="column" gap="lg">
         <TOS
           termsOfServiceUrl={props.meta?.termsOfServiceUrl}
           privacyPolicyUrl={props.meta?.privacyPolicyUrl}
           locale={props.connectLocale.agreement}
+          requireApproval={props.meta?.requireApproval}
+          onApprove={() => {
+            setIsApproved(!isApproved);
+          }}
+          isApproved={isApproved}
         />
 
         {props.meta?.showThirdwebBranding !== false && <PoweredByThirdweb />}

package/src/react/web/wallets/in-app/InAppWalletSelectionUI.tsx

@@ -25,6 +25,8 @@ function InAppWalletSelectionUI(props: {
   recommendedWallets: Wallet[] | undefined;
   chain: Chain | undefined;
   size: "compact" | "wide";
+  // If true, all options will be disabled. Used for things like requiring TOS approval.
+  disabled?: boolean;
 }) {
   const { screen } = useScreenContext();
   const setData = useSetSelectionData();
@@ -59,6 +61,7 @@ function InAppWalletSelectionUI(props: {
 
   return (
     <ConnectWalletSocialOptions
+      disabled={props.disabled}
       locale={locale}
       wallet={props.wallet}
       done={props.done}

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

@@ -76,6 +76,8 @@ export type ConnectWalletSocialOptionsProps = {
   client: ThirdwebClient;
   size: "compact" | "wide";
   isLinking?: boolean;
+  // If true, all options will be disabled. Used for things like requiring TOS approval.
+  disabled?: boolean;
 };
 
 /**
@@ -313,6 +315,7 @@ export const ConnectWalletSocialOptions = (
                 data-variant={showOnlyIcons ? "icon" : "full"}
                 key={loginMethod}
                 variant={"outline"}
+                disabled={props.disabled}
                 onClick={() => {
                   handleSocialLogin(loginMethod as SocialAuthOption);
                 }}
@@ -354,6 +357,7 @@ export const ConnectWalletSocialOptions = (
                 }
                 return undefined;
               }}
+              disabled={props.disabled}
               emptyErrorMessage={emptyErrorMessage}
               submitButtonText={locale.submitEmail}
             />
@@ -365,6 +369,7 @@ export const ConnectWalletSocialOptions = (
                 setManualInputMode("email");
               }}
               title={locale.emailPlaceholder}
+              disabled={props.disabled}
             />
           )}
         </>
@@ -393,6 +398,7 @@ export const ConnectWalletSocialOptions = (
 
                 return undefined;
               }}
+              disabled={props.disabled}
               emptyErrorMessage={emptyErrorMessage}
               submitButtonText={locale.submitEmail}
             />
@@ -404,6 +410,7 @@ export const ConnectWalletSocialOptions = (
                 setManualInputMode("phone");
               }}
               title={locale.phonePlaceholder}
+              disabled={props.disabled}
             />
           )}
         </>
@@ -418,6 +425,7 @@ export const ConnectWalletSocialOptions = (
               handlePassKeyLogin();
             }}
             title={locale.passkey}
+            disabled={props.disabled}
           />
         </>
       )}

package/src/transaction/actions/send-and-confirm-transaction.ts

@@ -35,6 +35,19 @@ import { waitForReceipt } from "./wait-for-tx-receipt.js";
  *  }
  * });
  * ```
+ *
+ * ### Gasless usage with OpenZeppelin
+ * ```ts
+ * const transactionReceipt = await sendAndConfirmTransaction({
+ *  account,
+ *  transaction,
+ *  gasless: {
+ *    provider: "openzeppelin",
+ *    relayerUrl: "https://...",
+ *    relayerForwarderAddress: "0x...",
+ *  }
+ * });
+ * ```
  */
 export async function sendAndConfirmTransaction(
   options: SendTransactionOptions,

package/src/transaction/actions/send-transaction.ts

@@ -121,6 +121,19 @@ export interface SendTransactionOptions {
  *  }
  * });
  * ```
+ *
+ * ### Gasless usage with OpenZeppelin
+ * ```ts
+ * const { transactionHash } = await sendTransaction({
+ *  account,
+ *  transaction,
+ *  gasless: {
+ *    provider: "openzeppelin",
+ *    relayerUrl: "https://...",
+ *    relayerForwarderAddress: "0x...",
+ *  }
+ * });
+ * ```
  */
 export async function sendTransaction(
   options: SendTransactionOptions,

package/src/transaction/actions/zksync/send-eip712-transaction.ts

@@ -131,7 +131,7 @@ export async function populateEip712Transaction(
     const baseFee = toBigInt(result.max_fee_per_gas);
     maxFeePerGas = baseFee * 2n; // bumping the base fee per gas to ensure fast inclusion
     maxPriorityFeePerGas = toBigInt(result.max_priority_fee_per_gas) || 1n;
-    gasPerPubdata = toBigInt(result.gas_per_pubdata_limit);
+    gasPerPubdata = toBigInt(result.gas_per_pubdata_limit) * 2n; // doubling for fast inclusion;
   }
 
   // serialize the transaction (with fees, gas, nonce)

package/src/utils/bytecode/detectExtension.ts

@@ -1,12 +1,10 @@
 import type { AbiFunction } from "abitype";
 import { toFunctionSelector } from "viem";
-import type { ThirdwebContract } from "../../contract/contract.js";
 import type { PreparedMethod } from "../abi/prepare-method.js";
-import { resolveImplementation } from "./resolveImplementation.js";
 
 type DetectExtensionOptions = {
-  contract: ThirdwebContract;
   method: string | AbiFunction | PreparedMethod<AbiFunction>;
+  availableSelectors: string[];
 };
 
 /**
@@ -23,33 +21,10 @@ type DetectExtensionOptions = {
  * ```
  * @contract
  */
-export async function detectMethod(
-  options: DetectExtensionOptions,
-): Promise<boolean> {
-  const { bytecode } = await resolveImplementation(options.contract);
-  return detectMethodInBytecode({ bytecode, method: options.method });
-}
-
-type DetectExtensionInBytecodeOptions = {
-  bytecode: string;
-  method: string | AbiFunction | PreparedMethod<AbiFunction>;
-};
-/**
- * Detects if a specific method is present in the bytecode of a contract.
- * @param options - The options for detecting the method in the bytecode.
- * @returns A boolean indicating whether the method is present in the bytecode.
- * @internal
- */
-function detectMethodInBytecode(options: DetectExtensionInBytecodeOptions) {
-  // if we can't get the bytecode we know the contract is not deployed
-  if (options.bytecode === "0x") {
-    return false;
-  }
-  // we strip the leading `0x` from the function selector
+export function detectMethod(options: DetectExtensionOptions): boolean {
   const fnSelector = Array.isArray(options.method)
     ? options.method[0]
     : toFunctionSelector(options.method);
 
-  // indexOf is slightly faster than includes
-  return options.bytecode.indexOf(fnSelector.slice(2)) > -1;
+  return options.availableSelectors.includes(fnSelector);
 }

package/src/utils/bytecode/resolveImplementation.ts

@@ -4,6 +4,7 @@ import { eth_getStorageAt } from "../../rpc/actions/eth_getStorageAt.js";
 import { getRpcClient } from "../../rpc/rpc.js";
 import { readContract } from "../../transaction/read-contract.js";
 import { isAddress } from "../address.js";
+import type { Hex } from "../encoding/hex.js";
 import { extractMinimalProxyImplementationAddress } from "./extractMnimalProxyImplementationAddress.js";
 
 // TODO: move to const exports
@@ -23,7 +24,7 @@ const AddressZero = "0x0000000000000000000000000000000000000000";
 export async function resolveImplementation(
   // biome-ignore lint/suspicious/noExplicitAny: TODO: fix any
   contract: ThirdwebContract<any>,
-): Promise<{ address: string; bytecode: string }> {
+): Promise<{ address: string; bytecode: Hex }> {
   const [originalBytecode, beacon] = await Promise.all([
     getBytecode(contract),
     getBeaconFromStorageSlot(contract),

package/src/utils/extensions/drops/get-claim-params.ts

@@ -71,7 +71,7 @@ export async function getClaimParams(options: GetClaimParamsOptions) {
 
     // lazy-load the getActiveClaimCondition function
     const { getActiveClaimCondition } = await import(
-      "../../../extensions/erc721/drops/read/getActiveClaimCondition.js"
+      "../../../extensions/erc20/drops/read/getActiveClaimCondition.js"
     );
     return await getActiveClaimCondition({
       contract: options.contract,

package/src/utils/nft/parseNft.ts

@@ -18,7 +18,6 @@ export type NFTInput = Prettify<
 >;
 
 export type NFTMetadata = {
-  id: bigint;
   uri: string;
   name?: string;
   description?: string;

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.48.3-nightly-b661ce7b2fd58e7ff01faf47cf8fb3bb232841ec-20240827000337";
+export const version = "5.48.3-nightly-e14af15191629d1d4b219d0373551e1956dab225-20240829000400";