thirdweb 5.59.1 → 5.60.0-nightly-6c26012a71d884f99dd5d8c914b3879037b36d56-20240929000339

package/src/extensions/prebuilts/deploy-erc721.test.ts

@@ -1,11 +1,13 @@
 import { describe, expect, it } from "vitest";
 import { ANVIL_CHAIN } from "../../../test/src/chains.js";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
-import { TEST_ACCOUNT_A } from "../../../test/src/test-wallets.js";
+import { TEST_ACCOUNT_B } from "../../../test/src/test-wallets.js";
 import { getContract } from "../../contract/contract.js";
 import { name } from "../common/read/name.js";
 import { deployERC721Contract } from "./deploy-erc721.js";
 
+const account = TEST_ACCOUNT_B;
+
 // 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)("deployERC721", () => {
@@ -13,7 +15,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployERC721", () => {
     const address = await deployERC721Contract({
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
-      account: TEST_ACCOUNT_A,
+      account,
       type: "DropERC721",
       params: {
         name: "NFTDrop",
@@ -34,7 +36,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployERC721", () => {
     const address = await deployERC721Contract({
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
-      account: TEST_ACCOUNT_A,
+      account,
       type: "TokenERC721",
       params: {
         name: "NFTCollection",
@@ -55,7 +57,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("deployERC721", () => {
     const address = await deployERC721Contract({
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
-      account: TEST_ACCOUNT_A,
+      account,
       type: "OpenEditionERC721",
       params: {
         name: "OE",

package/src/extensions/prebuilts/deploy-pack.test.ts

@@ -0,0 +1,23 @@
+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 { isAddress } from "../../utils/address.js";
+import { deployPackContract } from "./deploy-pack.js";
+
+describe.runIf(process.env.TW_SECRET_KEY)("deploy-pack contract", () => {
+  it("should deploy Pack contract", async () => {
+    const address = await deployPackContract({
+      account: TEST_ACCOUNT_A,
+      client: TEST_CLIENT,
+      chain: ANVIL_CHAIN,
+      params: {
+        name: "pack-contract",
+      },
+    });
+    expect(address).toBeDefined();
+    expect(isAddress(address)).toBe(true);
+    // Further tests to verify the functionality of this contract
+    // are done in other Pack tests
+  });
+});

package/src/extensions/prebuilts/deploy-pack.ts

@@ -0,0 +1,173 @@
+import type { Chain } from "../../chains/types.js";
+import type { ThirdwebClient } from "../../client/client.js";
+import type { ThirdwebContract } from "../../contract/contract.js";
+import { deployViaAutoFactory } from "../../contract/deployment/deploy-via-autofactory.js";
+import {
+  getOrDeployInfraContract,
+  getOrDeployInfraForPublishedContract,
+} from "../../contract/deployment/utils/bootstrap.js";
+import { upload } from "../../storage/upload.js";
+import type { FileOrBufferOrString } from "../../storage/upload/types.js";
+import type { Prettify } from "../../utils/type-utils.js";
+import type { ClientAndChainAndAccount } from "../../utils/types.js";
+import { initialize } from "./__generated__/Pack/write/initialize.js";
+
+/**
+ * @extension DEPLOY
+ */
+export type PackContractParams = {
+  /**
+   * Name of the Pack contract
+   */
+  name: string;
+  /**
+   * Defaults to the deployer's address
+   */
+  royaltyRecipient?: string;
+  /**
+   * Defaults to 0 (zero)
+   */
+  royaltyBps?: number | string;
+
+  description?: string;
+  image?: FileOrBufferOrString;
+  external_link?: string;
+  social_urls?: Record<string, string>;
+  /**
+   * Defaults to an empty string ("")
+   */
+  symbol?: string;
+  contractURI?: string;
+  /**
+   * Defaults to the deployer's address
+   */
+  defaultAdmin?: string;
+  trustedForwarders?: string[];
+};
+
+/**
+ * @extension DEPLOY
+ */
+export type DeployPackContractOptions = Prettify<
+  ClientAndChainAndAccount & {
+    params: PackContractParams;
+  }
+>;
+
+/**
+ * Deploy a thirdweb Pack contract
+ * @param options params for deploying [`Pack contract`](https://thirdweb.com/thirdweb.eth/Pack)
+ * @returns
+ *
+ * @example
+ * ```ts
+ * import { deployPackContract } from "thirdweb/extensions/deploy";
+ *
+ * const packAddress = await deployPackContract({
+ *   account,
+ *   client,
+ *   chain,
+ *   params: {
+ *     name: "Pack contract name",
+ *     symbol: "PACK1155",
+ *   },
+ * });
+ * ```
+ */
+export async function deployPackContract(options: DeployPackContractOptions) {
+  const { chain, client, account, params } = options;
+  const [WETH, forwarder] = await Promise.all([
+    getOrDeployInfraContract({
+      chain,
+      client,
+      account,
+      contractId: "WETH9",
+    }),
+    getOrDeployInfraContract({
+      chain,
+      client,
+      account,
+      contractId: "Forwarder",
+    }),
+  ]);
+  const { cloneFactoryContract, implementationContract } =
+    await getOrDeployInfraForPublishedContract({
+      chain,
+      client,
+      account,
+      contractId: "Pack",
+      constructorParams: {
+        nativeTokenWrapper: WETH.address,
+        trustedForwarder: forwarder.address,
+      },
+    });
+  const initializeTransaction = await getInitializeTransaction({
+    client,
+    implementationContract,
+    params,
+    accountAddress: account.address,
+    chain,
+  });
+
+  return deployViaAutoFactory({
+    client,
+    chain,
+    account,
+    cloneFactoryContract,
+    initializeTransaction,
+  });
+}
+
+/**
+ * @internal
+ */
+async function getInitializeTransaction(options: {
+  client: ThirdwebClient;
+  implementationContract: ThirdwebContract;
+  params: PackContractParams;
+  accountAddress: string;
+  chain: Chain;
+}) {
+  const { params, implementationContract, accountAddress, client } = options;
+  const contractURI =
+    params.contractURI ||
+    (await upload({
+      client,
+      files: [
+        {
+          name: params.name,
+          description: params.description,
+          symbol: params.symbol || "",
+          image: params.image,
+          external_link: params.external_link,
+          social_urls: params.social_urls,
+        },
+      ],
+    })) ||
+    "";
+  let royaltyBps = 0n;
+  if (params.royaltyBps) {
+    const numberVal = Number(params.royaltyBps);
+    if (Number.isNaN(numberVal)) {
+      throw new Error("royaltyBps: Invalid royaltyBps value");
+    }
+    if (numberVal < 0 || numberVal > 100) {
+      throw new Error("royaltyBps: should be between 0 and 100");
+    }
+    // If is a float, make sure it only has 2 digit after the decimal point
+    if (numberVal % 1 !== 0 && !/^\d+(\.\d{1,2})?$/.test(String(numberVal))) {
+      throw new Error("royaltyBps: Maximum 2 decimal places allowed.");
+    }
+    royaltyBps = BigInt(numberVal * 100); // 21.12 -> 2112n
+  }
+  return initialize({
+    contract: implementationContract,
+    name: params.name,
+    symbol: params.symbol || "",
+    defaultAdmin: params.defaultAdmin || accountAddress,
+    royaltyRecipient: params.royaltyRecipient || accountAddress,
+    contractURI,
+    trustedForwarders: params.trustedForwarders || [],
+    royaltyBps,
+  });
+}

package/src/extensions/prebuilts/deploy-split.test.ts

@@ -1,14 +1,14 @@
 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_ACCOUNT_D } from "~test/test-wallets.js";
 import { isAddress } from "../../utils/address.js";
 import { deploySplitContract } from "./deploy-split.js";
 
 describe.runIf(process.env.TW_SECRET_KEY)("deploy-split contract", () => {
   it("should deploy Split contract", async () => {
     const address = await deploySplitContract({
-      account: TEST_ACCOUNT_A,
+      account: TEST_ACCOUNT_D,
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
       params: {

package/src/extensions/prebuilts/deploy-vote.test.ts

@@ -2,17 +2,19 @@ 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 { TEST_ACCOUNT_B } from "~test/test-wallets.js";
 import { isAddress } from "../../utils/address.js";
 import { deployERC20Contract } from "./deploy-erc20.js";
 import { deployVoteContract } from "./deploy-vote.js";
 
+const account = TEST_ACCOUNT_B;
+
 describe.runIf(process.env.TW_SECRET_KEY)("deploy-voteERC20 contract", () => {
   it("should deploy Vote contract", async () => {
     const tokenAddress = await deployERC20Contract({
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
-      account: TEST_ACCOUNT_A,
+      account,
       type: "TokenERC20",
       params: {
         name: "Token",
@@ -20,7 +22,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("deploy-voteERC20 contract", () => {
       },
     });
     const address = await deployVoteContract({
-      account: TEST_ACCOUNT_A,
+      account,
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
       params: {
@@ -45,7 +47,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("deploy-voteERC20 contract", () => {
     const tokenAddress = await deployERC20Contract({
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
-      account: TEST_ACCOUNT_A,
+      account,
       type: "TokenERC20",
       params: {
         name: "Token",
@@ -54,7 +56,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("deploy-voteERC20 contract", () => {
     });
     await expect(() =>
       deployVoteContract({
-        account: TEST_ACCOUNT_A,
+        account,
         client: TEST_CLIENT,
         chain: ANVIL_CHAIN,
         params: {

package/src/extensions/split/read/getAllRecipientsAddresses.test.ts

@@ -2,7 +2,7 @@ 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 { TEST_ACCOUNT_C } from "~test/test-wallets.js";
 import { getContract } from "../../../contract/contract.js";
 import { deploySplitContract } from "../../../extensions/prebuilts/deploy-split.js";
 import { getAllRecipientsAddresses } from "./getAllRecipientsAddresses.js";
@@ -17,7 +17,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("getAllRecipientsAddresses", () => {
       "0xA6f11e47dE28B3dB934e945daeb6F538E9019694",
     ];
     const address = await deploySplitContract({
-      account: TEST_ACCOUNT_A,
+      account: TEST_ACCOUNT_C,
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
       params: {

package/src/extensions/split/read/getAllRecipientsPercentages.test.ts

@@ -2,7 +2,7 @@ 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 { TEST_ACCOUNT_C } from "~test/test-wallets.js";
 import { getContract } from "../../../contract/contract.js";
 import { deploySplitContract } from "../../../extensions/prebuilts/deploy-split.js";
 import { getAllRecipientsPercentages } from "./getAllRecipientsPercentages.js";
@@ -17,7 +17,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("getAllRecipientsPercentages", () => {
       "0xA6f11e47dE28B3dB934e945daeb6F538E9019694",
     ];
     const address = await deploySplitContract({
-      account: TEST_ACCOUNT_A,
+      account: TEST_ACCOUNT_C,
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
       params: {

package/src/extensions/split/read/getRecipientSplitPercentage.test.ts

@@ -2,12 +2,14 @@ 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 { TEST_ACCOUNT_C } from "~test/test-wallets.js";
 import { getContract } from "../../../contract/contract.js";
 import { deploySplitContract } from "../../../extensions/prebuilts/deploy-split.js";
 import { getRecipientSplitPercentage } from "./getRecipientSplitPercentage.js";
+
 const chain = ANVIL_CHAIN;
 const client = TEST_CLIENT;
+const account = TEST_ACCOUNT_C;
 
 describe.runIf(process.env.TW_SECRET_KEY)("getRecipientSplitPercentage", () => {
   it("should work", async () => {
@@ -16,7 +18,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("getRecipientSplitPercentage", () => {
       "0xA6f11e47dE28B3dB934e945daeb6F538E9019694",
     ];
     const address = await deploySplitContract({
-      account: TEST_ACCOUNT_A,
+      account,
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
       params: {

package/src/extensions/vote/read/proposalExists.test.ts

@@ -2,7 +2,7 @@ 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 { TEST_ACCOUNT_C } from "~test/test-wallets.js";
 import { getContract } from "../../../contract/contract.js";
 import { delegate } from "../../../extensions/erc20/__generated__/IVotes/write/delegate.js";
 import { mintTo } from "../../../extensions/erc20/write/mintTo.js";
@@ -13,7 +13,7 @@ import { propose } from "../__generated__/Vote/write/propose.js";
 import { getAll } from "./getAll.js";
 import { proposalExists } from "./proposalExists.js";
 
-const account = TEST_ACCOUNT_A;
+const account = TEST_ACCOUNT_C;
 const client = TEST_CLIENT;
 const chain = ANVIL_CHAIN;
 
@@ -22,7 +22,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("proposal exists", () => {
     const tokenAddress = await deployERC20Contract({
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
-      account: TEST_ACCOUNT_A,
+      account,
       type: "TokenERC20",
       params: {
         name: "Token",
@@ -30,7 +30,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("proposal exists", () => {
       },
     });
     const address = await deployVoteContract({
-      account: TEST_ACCOUNT_A,
+      account,
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
       params: {
@@ -57,7 +57,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("proposal exists", () => {
     const tokenAddress = await deployERC20Contract({
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
-      account: TEST_ACCOUNT_A,
+      account,
       type: "TokenERC20",
       params: {
         name: "Token",
@@ -65,7 +65,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("proposal exists", () => {
       },
     });
     const address = await deployVoteContract({
-      account: TEST_ACCOUNT_A,
+      account,
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
       params: {

package/src/rpc/watchBlockNumber.ts

@@ -1,5 +1,6 @@
 import type { Chain } from "../chains/types.js";
 import type { ThirdwebClient } from "../client/client.js";
+import { sleep } from "../utils/sleep.js";
 import { eth_blockNumber } from "./actions/eth_blockNumber.js";
 import { getRpcClient } from "./rpc.js";
 
@@ -138,14 +139,6 @@ function createBlockNumberPoller(
   };
 }
 
-/**
- * TODO: document
- * @internal
- */
-function sleep(ms: number) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 const existingPollers = new Map<
   number,
   ReturnType<typeof createBlockNumberPoller>

package/src/utils/sleep.ts

@@ -0,0 +1,8 @@
+/**
+ * Delay an async thread
+ * @param ms Sleep time in millisecond
+ * @internal
+ */
+export function sleep(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.59.1";
+export const version = "5.60.0-nightly-6c26012a71d884f99dd5d8c914b3879037b36d56-20240929000339";

package/src/wallets/in-app/web/utils/iFrameCommunication/IframeCommunicator.ts

@@ -1,3 +1,5 @@
+import { sleep } from "../../../../../utils/sleep.js";
+
 type IFrameCommunicatorProps = {
   link: string;
   baseUrl: string;
@@ -6,12 +8,6 @@ type IFrameCommunicatorProps = {
   onIframeInitialize?: () => void;
 };
 
-function sleep(seconds: number) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, seconds * 1000);
-  });
-}
-
 const iframeBaseStyle = {
   height: "100%",
   width: "100%",
@@ -152,12 +148,12 @@ export class IframeCommunicator<T extends { [key: string]: any }> {
     showIframe?: boolean;
   }) {
     while (!isIframeLoaded.get(this.iframe.src)) {
-      await sleep(this.POLLING_INTERVAL_SECONDS);
+      await sleep(this.POLLING_INTERVAL_SECONDS * 1000);
     }
     if (showIframe) {
       this.iframe.style.display = "block";
       // magic number to let the display render before performing the animation of the modal in
-      await sleep(0.005);
+      await sleep(0.005 * 1000);
     }
 
     const channel = new MessageChannel();
@@ -168,7 +164,7 @@ export class IframeCommunicator<T extends { [key: string]: any }> {
         channel.port1.close();
         if (showIframe) {
           // magic number to let modal fade out before hiding it
-          await sleep(0.1);
+          await sleep(0.1 * 1000);
           this.iframe.style.display = "none";
         }
         if (!data.success) {

package/src/wallets/smart/lib/userop.ts

@@ -683,6 +683,7 @@ export async function createAndSignUserOp(options: {
     const tx = options.transactions[0] as PreparedTransaction;
     const serializedTx = await toSerializableTransaction({
       transaction: tx,
+      from: accountAddress,
     });
     executeTx = prepareExecute({
       accountContract,
@@ -694,6 +695,7 @@ export async function createAndSignUserOp(options: {
       options.transactions.map((tx) =>
         toSerializableTransaction({
           transaction: tx,
+          from: accountAddress,
         }),
       ),
     );

package/src/wallets/smart/smart-wallet-integration-v07.test.ts

@@ -20,6 +20,7 @@ import { sendBatchTransaction } from "../../transaction/actions/send-batch-trans
 import { waitForReceipt } from "../../transaction/actions/wait-for-tx-receipt.js";
 import { getAddress } from "../../utils/address.js";
 import { isContractDeployed } from "../../utils/bytecode/is-contract-deployed.js";
+import { sleep } from "../../utils/sleep.js";
 import type { Account, Wallet } from "../interfaces/wallet.js";
 import { generateAccount } from "../utils/generateAccount.js";
 import { ENTRYPOINT_ADDRESS_v0_7 } from "./lib/constants.js";
@@ -235,15 +236,17 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
           }),
           account: newSmartAccount,
         }),
-        sendAndConfirmTransaction({
-          transaction: claimTo({
-            contract,
-            quantity: 1n,
-            to: newSmartAccount.address,
-            tokenId: 0n,
+        sleep(1000).then(() =>
+          sendAndConfirmTransaction({
+            transaction: claimTo({
+              contract,
+              quantity: 1n,
+              to: newSmartAccount.address,
+              tokenId: 0n,
+            }),
+            account: newSmartAccount,
           }),
-          account: newSmartAccount,
-        }),
+        ),
       ]);
       expect(txs.length).toEqual(2);
       expect(txs.every((t) => t.transactionHash.length === 66)).toBe(true);

package/src/wallets/utils/getTokenBalance.test.ts

@@ -2,17 +2,19 @@ import { describe, expect, it } from "vitest";
 import { ANVIL_CHAIN, FORKED_ETHEREUM_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 { TEST_ACCOUNT_D } from "~test/test-wallets.js";
 import { getContract } from "../../contract/contract.js";
 import { mintTo } from "../../extensions/erc20/write/mintTo.js";
 import { deployERC20Contract } from "../../extensions/prebuilts/deploy-erc20.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { getTokenBalance } from "./getTokenBalance.js";
 
+const account = TEST_ACCOUNT_D;
+
 describe.runIf(process.env.TW_SECRET_KEY)("getTokenBalance", () => {
   it("should work for native token", async () => {
     const result = await getTokenBalance({
-      account: TEST_ACCOUNT_A,
+      account,
       client: TEST_CLIENT,
       chain: FORKED_ETHEREUM_CHAIN,
     });
@@ -30,7 +32,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("getTokenBalance", () => {
     const erc20Address = await deployERC20Contract({
       client: TEST_CLIENT,
       chain: ANVIL_CHAIN,
-      account: TEST_ACCOUNT_A,
+      account,
       type: "TokenERC20",
       params: {
         name: "",
@@ -48,18 +50,18 @@ describe.runIf(process.env.TW_SECRET_KEY)("getTokenBalance", () => {
     // Mint some tokens
     const tx = mintTo({
       contract: erc20Contract,
-      to: TEST_ACCOUNT_A.address,
+      to: account.address,
       amount,
     });
 
     await sendAndConfirmTransaction({
       transaction: tx,
-      account: TEST_ACCOUNT_A,
+      account,
     });
 
     const result = await getTokenBalance({
       client: TEST_CLIENT,
-      account: TEST_ACCOUNT_A,
+      account,
       tokenAddress: erc20Address,
       chain: ANVIL_CHAIN,
     });