thirdweb 5.64.0-nightly-e6e994479fb8386b1740de4170f33446f038f2b1-20241024000332 → 5.64.1

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

@@ -40,5 +40,11 @@ export async function getEcosystemOptions(
     );
   }
 
+  // siwe is the auth option in the backend, but we want to use wallet as the auth option in the frontend
+  if (data.authOptions?.includes("siwe")) {
+    data.authOptions = data.authOptions.filter((o: string) => o !== "siwe");
+    data.authOptions.push("wallet");
+  }
+
   return data ?? null;
 }

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

@@ -3,8 +3,8 @@ import { getThirdwebBaseUrl } from "../../../../utils/domains.js";
 import { type AuthOption, authOptions } from "../../../../wallets/types.js";
 import type { Ecosystem } from "../wallet/types.js";
 
-const getLoginOptionRoute = (option: AuthOption | "wallet") => {
-  if (!authOptions.includes(option as AuthOption) && option !== "wallet") {
+const getLoginOptionRoute = (option: AuthOption) => {
+  if (!authOptions.includes(option as AuthOption)) {
     throw new Error(`Unknown auth option ${option}`);
   }
   switch (option) {
@@ -22,7 +22,7 @@ export const getLoginUrl = ({
   mode = "popup",
   redirectUrl,
 }: {
-  authOption: AuthOption | "wallet";
+  authOption: AuthOption;
   client: ThirdwebClient;
   ecosystem?: Ecosystem;
   mode?: "popup" | "redirect" | "window";
@@ -60,7 +60,7 @@ export const getLoginCallbackUrl = ({
   client,
   ecosystem,
 }: {
-  authOption: AuthOption | "wallet";
+  authOption: AuthOption;
   client: ThirdwebClient;
   ecosystem?: Ecosystem;
 }): string => {

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

@@ -112,7 +112,7 @@ export type OAuthRedirectObject = {
 
 // TODO: type this better for each auth provider
 export type Profile = {
-  type: AuthOption | "wallet";
+  type: AuthOption;
   details: {
     id?: string;
     email?: string;

package/src/wallets/types.ts

@@ -41,6 +41,7 @@ export const authOptions = [
   "email",
   "phone",
   "passkey",
+  "wallet",
 ] as const;
 export type AuthOption = (typeof authOptions)[number];
 

package/src/extensions/erc1155/drops/write/claimTo.test.ts

@@ -1,185 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { ANVIL_CHAIN } from "~test/chains.js";
-import { TEST_CLIENT } from "~test/test-clients.js";
-import { TEST_ACCOUNT_A, TEST_ACCOUNT_B } from "~test/test-wallets.js";
-
-import { TEST_CONTRACT_URI } from "~test/ipfs-uris.js";
-import { NATIVE_TOKEN_ADDRESS } from "../../../../constants/addresses.js";
-import { getContract } from "../../../../contract/contract.js";
-import { deployERC20Contract } from "../../../../extensions/prebuilts/deploy-erc20.js";
-import { deployERC1155Contract } from "../../../../extensions/prebuilts/deploy-erc1155.js";
-import { sendAndConfirmTransaction } from "../../../../transaction/actions/send-and-confirm-transaction.js";
-import { totalSupply } from "../../__generated__/IERC1155/read/totalSupply.js";
-import { lazyMint } from "../../write/lazyMint.js";
-import { claimTo } from "./claimTo.js";
-import { setClaimConditions } from "./setClaimConditions.js";
-
-const account = TEST_ACCOUNT_A;
-const client = TEST_CLIENT;
-const chain = ANVIL_CHAIN;
-
-describe.runIf(process.env.TW_SECRET_KEY)("erc1155 claimTo extension", () => {
-  it("should claim the nft", async () => {
-    const address = await deployERC1155Contract({
-      client,
-      chain,
-      account,
-      type: "DropERC1155",
-      params: {
-        name: "Edition Drop",
-        contractURI: TEST_CONTRACT_URI,
-      },
-    });
-    const contract = getContract({
-      address,
-      client,
-      chain,
-    });
-    const lazyMintTx = lazyMint({ contract, nfts: [{ name: "token 0" }] });
-    await sendAndConfirmTransaction({ transaction: lazyMintTx, account });
-    const setClaimTx = setClaimConditions({
-      contract,
-      tokenId: 0n,
-      phases: [
-        {
-          maxClaimableSupply: 100n,
-          maxClaimablePerWallet: 100n,
-          currencyAddress: NATIVE_TOKEN_ADDRESS,
-          price: 0.1,
-          startTime: new Date(),
-        },
-      ],
-    });
-    await sendAndConfirmTransaction({ transaction: setClaimTx, account });
-
-    const transaction = claimTo({
-      contract,
-      tokenId: 0n,
-      quantity: 1n,
-      to: account.address,
-    });
-    await sendAndConfirmTransaction({ transaction, account });
-    const supplyCount = await totalSupply({ contract, id: 0n });
-    expect(supplyCount).toBe(1n);
-  });
-
-  it("should claim with allowlist", async () => {
-    const address = await deployERC1155Contract({
-      client,
-      chain,
-      account,
-      type: "DropERC1155",
-      params: {
-        name: "Edition Drop",
-        contractURI: TEST_CONTRACT_URI,
-      },
-    });
-    const contract = getContract({
-      address,
-      client,
-      chain,
-    });
-    const lazyMintTx = lazyMint({ contract, nfts: [{ name: "token 0" }] });
-    await sendAndConfirmTransaction({ transaction: lazyMintTx, account });
-    const setClaimTx = setClaimConditions({
-      contract,
-      tokenId: 0n,
-      phases: [
-        {
-          maxClaimableSupply: 100n,
-          maxClaimablePerWallet: 5n,
-          currencyAddress: NATIVE_TOKEN_ADDRESS,
-          price: 0.06,
-          startTime: new Date(),
-          overrideList: [
-            {
-              address: TEST_ACCOUNT_B.address,
-              maxClaimable: "50",
-              price: "0.3",
-              currencyAddress: NATIVE_TOKEN_ADDRESS,
-            },
-          ],
-        },
-      ],
-    });
-    await sendAndConfirmTransaction({ transaction: setClaimTx, account });
-
-    const transaction = claimTo({
-      contract,
-      tokenId: 0n,
-      quantity: 50n,
-      to: TEST_ACCOUNT_B.address,
-    });
-    await sendAndConfirmTransaction({ transaction, account: TEST_ACCOUNT_B });
-    const supplyCount = await totalSupply({ contract, id: 0n });
-    expect(supplyCount).toBe(50n);
-  });
-
-  /**
-   * This is to document the behavior where one can claim without paying if the claiming address
-   * is the same as the PrimaryRecipientAddress, because of this Solidity code:
-   * ```solidity
-   * // CurrencyTransferLib.sol
-   * function safeTransferERC20(address _currency, address _from, address _to, uint256 _amount) internal {
-   *   if (_from == _to) {
-   *     return;
-   *   }
-   *   ...
-   * }
-   * ```
-   */
-  it("address that is the same with PrimaryFeeRecipient can claim without paying ERC20", async () => {
-    const tokenAddress = await deployERC20Contract({
-      client,
-      chain,
-      account,
-      type: "TokenERC20",
-      params: {
-        name: "token20",
-        contractURI: TEST_CONTRACT_URI,
-      },
-    });
-    const address = await deployERC1155Contract({
-      client,
-      chain,
-      account,
-      type: "DropERC1155",
-      params: {
-        name: "Edition Drop",
-        contractURI: TEST_CONTRACT_URI,
-        saleRecipient: account.address,
-      },
-    });
-    const contract = getContract({
-      address,
-      client,
-      chain,
-    });
-    const lazyMintTx = lazyMint({ contract, nfts: [{ name: "token 0" }] });
-    await sendAndConfirmTransaction({ transaction: lazyMintTx, account });
-    const setClaimTx = setClaimConditions({
-      contract,
-      tokenId: 0n,
-      phases: [
-        {
-          maxClaimableSupply: 100n,
-          maxClaimablePerWallet: 100n,
-          currencyAddress: tokenAddress,
-          price: 1000,
-          startTime: new Date(),
-        },
-      ],
-    });
-    await sendAndConfirmTransaction({ transaction: setClaimTx, account });
-
-    const transaction = claimTo({
-      contract,
-      tokenId: 0n,
-      quantity: 1n,
-      to: account.address,
-    });
-    await sendAndConfirmTransaction({ transaction, account });
-    const supplyCount = await totalSupply({ contract, id: 0n });
-    expect(supplyCount).toBe(1n);
-  });
-});

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

@@ -1,54 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { ANVIL_CHAIN } from "~test/chains.js";
-import { TEST_CLIENT } from "~test/test-clients.js";
-import { TEST_ACCOUNT_A } from "~test/test-wallets.js";
-
-import { TEST_CONTRACT_URI } from "~test/ipfs-uris.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 { getNFTs } from "../../read/getNFTs.js";
-import { lazyMint } from "../../write/lazyMint.js";
-import { updateMetadata } from "./updateMetadata.js";
-
-const account = TEST_ACCOUNT_A;
-const client = TEST_CLIENT;
-const chain = ANVIL_CHAIN;
-describe.runIf(process.env.TW_SECRET_KEY)("updateMetadata ERC1155", () => {
-  it("should update metadata", async () => {
-    const address = await deployERC1155Contract({
-      client,
-      chain,
-      account,
-      type: "DropERC1155",
-      params: {
-        name: "Edition Drop",
-        contractURI: TEST_CONTRACT_URI,
-      },
-    });
-    const contract = getContract({
-      address,
-      client,
-      chain,
-    });
-    const lazyMintTx = lazyMint({
-      contract,
-      nfts: [{ name: "token 0" }, { name: "token 1" }, { name: "token 2" }],
-    });
-    await sendAndConfirmTransaction({ transaction: lazyMintTx, account });
-
-    const updateTx = updateMetadata({
-      contract,
-      targetTokenId: 1n,
-      newMetadata: { name: "token 1 - updated" },
-    });
-    await sendAndConfirmTransaction({ transaction: updateTx, account });
-
-    const nfts = await getNFTs({ contract });
-
-    expect(nfts.length).toBe(3);
-    expect(nfts[0]?.metadata.name).toBe("token 0");
-    expect(nfts[1]?.metadata.name).toBe("token 1 - updated");
-    expect(nfts[2]?.metadata.name).toBe("token 2");
-  });
-});