thirdweb 5.67.0 → 5.67.1-nightly-07af64706797927a9793a5452bd253e493de38f1-20241110000350

package/src/analytics/track/connect.ts

@@ -10,8 +10,9 @@ export async function trackConnect(args: {
   ecosystem?: Ecosystem;
   walletType: string;
   walletAddress: string;
+  chainId?: number;
 }) {
-  const { client, ecosystem, walletType, walletAddress } = args;
+  const { client, ecosystem, walletType, walletAddress, chainId } = args;
   return track({
     client,
     ecosystem,
@@ -20,6 +21,7 @@ export async function trackConnect(args: {
       action: "connect",
       walletType,
       walletAddress,
+      chainId,
     },
   });
 }

package/src/client/client.ts

@@ -73,7 +73,7 @@ export type ThirdwebClient = {
 /**
  * Creates a Thirdweb client using the provided client ID (client-side) or secret key (server-side).
  *
- * Get your client ID and secret key from the Thirdweb dashboard [here](https://thirdweb.com/dashboard/settings/api-keys).
+ * Get your client ID and secret key from the Thirdweb dashboard [here](https://thirdweb.com/create-api-key).
  * **Never share your secret key with anyone.
  *
  * A client is necessary for most functions in the thirdweb SDK. It provides access to thirdweb APIs including built-in RPC, storage, and more.

package/src/contract/deployment/zksync/zkDeployContract.ts

@@ -19,6 +19,7 @@ export async function zkDeployContract(
     bytecode: Hex;
     params?: Record<string, unknown>;
     salt?: string;
+    deploymentType?: "create" | "create2";
   },
 ) {
   if (options.salt !== undefined) {
@@ -29,7 +30,7 @@ export async function zkDeployContract(
   const data = encodeDeployData({
     abi: options.abi,
     bytecode: options.bytecode,
-    deploymentType: "create",
+    deploymentType: options.deploymentType ?? "create",
     args: normalizeFunctionParams(
       options.abi.find((abi) => abi.type === "constructor"),
       options.params,
@@ -56,6 +57,7 @@ export async function zkDeployContract(
   });
 
   const contractAddress = events[0]?.args.contractAddress;
+
   if (!contractAddress) {
     throw new Error("Contract creation failed");
   }

package/src/contract/deployment/zksync/zkDeployCreate2Factory.ts

@@ -30,10 +30,17 @@ export async function zkDeployCreate2Factory(
     return ZKSYNC_SINGLETON_FACTORY;
   }
 
+  if (!PUBLISHED_PRIVATE_KEY) {
+    throw new Error(
+      `Unable to deploy create2 factory on chain ${options.chain.id} - please contact us via https://thirdweb.com/support to enable this chain`,
+    );
+  }
+
   const create2Signer = privateKeyToAccount({
     client: options.client,
     privateKey: PUBLISHED_PRIVATE_KEY,
   });
+
   const valueToSend = toWei("0.01");
   const balance = await getWalletBalance({
     address: create2Signer.address,
@@ -56,9 +63,10 @@ export async function zkDeployCreate2Factory(
   await zkDeployContract({
     client: options.client,
     chain: options.chain,
-    account: options.account,
+    account: create2Signer,
     abi: parseAbi(singletonFactoryAbi),
     bytecode: singletonFactoryBytecode,
+    deploymentType: "create2",
   });
 
   return ZKSYNC_SINGLETON_FACTORY;

package/src/contract/deployment/zksync/zkDeployProxy.ts

@@ -6,9 +6,10 @@ import {
 } from "../../../utils/any-evm/zksync/constants.js";
 import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed.js";
 import { resolvePromisedValue } from "../../../utils/promise/resolve-promised-value.js";
+import { randomBytesHex } from "../../../utils/random.js";
 import type { ClientAndChainAndAccount } from "../../../utils/types.js";
 import type { ThirdwebContract } from "../../contract.js";
-import { zkDeployContract } from "./zkDeployContract.js";
+import { zkDeployContractDeterministic } from "./zkDeployDeterministic.js";
 
 /**
  * @internal
@@ -38,7 +39,7 @@ export async function zkDeployProxy(
     );
   }
   // deploy tw proxy of the implementation
-  const proxyAddress = await zkDeployContract({
+  const proxyAddress = await zkDeployContractDeterministic({
     client: options.client,
     chain: options.chain,
     account: options.account,
@@ -48,7 +49,7 @@ export async function zkDeployProxy(
       _logic: implementationAddress,
       _data: await encode(options.initializeTransaction),
     },
-    salt: options.salt,
+    salt: options.salt || randomBytesHex(32),
   });
 
   // return address of proxy

package/src/exports/transaction.ts

@@ -59,6 +59,7 @@ export {
   type StoredTransaction,
   getTransactionStore,
 } from "../transaction/transaction-store.js";
+export { populateEip712Transaction } from "../transaction/actions/zksync/send-eip712-transaction.js";
 
 //types & utils
 export {

package/src/exports/utils.ts

@@ -147,6 +147,11 @@ export { encodePacked } from "viem";
 // Useful helpers
 export { setThirdwebDomains } from "../utils/domains.js";
 export { resolvePromisedValue } from "../utils/promise/resolve-promised-value.js";
+export {
+  setTransactionDecorator,
+  getTransactionDecorator,
+  clearTransactionDecorator,
+} from "../utils/config.js";
 
 // ------------------------------------------------
 // json

package/src/exports/wallets/smart.ts

@@ -21,6 +21,7 @@ export {
 } from "../../wallets/smart/lib/calls.js";
 
 export { getPaymasterAndData } from "../../wallets/smart/lib/paymaster.js";
+export { getZkPaymasterData } from "../../wallets/smart/lib/bundler.js";
 
 export type {
   SmartWalletConnectionOptions,

package/src/extensions/prebuilts/get-required-transactions.ts

@@ -51,39 +51,43 @@ export async function getRequiredTransactions(
       | DeployTransactionResult[]
       | null
     )[] = await Promise.all([
-      getDeployedCreate2Factory({
-        chain,
-        client,
-      }).then((c) =>
-        c || isZkSync
-          ? null
-          : ({ type: "infra", contractId: "Create2Factory" } as const),
-      ),
-      getDeployedInfraContract({
-        chain,
-        client,
-        contractId: "Forwarder",
-      }).then((c) =>
-        c || isZkSync
-          ? null
-          : ({ type: "infra", contractId: "Forwarder" } as const),
-      ),
-      getDeployedInfraContract({
-        chain,
-        client,
-        contractId: "TWCloneFactory",
-        constructorParams: {
-          _trustedForwarder: await computePublishedContractAddress({
+      isZkSync
+        ? null
+        : getDeployedCreate2Factory({
+            chain,
+            client,
+          }).then((c) =>
+            c
+              ? null
+              : ({ type: "infra", contractId: "Create2Factory" } as const),
+          ),
+      isZkSync
+        ? null
+        : getDeployedInfraContract({
             chain,
             client,
             contractId: "Forwarder",
-          }),
-        },
-      }).then((c) =>
-        c || isZkSync
-          ? null
-          : ({ type: "infra", contractId: "TWCloneFactory" } as const),
-      ),
+          }).then((c) =>
+            c ? null : ({ type: "infra", contractId: "Forwarder" } as const),
+          ),
+      isZkSync
+        ? null
+        : getDeployedInfraContract({
+            chain,
+            client,
+            contractId: "TWCloneFactory",
+            constructorParams: {
+              _trustedForwarder: await computePublishedContractAddress({
+                chain,
+                client,
+                contractId: "Forwarder",
+              }),
+            },
+          }).then((c) =>
+            c
+              ? null
+              : ({ type: "infra", contractId: "TWCloneFactory" } as const),
+          ),
       // TODO (deploy): add WETH contract check for implementations that need it (check implementation constructor params)
       getTransactionsForImplementation({
         chain,

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

@@ -363,7 +363,7 @@ function DetailsModal(props: {
           {chainNameQuery.name || `Unknown chain #${walletChain?.id}`}
           <Text color="secondaryText" size="xs">
             {balanceQuery.data ? (
-              formatNumber(Number(balanceQuery.data.displayValue), 5)
+              formatNumber(Number(balanceQuery.data.displayValue), 9)
             ) : (
               <Skeleton height="1em" width="100px" />
             )}{" "}

package/src/react/web/ui/ConnectWallet/screens/Buy/TransactionModeScreen.tsx

@@ -125,7 +125,7 @@ export function TransactionModeScreen(props: {
               {balanceQuery.data ? (
                 <Container flex="row" gap="3xs" center="y">
                   <Text size="xs" color="secondaryText" weight={500}>
-                    {formatTokenBalance(balanceQuery.data, false, 3)}
+                    {formatTokenBalance(balanceQuery.data, false)}
                   </Text>
                   <TokenSymbol
                     token={transactionCostAndData.token}

package/src/react/web/ui/ConnectWallet/screens/Buy/WalletSelectorButton.tsx

@@ -115,7 +115,7 @@ function TokenBalanceRow(props: {
       <div style={{ flex: 1 }} />
       <Container flex="row" center="y" gap="3xs">
         <Text size="xs" color="secondaryText">
-          {formatTokenBalance(tokenBalance.balance, true, 3)}
+          {formatTokenBalance(tokenBalance.balance, true)}
         </Text>
       </Container>
     </StyledButton>

package/src/react/web/ui/ConnectWallet/screens/Buy/swap/ConfirmationScreen.tsx

@@ -279,7 +279,7 @@ export function SwapConfirmationScreen(props: {
                   fromAmount: props.quote.swapDetails.fromAmountWei,
                   toToken: props.quote.swapDetails.toToken.tokenAddress,
                   toAmount: props.quote.swapDetails.toAmountWei,
-                  chainId: props.quote.swapDetails.toToken.chainId,
+                  chainId: props.quote.swapDetails.fromToken.chainId,
                   dstChainId: props.quote.swapDetails.toToken.chainId,
                 });
 

package/src/react/web/ui/ConnectWallet/screens/Buy/swap/PayWithCrypto.tsx

@@ -74,7 +74,7 @@ export function PayWithCryptoQuoteInfo(props: {
         {balanceQuery.data ? (
           <Container flex="row" gap="3xs" center="y">
             <Text size="xs" color="secondaryText" weight={500}>
-              {formatTokenBalance(balanceQuery.data, false, 3)}
+              {formatTokenBalance(balanceQuery.data, false)}
             </Text>
             <TokenSymbol
               token={props.token}

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

@@ -42,6 +42,7 @@ export function TransactionModal(props: ModalProps) {
         client: props.client,
         walletAddress: account.address,
         walletType: wallet.id,
+        dstChainId: props.tx.chain.id,
         event: "open_pay_transaction_modal",
       });
     },

package/src/transaction/actions/estimate-gas-cost.test.ts

@@ -22,11 +22,11 @@ describe.runIf(process.env.TW_SECRET_KEY)("estimateGasCost", () => {
         transaction: tx,
       });
       expect(result).toMatchInlineSnapshot(`
-          {
-            "ether": "0.001196638702568277",
-            "wei": 1196638702568277n,
-          }
-        `);
+        {
+          "ether": "0.002468675264234022",
+          "wei": 2468675264234022n,
+        }
+      `);
     });
 
     it("should estimateGasCost native token", async () => {
@@ -41,8 +41,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("estimateGasCost", () => {
       });
       expect(result).toMatchInlineSnapshot(`
         {
-          "ether": "0.00052179661420146",
-          "wei": 521796614201460n,
+          "ether": "0.00107647061028156",
+          "wei": 1076470610281560n,
         }
       `);
     });
@@ -61,8 +61,8 @@ describe.runIf(process.env.TW_SECRET_KEY)("estimateGasCost", () => {
       });
       expect(result).toMatchInlineSnapshot(`
         {
-          "ether": "0.000021198198952138",
-          "wei": 21198198952138n,
+          "ether": "0.000023420415571618",
+          "wei": 23420415571618n,
         }
       `);
     });

package/src/transaction/actions/estimate-gas-cost.ts

@@ -1,5 +1,5 @@
 import { isOpStackChain } from "../../chains/constants.js";
-import { getGasPrice } from "../../gas/get-gas-price.js";
+import { getDefaultGasOverrides } from "../../gas/fee-data.js";
 import { resolvePromisedValue } from "../../utils/promise/resolve-promised-value.js";
 import { toEther } from "../../utils/units.js";
 import { type EstimateGasOptions, estimateGas } from "./estimate-gas.js";
@@ -33,10 +33,16 @@ export async function estimateGasCost(
   const gasLimit =
     (await resolvePromisedValue(transaction.gas)) ||
     (await estimateGas({ transaction, from }));
-  const gasPrice = await getGasPrice({
-    client: transaction.client,
-    chain: transaction.chain,
-  });
+  const fees = await getDefaultGasOverrides(
+    transaction.client,
+    transaction.chain,
+  );
+  const gasPrice = fees.maxFeePerGas || fees.gasPrice;
+  if (!gasPrice) {
+    throw new Error(
+      `Unable to determine gas price for chain ${transaction.chain.id}`,
+    );
+  }
   let l1Fee: bigint;
   if (isOpStackChain(transaction.chain)) {
     const { estimateL1Fee } = await import("../../gas/estimate-l1-fee.js");

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

@@ -1,3 +1,4 @@
+import { getTransactionDecorator } from "../../utils/config.js";
 import type { Account } from "../../wallets/interfaces/wallet.js";
 import type { PreparedTransaction } from "../prepare-transaction.js";
 import { addTransactionToStore } from "../transaction-store.js";
@@ -138,14 +139,22 @@ export interface SendTransactionOptions {
 export async function sendTransaction(
   options: SendTransactionOptions,
 ): Promise<WaitForReceiptOptions> {
-  const { account, transaction, gasless } = options;
+  let { account, transaction, gasless } = options;
+
+  const decorator = getTransactionDecorator();
+  if (decorator) {
+    const { account: decoratedAccount, transaction: decoratedTransaction } =
+      await decorator({ account, transaction });
+    account = decoratedAccount;
+    transaction = decoratedTransaction;
+  }
 
   if (account.onTransactionRequested) {
     await account.onTransactionRequested(transaction);
   }
 
   // if zksync transaction params are set, send with eip712
-  if (options.transaction.eip712) {
+  if (transaction.eip712) {
     const { sendEip712Transaction } = await import(
       "./zksync/send-eip712-transaction.js"
     );

package/src/utils/any-evm/zksync/isZkSyncChain.ts

@@ -18,7 +18,8 @@ export async function isZkSyncChain(chain: Chain) {
     chain.id === 37111 ||
     chain.id === 978658 ||
     chain.id === 531050104 ||
-    chain.id === 4457845
+    chain.id === 4457845 ||
+    chain.id === 2741
   ) {
     return true;
   }

package/src/utils/config.ts

@@ -0,0 +1,26 @@
+import type { PreparedTransaction } from "../transaction/prepare-transaction.js";
+import type { Account } from "../wallets/interfaces/wallet.js";
+
+let transactionDecorator:
+  | ((args: {
+      account: Account;
+      transaction: PreparedTransaction;
+    }) => Promise<{ account: Account; transaction: PreparedTransaction }>)
+  | null = null;
+
+export function setTransactionDecorator(
+  decoratorFunction: (args: {
+    account: Account;
+    transaction: PreparedTransaction;
+  }) => Promise<{ account: Account; transaction: PreparedTransaction }>,
+) {
+  transactionDecorator = decoratorFunction;
+}
+
+export function clearTransactionDecorator() {
+  transactionDecorator = null;
+}
+
+export function getTransactionDecorator() {
+  return transactionDecorator;
+}

package/src/utils/fetch.ts

@@ -45,9 +45,14 @@ export function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem) {
           : undefined;
       const clientId = client.clientId;
 
-      // if we have an auth token set, use that (thirdweb.com/dashboard sets this for the user)
+      // if we have an auth token set, use that (thirdweb dashboard sets this for the user)
       // pay urls should never send the auth token, because we always want the "developer" to be the one making the request, not the "end user"
-      if (authToken && !isPayUrl(url) && !isInAppWalletUrl(url)) {
+      if (
+        authToken &&
+        !isPayUrl(url) &&
+        !isInAppWalletUrl(url) &&
+        !isBundlerUrl(url)
+      ) {
         headers.set("authorization", `Bearer ${authToken}`);
       } else if (secretKey) {
         headers.set("x-secret-key", secretKey);
@@ -153,6 +158,18 @@ function isInAppWalletUrl(url: string): boolean {
   }
 }
 
+function isBundlerUrl(url: string): boolean {
+  try {
+    const { hostname } = new URL(url);
+    return (
+      hostname.endsWith(".bundler.thirdweb.com") ||
+      hostname.endsWith(".bundler.thirdweb-dev.com")
+    );
+  } catch {
+    return false;
+  }
+}
+
 const SDK_NAME = "unified-sdk";
 
 let previousPlatform: [string, string][] | undefined;

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.67.0";
+export const version = "5.67.1-nightly-07af64706797927a9793a5452bd253e493de38f1-20241110000350";

package/src/wallets/coinbase/coinbase-wallet.ts

@@ -81,6 +81,7 @@ export function coinbaseWalletSDK(args: {
         client: options.client,
         walletType: COINBASE,
         walletAddress: account.address,
+        chainId: chain.id,
       });
       // return account
       return account;
@@ -100,6 +101,7 @@ export function coinbaseWalletSDK(args: {
         client: options.client,
         walletType: COINBASE,
         walletAddress: account.address,
+        chainId: chain.id,
       });
       // return account
       return account;

package/src/wallets/create-wallet.ts

@@ -250,6 +250,7 @@ export function createWallet<const ID extends WalletId>(
               client: options.client,
               walletType: id,
               walletAddress: account.address,
+              chainId: chain.id,
             });
             // return account
             return account;
@@ -281,6 +282,7 @@ export function createWallet<const ID extends WalletId>(
               client: options.client,
               walletType: id,
               walletAddress: account.address,
+              chainId: chain.id,
             });
             // return account
             return account;
@@ -314,6 +316,7 @@ export function createWallet<const ID extends WalletId>(
               client: wcOptions.client,
               walletType: id,
               walletAddress: account.address,
+              chainId: chain.id,
             });
             return account;
           }
@@ -359,6 +362,7 @@ export function createWallet<const ID extends WalletId>(
               client: options.client,
               walletType: id,
               walletAddress: account.address,
+              chainId: chain.id,
             });
             // return account
             return account;

package/src/wallets/in-app/core/wallet/in-app-core.ts

@@ -106,6 +106,7 @@ export function createInAppWallet(args: {
         ecosystem,
         walletType: walletId,
         walletAddress: account.address,
+        chainId: chain.id,
       });
       // return only the account
       return account;
@@ -153,6 +154,7 @@ export function createInAppWallet(args: {
         ecosystem,
         walletType: walletId,
         walletAddress: account.address,
+        chainId: chain.id,
       });
       // return only the account
       return account;

package/src/wallets/in-app/web/types.ts

@@ -9,7 +9,7 @@ import type { InAppWalletIframeCommunicator } from "./utils/iFrameCommunication/
 // Open to PRs from whoever sees this and knows of a cleaner way to handle things
 type ClientIdConstructorType = {
   /**
-   * the clientId found on the dashboard settings {@link https://thirdweb.com/dashboard/settings}
+   * the clientId of your API Key. You can create an API key by creating a project on thirdweb dashboard.
    */
   client: ThirdwebClient;
 };

package/src/wallets/interfaces/wallet.ts

@@ -7,7 +7,10 @@ import type {
   TypedDataDefinition,
 } from "viem";
 import type { Chain } from "../../chains/types.js";
-import type { PreparedTransaction } from "../../transaction/prepare-transaction.js";
+import type {
+  EIP712TransactionOptions,
+  PreparedTransaction,
+} from "../../transaction/prepare-transaction.js";
 import type { SendTransactionResult } from "../../transaction/types.js";
 import type { WalletEmitter } from "../wallet-emitter.js";
 import type {
@@ -19,6 +22,7 @@ import type {
 
 export type SendTransactionOption = TransactionSerializable & {
   chainId: number;
+  eip712?: EIP712TransactionOptions;
 };
 
 type SendRawTransactionOptions = {

package/src/wallets/native/create-wallet.ts

@@ -169,6 +169,7 @@ export function createWallet<const ID extends WalletId>(
               client: options.client,
               walletType: id,
               walletAddress: account.address,
+              chainId: chain.id,
             });
             // return account
             return account;
@@ -202,6 +203,7 @@ export function createWallet<const ID extends WalletId>(
               client: wcOptions.client,
               walletType: id,
               walletAddress: account.address,
+              chainId: chain.id,
             });
             return account;
           }

package/src/wallets/smart/index.ts

@@ -501,6 +501,7 @@ function createZkSyncAccount(args: {
         value: transaction.value ?? 0n,
         chain: getCachedChain(transaction.chainId),
         client: connectionOptions.client,
+        eip712: transaction.eip712,
       };
 
       let serializableTransaction = await populateEip712Transaction({
@@ -508,7 +509,7 @@ function createZkSyncAccount(args: {
         transaction: prepTx,
       });
 
-      if (args.sponsorGas) {
+      if (args.sponsorGas && !serializableTransaction.paymaster) {
         // get paymaster input
         const pmData = await getZkPaymasterData({
           options: {

package/src/wallets/smart/smart-wallet-dev.test.ts

@@ -1,9 +1,10 @@
 import { beforeAll, describe, expect, it } from "vitest";
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
-import { zkSyncSepolia } from "../../chains/chain-definitions/zksync-sepolia.js";
+import { defineChain } from "../../chains/utils.js";
 import { type ThirdwebContract, getContract } from "../../contract/contract.js";
 import { balanceOf } from "../../extensions/erc1155/__generated__/IERC1155/read/balanceOf.js";
 import { claimTo } from "../../extensions/erc1155/drops/write/claimTo.js";
+import { deployPublishedContract } from "../../extensions/prebuilts/deploy-published.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { sendTransaction } from "../../transaction/actions/send-transaction.js";
 import { prepareTransaction } from "../../transaction/prepare-transaction.js";
@@ -20,7 +21,7 @@ let smartWalletAddress: Address;
 let personalAccount: Account;
 let accountContract: ThirdwebContract;
 
-const chain = zkSyncSepolia;
+const chain = defineChain(531050104);
 const client = TEST_CLIENT;
 const contract = getContract({
   client,
@@ -69,7 +70,7 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
       expect(isDeployed).toEqual(true);
     });
 
-    it("should send a transaction", async () => {
+    it.skip("should send a transaction", async () => {
       const tx = prepareTransaction({
         client,
         chain,
@@ -106,5 +107,29 @@ describe.runIf(process.env.TW_SECRET_KEY).skip.sequential(
       });
       expect(balance).toEqual(1n);
     });
+
+    it("should deploy a published autofactory contract", async () => {
+      const address = await deployPublishedContract({
+        client: TEST_CLIENT,
+        chain,
+        account: smartAccount,
+        contractId: "DropERC721",
+        contractParams: {
+          defaultAdmin: smartAccount.address, // defaultAdmin
+          name: "test", // name
+          symbol: "test", // symbol
+          contractURI: "", // contractURI
+          trustedForwarders: [], // trustedForwarders
+          saleRecipient: smartAccount.address, // saleRecipient
+          royaltyRecipient: smartAccount.address, // royaltyRecipient
+          royaltyBps: 0n, // royaltyBps
+          platformFeeBps: 0n, // platformFeeBps
+          platformFeeRecipient: smartAccount.address, // platformFeeRecipient
+        },
+      });
+      console.log("deployed address", address);
+      expect(address).toBeDefined();
+      expect(address.length).toBe(42);
+    });
   },
 );