thirdweb 5.53.1-nightly-865c5e3b16af70c3660f30ba8cffc5d6e360a389-20240911000352 → 5.54.0

package/src/exports/thirdweb.ts

@@ -68,6 +68,14 @@ export {
   type ThirdwebContract,
 } from "../contract/contract.js";
 
+/**
+ * WALLETS
+ */
+export {
+  getUser,
+  type GetUserResult,
+} from "../wallets/in-app/core/users/getUser.js";
+
 /**
  * TRANSACTIONS
  */

package/src/exports/utils.ts

@@ -181,3 +181,5 @@ export { parseAbiParams } from "../utils/contract/parse-abi-params.js";
 // bigint
 // ------------------------------------------------
 export { max, min } from "../utils/bigint.js";
+
+export { toFunctionSelector } from "viem";

package/src/exports/wallets.ts

@@ -102,6 +102,11 @@ export {
   linkProfile,
 } from "../wallets/in-app/core/wallet/profiles.js";
 
+export {
+  getUser,
+  type GetUserResult,
+} from "../wallets/in-app/core/users/getUser.js";
+
 export type {
   CoinbaseWalletCreationOptions,
   CoinbaseSDKWalletConnectionOptions,

package/src/extensions/airdrop/write/airdropERC1155WithSignature.test.ts

@@ -39,7 +39,10 @@ describe
           chain: ANVIL_CHAIN,
           client: TEST_CLIENT,
           contractId: "Airdrop",
-          contractParams: [TEST_ACCOUNT_A.address, ""],
+          contractParams: {
+            defaultAdmin: TEST_ACCOUNT_A.address,
+            contractURI: "",
+          },
         }),
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,

package/src/extensions/airdrop/write/airdropERC1155WithSignature.ts

@@ -23,13 +23,13 @@ import { airdropERC1155WithSignature as generatedAirdropERC1155WithSignature } f
  * });
  * await sendTransaction({ transaction, account });
  * ```
- * @extension Airdrop
+ * @extension AIRDROP
  * @returns A promise that resolves to the transaction result.
  */
 export const airdropERC1155WithSignature = generatedAirdropERC1155WithSignature;
 
 /**
- * @extension Airdrop
+ * @extension AIRDROP
  */
 export type GenerateAirdropERC1155SignatureOptions = {
   account: Account;
@@ -67,7 +67,7 @@ export type GenerateAirdropERC1155SignatureOptions = {
  * });
  * await sendTransaction({ transaction, account });
  * ```
- * @extension Airdrop
+ * @extension AIRDROP
  * @returns A promise that resolves to the req and signature.
  */
 export async function generateAirdropSignatureERC1155(

package/src/extensions/airdrop/write/airdropERC20WithSignature.test.ts

@@ -37,7 +37,10 @@ describe
           chain: ANVIL_CHAIN,
           client: TEST_CLIENT,
           contractId: "Airdrop",
-          contractParams: [TEST_ACCOUNT_A.address, ""],
+          contractParams: {
+            defaultAdmin: TEST_ACCOUNT_A.address,
+            contractURI: "",
+          },
         }),
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,

package/src/extensions/airdrop/write/airdropERC20WithSignature.ts

@@ -23,13 +23,13 @@ import { airdropERC20WithSignature as generatedAirdropERC20WithSignature } from
  * });
  * await sendTransaction({ transaction, account });
  * ```
- * @extension Airdrop
+ * @extension AIRDROP
  * @returns A promise that resolves to the transaction result.
  */
 export const airdropERC20WithSignature = generatedAirdropERC20WithSignature;
 
 /**
- * @extension Airdrop
+ * @extension AIRDROP
  */
 export type GenerateAirdropERC20SignatureOptions = {
   account: Account;
@@ -67,7 +67,7 @@ export type GenerateAirdropERC20SignatureOptions = {
  * });
  * await sendTransaction({ transaction, account });
  * ```
- * @extension Airdrop
+ * @extension AIRDROP
  * @returns A promise that resolves to the req and signature.
  */
 export async function generateAirdropSignatureERC20(

package/src/extensions/airdrop/write/airdropERC721WithSignature.test.ts

@@ -39,7 +39,10 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           chain: ANVIL_CHAIN,
           client: TEST_CLIENT,
           contractId: "Airdrop",
-          contractParams: [TEST_ACCOUNT_A.address, ""],
+          contractParams: {
+            defaultAdmin: TEST_ACCOUNT_A.address,
+            contractURI: "",
+          },
         }),
         chain: ANVIL_CHAIN,
         client: TEST_CLIENT,

package/src/extensions/airdrop/write/airdropERC721WithSignature.ts

@@ -23,13 +23,13 @@ import { airdropERC721WithSignature as generatedAirdropERC721WithSignature } fro
  * });
  * await sendTransaction({ transaction, account });
  * ```
- * @extension Airdrop
+ * @extension AIRDROP
  * @returns A promise that resolves to the transaction result.
  */
 export const airdropERC721WithSignature = generatedAirdropERC721WithSignature;
 
 /**
- * @extension Airdrop
+ * @extension AIRDROP
  */
 export type GenerateAirdropERC721SignatureOptions = {
   account: Account;
@@ -67,7 +67,7 @@ export type GenerateAirdropERC721SignatureOptions = {
  * });
  * await sendTransaction({ transaction, account });
  * ```
- * @extension Airdrop
+ * @extension AIRDROP
  * @returns A promise that resolves to the req and signature.
  */
 export async function generateAirdropSignatureERC721(

package/src/extensions/airdrop/write/claimERC1155.test.ts

@@ -38,7 +38,10 @@ describe.runIf(process.env.TW_SECRET_KEY).skip("claimERC1155", () => {
         client: TEST_CLIENT,
         contractId: "Airdrop",
         publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
-        contractParams: [TEST_ACCOUNT_A.address, ""],
+        contractParams: {
+          defaultAdmin: TEST_ACCOUNT_A.address,
+          contractURI: "",
+        },
       }),
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,

package/src/extensions/airdrop/write/claimERC1155.ts

@@ -5,7 +5,7 @@ import { tokenMerkleRoot } from "../__generated__/Airdrop/read/tokenMerkleRoot.j
 import { claimERC1155 as generatedClaimERC1155 } from "../__generated__/Airdrop/write/claimERC1155.js";
 
 /**
- * @extension Airdrop
+ * @extension AIRDROP
  */
 export type ClaimERC1155Params = {
   tokenAddress: string;
@@ -32,7 +32,7 @@ export type ClaimERC1155Params = {
  * await sendTransaction({ claimTransaction, account });
  *
  * ```
- * @extension Airdrop
+ * @extension AIRDROP
  * @returns A promise that resolves to the transaction result.
  */
 export function claimERC1155(

package/src/extensions/airdrop/write/claimERC20.test.ts

@@ -36,7 +36,10 @@ describe.runIf(process.env.TW_SECRET_KEY).skip("claimERC20", () => {
         client: TEST_CLIENT,
         contractId: "Airdrop",
         publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
-        contractParams: [TEST_ACCOUNT_A.address, ""],
+        contractParams: {
+          defaultAdmin: TEST_ACCOUNT_A.address,
+          contractURI: "",
+        },
       }),
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,

package/src/extensions/airdrop/write/claimERC20.ts

@@ -9,7 +9,7 @@ import { tokenMerkleRoot } from "../__generated__/Airdrop/read/tokenMerkleRoot.j
 import { claimERC20 as generatedClaimERC20 } from "../__generated__/Airdrop/write/claimERC20.js";
 
 /**
- * @extension Airdrop
+ * @extension AIRDROP
  */
 export type ClaimERC20Params = {
   tokenAddress: string;
@@ -36,7 +36,7 @@ export type ClaimERC20Params = {
  * await sendTransaction({ claimTransaction, account });
  *
  * ```
- * @extension Airdrop
+ * @extension AIRDROP
  * @returns A promise that resolves to the transaction result.
  */
 export function claimERC20(options: BaseTransactionOptions<ClaimERC20Params>) {

package/src/extensions/airdrop/write/claimERC721.test.ts

@@ -38,7 +38,10 @@ describe.runIf(process.env.TW_SECRET_KEY).skip("claimERC721", () => {
         client: TEST_CLIENT,
         contractId: "Airdrop",
         publisher: "0xFD78F7E2dF2B8c3D5bff0413c96f3237500898B3",
-        contractParams: [TEST_ACCOUNT_A.address, ""],
+        contractParams: {
+          defaultAdmin: TEST_ACCOUNT_A.address,
+          contractURI: "",
+        },
       }),
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,

package/src/extensions/airdrop/write/claimERC721.ts

@@ -5,7 +5,7 @@ import { tokenMerkleRoot } from "../__generated__/Airdrop/read/tokenMerkleRoot.j
 import { claimERC721 as generatedClaimERC721 } from "../__generated__/Airdrop/write/claimERC721.js";
 
 /**
- * @extension Airdrop
+ * @extension AIRDROP
  */
 export type ClaimERC721Params = {
   tokenAddress: string;
@@ -32,7 +32,7 @@ export type ClaimERC721Params = {
  * await sendTransaction({ claimTransaction, account });
  *
  * ```
- * @extension Airdrop
+ * @extension AIRDROP
  * @returns A promise that resolves to the transaction result.
  */
 export function claimERC721(

package/src/extensions/airdrop/write/merkleInfoERC1155.ts

@@ -3,7 +3,7 @@ import { processSnapshotERC1155 } from "../../../utils/extensions/airdrop/proces
 import type { SnapshotEntryERC1155 } from "../../../utils/extensions/airdrop/types.js";
 
 /**
- * @extension Airdrop
+ * @extension AIRDROP
  */
 export type GenerateMerkleTreeInfoERC1155Params = {
   snapshot: SnapshotEntryERC1155[];
@@ -37,7 +37,7 @@ export type GenerateMerkleTreeInfoERC1155Params = {
  * // - Set merkle root on the contract to enable claiming
  *
  * ```
- * @extension Airdrop
+ * @extension AIRDROP
  * @returns A promise that resolves to the merkle-root and snapshot-uri.
  */
 export async function generateMerkleTreeInfoERC1155(

package/src/extensions/airdrop/write/merkleInfoERC20.ts

@@ -7,7 +7,7 @@ import { processSnapshotERC20 } from "../../../utils/extensions/airdrop/process-
 import type { SnapshotEntryERC20 } from "../../../utils/extensions/airdrop/types.js";
 
 /**
- * @extension Airdrop
+ * @extension AIRDROP
  */
 export type GenerateMerkleTreeInfoERC20Params = {
   snapshot: SnapshotEntryERC20[];
@@ -41,7 +41,7 @@ export type GenerateMerkleTreeInfoERC20Params = {
  * // - Set merkle root on the contract to enable claiming
  *
  * ```
- * @extension Airdrop
+ * @extension AIRDROP
  * @returns A promise that resolves to the merkle-root and snapshot-uri.
  */
 export async function generateMerkleTreeInfoERC20(

package/src/extensions/airdrop/write/merkleInfoERC721.ts

@@ -3,7 +3,7 @@ import { processSnapshotERC721 } from "../../../utils/extensions/airdrop/process
 import type { SnapshotEntryERC721 } from "../../../utils/extensions/airdrop/types.js";
 
 /**
- * @extension Airdrop
+ * @extension AIRDROP
  */
 export type GenerateMerkleTreeInfoERC721Params = {
   snapshot: SnapshotEntryERC721[];
@@ -37,7 +37,7 @@ export type GenerateMerkleTreeInfoERC721Params = {
  * // - Set merkle root on the contract to enable claiming
  *
  * ```
- * @extension Airdrop
+ * @extension AIRDROP
  * @returns A promise that resolves to the merkle-root and snapshot-uri.
  */
 export async function generateMerkleTreeInfoERC721(

package/src/extensions/airdrop/write/saveSnapshot.ts

@@ -3,7 +3,7 @@ import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { setContractURI } from "../../common/__generated__/IContractMetadata/write/setContractURI.js";
 
 /**
- * @extension Airdrop
+ * @extension AIRDROP
  */
 export type SaveSnapshotParams = {
   merkleRoot: string;
@@ -52,7 +52,7 @@ export type SaveSnapshotParams = {
  * await sendTransaction({ setMerkleRootTransaction, account });
  *
  * ```
- * @extension Airdrop
+ * @extension AIRDROP
  * @returns A promise that resolves to the transaction result.
  */
 export function saveSnapshot(

package/src/extensions/erc1155/write/updateTokenURI.test.ts

@@ -0,0 +1,54 @@
+import { describe, expect, it } from "vitest";
+import { ANVIL_CHAIN } from "~test/chains.js";
+import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
+import { TEST_CLIENT } from "~test/test-clients.js";
+import { TEST_ACCOUNT_A } from "~test/test-wallets.js";
+import { getContract } from "../../../contract/contract.js";
+import { deployERC1155Contract } from "../../../extensions/prebuilts/deploy-erc1155.js";
+import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
+import { getNFT } from "../read/getNFT.js";
+import { mintTo } from "./mintTo.js";
+import { updateTokenURI } from "./updateTokenURI.js";
+
+const client = TEST_CLIENT;
+const chain = ANVIL_CHAIN;
+const account = TEST_ACCOUNT_A;
+
+describe.runIf(process.env.TW_SECRET_KEY)("Edition: Update token uri", () => {
+  it("should update token uri", async () => {
+    const address = await deployERC1155Contract({
+      client,
+      chain,
+      account,
+      type: "TokenERC1155",
+      params: {
+        name: "Edition",
+        contractURI: TEST_CONTRACT_URI,
+      },
+    });
+    const contract = getContract({
+      address,
+      client,
+      chain,
+    });
+    await sendAndConfirmTransaction({
+      transaction: mintTo({
+        contract,
+        nft: { name: "Test1" },
+        to: account.address,
+        supply: 1n,
+      }),
+      account,
+    });
+    await sendAndConfirmTransaction({
+      transaction: updateTokenURI({
+        contract,
+        newMetadata: { name: "Test1 Updated" },
+        tokenId: 0n,
+      }),
+      account,
+    });
+    const nft = await getNFT({ contract, tokenId: 0n });
+    expect(nft.metadata.name).toBe("Test1 Updated");
+  });
+});

package/src/extensions/erc20/drops/read/getActiveClaimCondition.ts

@@ -26,6 +26,18 @@ export async function getActiveClaimCondition(
   }
 }
 
+/**
+ * Checks if the `getActiveClaimCondition` method is supported by the given contract.
+ * @param availableSelectors An array of 4byte function selectors of the contract. You can get this in various ways, such as using "whatsabi" or if you have the ABI of the contract available you can use it to generate the selectors.
+ * @returns A boolean indicating if the `getActiveClaimCondition` method is supported.
+ * @extension ERC20
+ * @example
+ * ```ts
+ * import { isGetActiveClaimConditionSupported } from "thirdweb/extensions/erc20";
+ *
+ * const supported = isGetActiveClaimConditionSupported(["0x..."]);
+ * ```
+ */
 export function isGetActiveClaimConditionSupported(
   availableSelectors: string[],
 ) {

package/src/extensions/erc20/write/getApprovalForTransaction.test.ts

@@ -0,0 +1,112 @@
+import { describe, expect, it } from "vitest";
+import { ANVIL_CHAIN } from "~test/chains.js";
+import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
+import { TEST_CLIENT } from "~test/test-clients.js";
+import { TEST_ACCOUNT_A, TEST_ACCOUNT_B } from "~test/test-wallets.js";
+import { getContract } from "../../../contract/contract.js";
+import { lazyMint } from "../../../extensions/erc721/write/lazyMint.js";
+import { deployERC20Contract } from "../../../extensions/prebuilts/deploy-erc20.js";
+import { deployERC721Contract } from "../../../extensions/prebuilts/deploy-erc721.js";
+import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
+import { claimTo } from "../../erc721/drops/write/claimTo.js";
+import { setClaimConditions } from "../../erc721/drops/write/setClaimConditions.js";
+import { getApprovalForTransaction } from "./getApprovalForTransaction.js";
+
+const chain = ANVIL_CHAIN;
+const client = TEST_CLIENT;
+const account = TEST_ACCOUNT_A;
+
+describe.runIf(process.env.TW_SECRET_KEY)(
+  "erc20: getApporvalForTransaction",
+  () => {
+    it("should return an approval tx", async () => {
+      const currencyAddress = await deployERC20Contract({
+        chain,
+        client,
+        account,
+        type: "TokenERC20",
+        params: { name: "erc20token", contractURI: TEST_CONTRACT_URI },
+      });
+      const contract = getContract({
+        address: await deployERC721Contract({
+          client,
+          chain,
+          account,
+          type: "DropERC721",
+          params: { name: "", contractURI: TEST_CONTRACT_URI },
+        }),
+        chain,
+        client,
+      });
+      await sendAndConfirmTransaction({
+        transaction: lazyMint({ contract, nfts: [{ name: "token 0" }] }),
+        account,
+      });
+      await sendAndConfirmTransaction({
+        transaction: setClaimConditions({
+          contract,
+          phases: [
+            {
+              maxClaimableSupply: 100n,
+              maxClaimablePerWallet: 1n,
+              currencyAddress,
+              price: 1,
+              startTime: new Date(),
+            },
+          ],
+        }),
+        account,
+      });
+      const approveTx = await getApprovalForTransaction({
+        transaction: claimTo({
+          contract,
+          to: TEST_ACCOUNT_B.address,
+          quantity: 1n,
+        }),
+        account,
+      });
+      expect(approveTx?.to).toBe(currencyAddress);
+    });
+
+    it("should return NULL", async () => {
+      const contract = getContract({
+        address: await deployERC721Contract({
+          client,
+          chain,
+          account,
+          type: "DropERC721",
+          params: { name: "", contractURI: TEST_CONTRACT_URI },
+        }),
+        chain,
+        client,
+      });
+      await sendAndConfirmTransaction({
+        transaction: lazyMint({ contract, nfts: [{ name: "token 0" }] }),
+        account,
+      });
+      await sendAndConfirmTransaction({
+        transaction: setClaimConditions({
+          contract,
+          phases: [
+            {
+              maxClaimableSupply: 100n,
+              maxClaimablePerWallet: 1n,
+              price: 1,
+              startTime: new Date(),
+            },
+          ],
+        }),
+        account,
+      });
+      const approveTx = await getApprovalForTransaction({
+        transaction: claimTo({
+          contract,
+          to: TEST_ACCOUNT_B.address,
+          quantity: 1n,
+        }),
+        account,
+      });
+      expect(approveTx).toBe(null);
+    });
+  },
+);

package/src/extensions/erc20/write/getApprovalForTransaction.ts

@@ -53,7 +53,7 @@ export type GetApprovalForTransactionParams = {
  * }
  * ```
  *
- * @transactions
+ * @transaction
  */
 export async function getApprovalForTransaction(
   options: GetApprovalForTransactionParams,

package/src/extensions/erc20/write/transferFrom.test.ts

@@ -0,0 +1,104 @@
+import { describe, expect, it } from "vitest";
+import { ANVIL_CHAIN } from "~test/chains.js";
+import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
+import { TEST_CLIENT } from "~test/test-clients.js";
+import { TEST_ACCOUNT_A, TEST_ACCOUNT_B } from "~test/test-wallets.js";
+import { getContract } from "../../../contract/contract.js";
+import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
+import { deployERC20Contract } from "../../prebuilts/deploy-erc20.js";
+import { balanceOf } from "../__generated__/IERC20/read/balanceOf.js";
+import { approve } from "./approve.js";
+import { mintTo } from "./mintTo.js";
+import { transferFrom } from "./transferFrom.js";
+
+const chain = ANVIL_CHAIN;
+const client = TEST_CLIENT;
+const account = TEST_ACCOUNT_A;
+
+describe.runIf(process.env.TW_SECRET_KEY)("ERC20 transferFrom", () => {
+  it("should work with `amount`", async () => {
+    const contract = getContract({
+      address: await deployERC20Contract({
+        chain,
+        client,
+        account,
+        params: {
+          name: "erc20token",
+          contractURI: TEST_CONTRACT_URI,
+        },
+        type: "TokenERC20",
+      }),
+      client,
+      chain,
+    });
+
+    await sendAndConfirmTransaction({
+      transaction: mintTo({ contract, to: account.address, amount: 1000 }),
+      account,
+    });
+
+    await sendAndConfirmTransaction({
+      transaction: approve({ contract, amount: 999, spender: account.address }),
+      account,
+    });
+
+    await sendAndConfirmTransaction({
+      transaction: transferFrom({
+        contract,
+        amount: 999,
+        to: TEST_ACCOUNT_B.address,
+        from: account.address,
+      }),
+      account,
+    });
+
+    const balance = await balanceOf({
+      contract,
+      address: TEST_ACCOUNT_B.address,
+    });
+    expect(balance).toBe(999n * 10n ** 18n);
+  });
+
+  it("should work with `amountWei`", async () => {
+    const contract = getContract({
+      address: await deployERC20Contract({
+        chain,
+        client,
+        account,
+        params: {
+          name: "erc20token",
+          contractURI: TEST_CONTRACT_URI,
+        },
+        type: "TokenERC20",
+      }),
+      client,
+      chain,
+    });
+
+    await sendAndConfirmTransaction({
+      transaction: mintTo({ contract, to: account.address, amount: 1000 }),
+      account,
+    });
+
+    await sendAndConfirmTransaction({
+      transaction: approve({ contract, amount: 999, spender: account.address }),
+      account,
+    });
+
+    await sendAndConfirmTransaction({
+      transaction: transferFrom({
+        contract,
+        amountWei: 999n * 10n ** 18n,
+        to: TEST_ACCOUNT_B.address,
+        from: account.address,
+      }),
+      account,
+    });
+
+    const balance = await balanceOf({
+      contract,
+      address: TEST_ACCOUNT_B.address,
+    });
+    expect(balance).toBe(999n * 10n ** 18n);
+  });
+});

package/src/extensions/erc4337/account/permissions.test.ts

@@ -34,7 +34,10 @@ describe.runIf(process.env.TW_SECRET_KEY)("Account Permissions", () => {
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
       contractId: "AccountFactory",
-      constructorParams: [TEST_ACCOUNT_A.address, ENTRYPOINT_ADDRESS_v0_6],
+      constructorParams: {
+        defaultAdmin: TEST_ACCOUNT_A.address,
+        entrypoint: ENTRYPOINT_ADDRESS_v0_6,
+      },
     });
     const transaction = createAccount({
       contract: accountFactoryContract,

package/src/extensions/erc721/drops/write/updateMetadata.test.ts

@@ -53,4 +53,33 @@ describe.runIf(process.env.TW_SECRET_KEY)("updateMetadata ERC721", () => {
     expect(nfts[1]?.metadata.name).toBe("token 1 - updated");
     expect(nfts[2]?.metadata.name).toBe("token 2");
   });
+
+  it("should throw if no nft uploaded", async () => {
+    const address = await deployERC721Contract({
+      client,
+      chain,
+      account,
+      type: "DropERC721",
+      params: {
+        name: "NFT Drop",
+        contractURI: TEST_CONTRACT_URI,
+      },
+    });
+    const contract = getContract({
+      address,
+      client,
+      chain,
+    });
+    const updateTx = updateMetadata({
+      contract,
+      targetTokenId: 0n,
+      newMetadata: { name: "token 1 - updated" },
+      client,
+    });
+    await expect(
+      sendAndConfirmTransaction({ transaction: updateTx, account }),
+    ).rejects.toThrowError(
+      "No base URI set. Please set a base URI before updating metadata",
+    );
+  });
 });