thirdweb 5.49.0 → 5.50.0-nightly-6432e8dc6bdd0ed985fe0d76e47b36601bfa8be3-20240831000359

package/src/extensions/ens/resolve-address.ts

@@ -32,6 +32,18 @@ export type ResolveAddressOptions = {
  *    name: "vitalik.eth",
  * });
  * ```
+ *
+ * Resolve an address to a Basename.
+ * ```ts
+ * import { resolveAddress, BASENAME_RESOLVER_ADDRESS } from "thirdweb/extensions/ens";
+ * import { base } from "thirdweb/chains";
+ * const address = await resolveAddress({
+ *    client,
+ *    name: "myk.base.eth",
+ *    resolverAddress: BASENAME_RESOLVER_ADDRESS,
+ *    resolverChain: base,
+ * });
+ * ```
  * @extension ENS
  * @returns A promise that resolves to the Ethereum address.
  */
@@ -58,7 +70,7 @@ export async function resolveAddress(options: ResolveAddressOptions) {
       return resolvedAddress;
     },
     {
-      cacheKey: `ens:addr:${name}`,
+      cacheKey: `ens:addr:${resolverChain?.id || 1}:${name}`,
       // 1min cache
       cacheTime: 60 * 1000,
     },

package/src/extensions/ens/resolve-l2-name.test.ts

@@ -0,0 +1,30 @@
+import { describe, expect, it } from "vitest";
+import { TEST_CLIENT } from "../../../test/src/test-clients.js";
+import { base } from "../../chains/chain-definitions/base.js";
+import { BASENAME_RESOLVER_ADDRESS } from "./constants.js";
+import { resolveL2Name } from "./resolve-l2-name.js";
+
+// skip this test suite if there is no secret key available to test with
+// TODO: remove reliance on secret key during unit tests entirely
+describe.runIf(process.env.TW_SECRET_KEY)("ENS:resolve-l2-name", () => {
+  it("should resolve Basename", async () => {
+    const ens = await resolveL2Name({
+      client: TEST_CLIENT,
+      // myk.base.eth
+      address: "0x653Ff253b0c7C1cc52f484e891b71f9f1F010Bfb",
+      resolverChain: base,
+      resolverAddress: BASENAME_RESOLVER_ADDRESS,
+    });
+    expect(ens).toBe("myk.base.eth");
+  });
+
+  it("should return null if no Basename exists for the address", async () => {
+    const ens = await resolveL2Name({
+      client: TEST_CLIENT,
+      address: "0xc6248746A9CA5935ae722E2061347A5897548c03",
+      resolverChain: base,
+      resolverAddress: BASENAME_RESOLVER_ADDRESS,
+    });
+    expect(ens).toBeNull();
+  });
+});

package/src/extensions/ens/resolve-l2-name.ts

@@ -0,0 +1,107 @@
+import type { Address } from "abitype";
+import { type Hex, encodePacked, keccak256, namehash } from "viem";
+import type { Chain } from "../../chains/types.js";
+import type { ThirdwebClient } from "../../client/client.js";
+import { getContract } from "../../contract/contract.js";
+import { withCache } from "../../utils/promise/withCache.js";
+import { name } from "./__generated__/L2Resolver/read/name.js";
+
+/**
+ * @extension ENS
+ */
+export type ResolveL2NameOptions = {
+  client: ThirdwebClient;
+  address: Address;
+  resolverAddress: string;
+  resolverChain: Chain;
+};
+
+/**
+ * Convert an address to a reverse node for ENS resolution
+ *
+ * @internal
+ */
+export const convertReverseNodeToBytes = (
+  address: Address,
+  chainId: number,
+) => {
+  const addressFormatted = address.toLocaleLowerCase() as Address;
+  const addressNode = keccak256(addressFormatted.substring(2) as Hex);
+  const cointype = (0x80000000 | chainId) >>> 0;
+
+  const chainCoinType = cointype.toString(16).toLocaleUpperCase();
+  const reverseNode = namehash(`${chainCoinType.toLocaleUpperCase()}.reverse`);
+
+  const addressReverseNode = keccak256(
+    encodePacked(["bytes32", "bytes32"], [reverseNode, addressNode]),
+  );
+  return addressReverseNode;
+};
+
+/**
+ * Resolves the L2 name for a specified address.
+ * @param options - The options for resolving an L2 ENS address.
+ * @example
+ * ```ts
+ * import { resolveL2Name } from "thirdweb/extensions/ens";
+ * const name = await resolveL2Name({
+ *    client,
+ *    address: "0x1234...",
+ *    resolverAddress: "0x...",
+ *    resolverChain: base,
+ * });
+ * ```
+ *
+ * Resolve a Basename.
+ * ```ts
+ * import { resolveL2Name, BASENAME_RESOLVER_ADDRESS } from "thirdweb/extensions/ens";
+ * import { base } from "thirdweb/chains";
+ * const name = await resolveL2Name({
+ *    client,
+ *    address: "0x1234...",
+ *    resolverAddress: BASENAME_RESOLVER_ADDRESS,
+ *    resolverChain: base,
+ * });
+ * ```
+ * @extension ENS
+ * @returns A promise that resolves to the Ethereum address.
+ */
+export async function resolveL2Name(options: ResolveL2NameOptions) {
+  const { client, address, resolverAddress, resolverChain } = options;
+
+  return withCache(
+    async () => {
+      const contract = getContract({
+        client,
+        chain: resolverChain,
+        address: resolverAddress,
+      });
+
+      const reverseName = convertReverseNodeToBytes(
+        address,
+        resolverChain.id || 1,
+      );
+
+      const resolvedName = await name({
+        contract,
+        node: reverseName,
+      }).catch((e) => {
+        if ("data" in e && e.data === "0x7199966d") {
+          return null;
+        }
+        throw e;
+      });
+
+      if (resolvedName === "") {
+        return null;
+      }
+
+      return resolvedName;
+    },
+    {
+      cacheKey: `ens:name:${resolverChain}:${address}`,
+      // 1min cache
+      cacheTime: 60 * 1000,
+    },
+  );
+}

package/src/extensions/ens/resolve-name.ts

@@ -65,7 +65,7 @@ export async function resolveName(options: ResolveNameOptions) {
       return name;
     },
     {
-      cacheKey: `ens:name:${address}`,
+      cacheKey: `ens:name:${resolverChain?.id || 1}:${address}`,
       // 1min cache
       cacheTime: 60 * 1000,
     },

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

@@ -4,7 +4,8 @@ import { useCallback } from "react";
 import type { Chain } from "../../../../../../chains/types.js";
 import type { ThirdwebClient } from "../../../../../../client/client.js";
 import { getContract } from "../../../../../../contract/contract.js";
-import { getApprovalForTransaction } from "../../../../../../extensions/erc20/write/getApprovalForTransaction.js";
+import { isERC721 } from "../../../../../../extensions/erc721/read/isERC721.js";
+import { isERC1155 } from "../../../../../../extensions/erc1155/read/isERC1155.js";
 import {
   type CreateListingParams,
   createListing,
@@ -74,12 +75,13 @@ export function CreateDirectListingButton(
   });
   const account = useActiveAccount();
   const defaultPayModalMetadata = payModal ? payModal.metadata : undefined;
+  const nftContract = getContract({
+    address: assetContractAddress,
+    chain,
+    client,
+  });
   const { data: payMetadata } = useReadContract(getPayMetadata, {
-    contract: getContract({
-      address: assetContractAddress,
-      chain,
-      client,
-    }),
+    contract: nftContract,
     tokenId,
     queryOptions: {
       enabled: !defaultPayModalMetadata,
@@ -91,19 +93,78 @@ export function CreateDirectListingButton(
     if (!account) {
       throw new Error("No account detected");
     }
+    const [is721, is1155] = await Promise.all([
+      isERC721({ contract: nftContract }),
+      isERC1155({ contract: nftContract }),
+    ]);
+    if (!is1155 && !is721) {
+      throw new Error("Asset must either be ERC721 or ERC1155");
+    }
+    // Check for token approval
+    if (is1155) {
+      const [{ isApprovedForAll }, { setApprovalForAll }] = await Promise.all([
+        import(
+          "../../../../../../extensions/erc1155/__generated__/IERC1155/read/isApprovedForAll.js"
+        ),
+        import(
+          "../../../../../../extensions/erc1155/__generated__/IERC1155/write/setApprovalForAll.js"
+        ),
+      ]);
+      const isApproved = await isApprovedForAll({
+        contract: nftContract,
+        operator: marketplaceContract.address,
+        owner: account.address,
+      });
+      if (!isApproved) {
+        const transaction = setApprovalForAll({
+          contract: nftContract,
+          operator: marketplaceContract.address,
+          approved: true,
+        });
+        await mutateAsync(transaction);
+      }
+    } else {
+      const [{ isApprovedForAll }, { setApprovalForAll }, { getApproved }] =
+        await Promise.all([
+          import(
+            "../../../../../../extensions/erc721/__generated__/IERC721A/read/isApprovedForAll.js"
+          ),
+          import(
+            "../../../../../../extensions/erc721/__generated__/IERC721A/write/setApprovalForAll.js"
+          ),
+          import(
+            "../../../../../../extensions/erc721/__generated__/IERC721A/read/getApproved.js"
+          ),
+        ]);
+      const [isApproved, tokenApproved] = await Promise.all([
+        isApprovedForAll({
+          contract: nftContract,
+          operator: marketplaceContract.address,
+          owner: account.address,
+        }),
+        getApproved({ contract: nftContract, tokenId: props.tokenId }),
+      ]);
+
+      if (
+        !isApproved &&
+        tokenApproved.toLowerCase() !==
+          marketplaceContract.address.toLowerCase()
+      ) {
+        const transaction = setApprovalForAll({
+          contract: nftContract,
+          operator: marketplaceContract.address,
+          approved: true,
+        });
+        await mutateAsync(transaction);
+      }
+    }
     const listingTx = createListing({
       contract: marketplaceContract,
       ...props,
     });
-    const approveTx = await getApprovalForTransaction({
-      transaction: listingTx,
-      account,
-    });
-    if (approveTx) {
-      await mutateAsync(approveTx);
-    }
+
     return listingTx;
-  }, [marketplaceContract, props, account, mutateAsync]);
+  }, [marketplaceContract, props, account, mutateAsync, nftContract]);
 
   return (
     <TransactionButton
@@ -128,14 +189,10 @@ async function getPayMetadata(
   }>,
 ): Promise<{ name?: string; image?: string }> {
   const [
-    { isERC721 },
-    { isERC1155 },
     { getContractMetadata },
     { getNFT: getERC721 },
     { getNFT: getERC1155 },
   ] = await Promise.all([
-    import("../../../../../../extensions/erc721/read/isERC721.js"),
-    import("../../../../../../extensions/erc1155/read/isERC1155.js"),
     import("../../../../../../extensions/common/read/getContractMetadata.js"),
     import("../../../../../../extensions/erc721/read/getNFT.js"),
     import("../../../../../../extensions/erc1155/read/getNFT.js"),

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.49.0";
+export const version = "5.50.0-nightly-6432e8dc6bdd0ed985fe0d76e47b36601bfa8be3-20240831000359";