thirdweb 5.60.0 → 5.60.1-nightly-985c4b08048c3676dc9be0c2069fefc73a742a3a-20241003000322

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

@@ -13,7 +13,10 @@ import { resolveMethod } from "../../transaction/resolve-method.js";
 import { encodeAbiParameters } from "../../utils/abi/encodeAbiParameters.js";
 import { normalizeFunctionParams } from "../../utils/abi/normalizeFunctionParams.js";
 import { getAddress } from "../../utils/address.js";
-import type { CompilerMetadata } from "../../utils/any-evm/deploy-metadata.js";
+import {
+  type CompilerMetadata,
+  fetchBytecodeFromCompilerMetadata,
+} from "../../utils/any-evm/deploy-metadata.js";
 import type { FetchDeployMetadataResult } from "../../utils/any-evm/deploy-metadata.js";
 import { isZkSyncChain } from "../../utils/any-evm/zksync/isZkSyncChain.js";
 import type { Hex } from "../../utils/encoding/hex.js";
@@ -33,7 +36,6 @@ export type DeployPublishedContractOptions = {
   version?: string;
   implementationConstructorParams?: Record<string, unknown>;
   salt?: string;
-  compilerType?: "solc" | "zksolc";
 };
 
 /**
@@ -93,14 +95,12 @@ export async function deployPublishedContract(
     version,
     implementationConstructorParams,
     salt,
-    compilerType,
   } = options;
   const deployMetadata = await fetchPublishedContractMetadata({
     client,
     contractId,
     publisher,
     version,
-    compilerType,
   });
 
   return deployContractfromDeployMetadata({
@@ -111,7 +111,6 @@ export async function deployPublishedContract(
     initializeParams: contractParams,
     implementationConstructorParams,
     salt,
-    compilerType,
   });
 }
 
@@ -130,7 +129,6 @@ export type DeployContractfromDeployMetadataOptions = {
     initializeParams?: Record<string, unknown>;
   }[];
   salt?: string;
-  compilerType?: "solc" | "zksolc";
 };
 
 /**
@@ -148,7 +146,6 @@ export async function deployContractfromDeployMetadata(
     implementationConstructorParams,
     modules,
     salt,
-    compilerType,
   } = options;
   switch (deployMetadata?.deployType) {
     case "standard": {
@@ -182,7 +179,6 @@ export async function deployContractfromDeployMetadata(
               client,
             })),
           publisher: deployMetadata.publisher,
-          compilerType,
         });
 
       const initializeTransaction = await getInitializeTransaction({
@@ -267,12 +263,16 @@ async function directDeploy(options: {
   const { account, client, chain, compilerMetadata, contractParams, salt } =
     options;
 
-  if (isZkSyncChain(chain)) {
+  if (await isZkSyncChain(chain)) {
     return zkDeployContract({
       account,
       client,
       chain,
-      bytecode: compilerMetadata.bytecode,
+      bytecode: await fetchBytecodeFromCompilerMetadata({
+        compilerMetadata,
+        client,
+        chain,
+      }),
       abi: compilerMetadata.abi,
       params: contractParams,
       salt,
@@ -286,7 +286,11 @@ async function directDeploy(options: {
     account,
     client,
     chain,
-    bytecode: compilerMetadata.bytecode,
+    bytecode: await fetchBytecodeFromCompilerMetadata({
+      compilerMetadata,
+      client,
+      chain,
+    }),
     abi: compilerMetadata.abi,
     constructorParams: contractParams,
     salt,

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

@@ -43,6 +43,8 @@ export async function getRequiredTransactions(
     modules = [],
   } = options;
 
+  const isZkSync = await isZkSyncChain(chain);
+
   if (deployMetadata?.deployType === "autoFactory") {
     const results: (
       | DeployTransactionResult
@@ -53,7 +55,7 @@ export async function getRequiredTransactions(
         chain,
         client,
       }).then((c) =>
-        c || isZkSyncChain(chain)
+        c || isZkSync
           ? null
           : ({ type: "infra", contractId: "Create2Factory" } as const),
       ),
@@ -62,7 +64,7 @@ export async function getRequiredTransactions(
         client,
         contractId: "Forwarder",
       }).then((c) =>
-        c || isZkSyncChain(chain)
+        c || isZkSync
           ? null
           : ({ type: "infra", contractId: "Forwarder" } as const),
       ),
@@ -78,7 +80,7 @@ export async function getRequiredTransactions(
           }),
         },
       }).then((c) =>
-        c || isZkSyncChain(chain)
+        c || isZkSync
           ? null
           : ({ type: "infra", contractId: "TWCloneFactory" } as const),
       ),

package/src/extensions/thirdweb/write/publish.test.ts

@@ -85,7 +85,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("publishContract", () => {
       uri: logs?.[0]?.args.publishedContract.publishMetadataUri ?? "",
     });
     expect(publishedData.abi).toBeDefined();
-    expect(publishedData.bytecode).toBeDefined();
     expect(publishedData.version).toBe("0.0.1");
     expect(publishedData.changelog).toBe("Initial release");
     expect(publishedData.name).toBe("CatAttackNFT");

package/src/utils/any-evm/compute-published-contract-deploy-info.ts

@@ -7,7 +7,10 @@ import { encodeAbiParameters } from "../abi/encodeAbiParameters.js";
 import { normalizeFunctionParams } from "../abi/normalizeFunctionParams.js";
 import { ensureBytecodePrefix } from "../bytecode/prefix.js";
 import type { Hex } from "../encoding/hex.js";
-import type { FetchDeployMetadataResult } from "./deploy-metadata.js";
+import {
+  type FetchDeployMetadataResult,
+  fetchBytecodeFromCompilerMetadata,
+} from "./deploy-metadata.js";
 import { getInitBytecodeWithSalt } from "./get-init-bytecode-with-salt.js";
 
 /**
@@ -52,7 +55,11 @@ export async function computeDeploymentInfoFromMetadata(args: {
     client: args.client,
     chain: args.chain,
     abi: args.contractMetadata.abi,
-    bytecode: args.contractMetadata.bytecode,
+    bytecode: await fetchBytecodeFromCompilerMetadata({
+      compilerMetadata: args.contractMetadata,
+      client: args.client,
+      chain: args.chain,
+    }),
     constructorParams: args.constructorParams,
     salt: args.salt,
   });

package/src/utils/any-evm/deploy-metadata.ts

@@ -1,14 +1,16 @@
 import type { Abi } from "abitype";
+import type { Chain } from "../../chains/types.js";
 import type { ThirdwebClient } from "../../client/client.js";
 import { formatCompilerMetadata } from "../../contract/actions/compiler-metadata.js";
 import { download } from "../../storage/download.js";
 import type { Hex } from "../encoding/hex.js";
+import { withCache } from "../promise/withCache.js";
 import type { Prettify } from "../type-utils.js";
+import { isZkSyncChain } from "./zksync/isZkSyncChain.js";
 
 type FetchDeployMetadataOptions = {
   uri: string;
   client: ThirdwebClient;
-  compilerType?: "solc" | "zksolc";
 };
 
 export type FetchDeployMetadataResult = Partial<ExtendedMetadata> &
@@ -23,41 +25,21 @@ export type FetchDeployMetadataResult = Partial<ExtendedMetadata> &
 export async function fetchDeployMetadata(
   options: FetchDeployMetadataOptions,
 ): Promise<FetchDeployMetadataResult> {
-  const isZksolc = options.compilerType === "zksolc";
   const rawMeta: RawCompilerMetadata = await download({
     uri: options.uri,
     client: options.client,
   }).then((r) => r.json());
 
-  if (
-    isZksolc &&
-    (!rawMeta.compilers?.zksolc || rawMeta.compilers?.zksolc.length === 0)
-  ) {
-    throw new Error(`No zksolc metadata found for contract: ${rawMeta.name}`);
-  }
-
-  const metadataUri = isZksolc
-    ? rawMeta.compilers.zksolc[0].metadataUri
-    : rawMeta.metadataUri;
-  const bytecodeUri = isZksolc
-    ? rawMeta.compilers.zksolc[0].bytecodeUri
-    : rawMeta.bytecodeUri;
-  const [deployBytecode, parsedMeta] = await Promise.all([
-    download({ uri: bytecodeUri, client: options.client }).then(
-      (res) => res.text() as Promise<Hex>,
-    ),
-    fetchAndParseCompilerMetadata({
-      client: options.client,
-      uri: metadataUri,
-      compilerType: options.compilerType,
-    }),
-  ]);
+  const metadataUri = rawMeta.metadataUri;
+  const parsedMeta = await fetchAndParseCompilerMetadata({
+    client: options.client,
+    uri: metadataUri,
+  });
 
   return {
     ...rawMeta,
     ...parsedMeta,
     version: rawMeta.version,
-    bytecode: deployBytecode,
     name: rawMeta.name,
   };
 }
@@ -84,10 +66,42 @@ async function fetchAndParseCompilerMetadata(
   }
   return {
     ...metadata,
-    ...formatCompilerMetadata(metadata, options.compilerType),
+    ...formatCompilerMetadata(metadata),
   };
 }
 
+export async function fetchBytecodeFromCompilerMetadata(options: {
+  compilerMetadata: FetchDeployMetadataResult;
+  client: ThirdwebClient;
+  chain: Chain;
+}) {
+  const { compilerMetadata, client, chain } = options;
+  return withCache(
+    async () => {
+      const isZksolc = await isZkSyncChain(chain);
+      const bytecodeUri = isZksolc
+        ? compilerMetadata.compilers?.zksolc[0]?.bytecodeUri
+        : compilerMetadata.bytecodeUri;
+
+      if (!bytecodeUri) {
+        throw new Error(
+          `No bytecode URI found in compiler metadata for ${compilerMetadata.name} on chain ${chain.name}`,
+        );
+      }
+      const deployBytecode = await download({
+        uri: bytecodeUri,
+        client,
+      }).then((res) => res.text() as Promise<Hex>);
+
+      return deployBytecode;
+    },
+    {
+      cacheKey: `bytecode:${compilerMetadata.name}:${chain.id}`,
+      cacheTime: 24 * 60 * 60 * 1000,
+    },
+  );
+}
+
 // types
 
 type RawCompilerMetadata = {
@@ -96,8 +110,8 @@ type RawCompilerMetadata = {
   bytecodeUri: string;
   // biome-ignore lint/suspicious/noExplicitAny: TODO: fix later
   analytics?: any;
-  // biome-ignore lint/suspicious/noExplicitAny: TODO: fix later
-  [key: string]: any;
+  version?: string;
+  [key: string]: unknown;
 };
 
 type ParsedCompilerMetadata = {
@@ -146,10 +160,7 @@ type ParsedCompilerMetadata = {
 };
 
 export type CompilerMetadata = Prettify<
-  RawCompilerMetadata &
-    ParsedCompilerMetadata & {
-      bytecode: Hex;
-    }
+  RawCompilerMetadata & ParsedCompilerMetadata
 >;
 
 export type ExtendedMetadata = {

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

@@ -1,12 +1,47 @@
 import type { Chain } from "../../../chains/types.js";
+import { withCache } from "../../promise/withCache.js";
 
-export function isZkSyncChain(chain: Chain) {
-  return (
+export async function isZkSyncChain(chain: Chain) {
+  if (chain.id === 1337 || chain.id === 31337) {
+    return false;
+  }
+
+  // check known zksync chain-ids first
+  if (
     chain.id === 324 ||
     chain.id === 300 ||
     chain.id === 302 ||
     chain.id === 11124 ||
     chain.id === 282 || // cronos zkevm testnet
     chain.id === 388 // cronos zkevm mainnet
+  ) {
+    return true;
+  }
+
+  // fallback to checking the stack on rpc
+  try {
+    const stack = await getChainStack(chain.id);
+    return stack === "zksync-stack";
+  } catch {
+    // If the network check fails, assume it's not a ZkSync chain
+    return false;
+  }
+}
+
+async function getChainStack(chainId: number): Promise<string> {
+  return withCache(
+    async () => {
+      const res = await fetch(`https://${chainId}.rpc.thirdweb.com/stack`);
+
+      if (!res.ok) {
+        res.body?.cancel();
+        throw new Error(`Error fetching stack for ${chainId}`);
+      }
+
+      const data = await res.json();
+
+      return data.stack;
+    },
+    { cacheKey: `stack:${chainId}`, cacheTime: 24 * 60 * 60 * 1000 },
   );
 }

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.60.0";
+export const version = "5.60.1-nightly-985c4b08048c3676dc9be0c2069fefc73a742a3a-20241003000322";

package/src/wallets/coinbase/coinbaseWebSDK.ts

@@ -3,6 +3,7 @@ import type { Address } from "abitype";
 import {
   type SignTypedDataParameters,
   getTypesForEIP712Domain,
+  isHex,
   serializeTypedData,
   validateTypedData,
 } from "viem";
@@ -314,10 +315,14 @@ function createAccount(provider: ProviderInterface, _address: string) {
         return message.raw;
       })();
 
-      return await provider.request({
+      const res = await provider.request({
         method: "personal_sign",
         params: [messageToSign, account.address],
       });
+      if (!isHex(res)) {
+        throw new Error("Invalid signature returned");
+      }
+      return res;
     },
     async signTypedData(_typedData) {
       if (!account.address) {
@@ -343,10 +348,14 @@ function createAccount(provider: ProviderInterface, _address: string) {
         types,
       });
 
-      return await provider.request({
+      const res = await provider.request({
         method: "eth_signTypedData_v4",
         params: [account.address, stringifiedData],
       });
+      if (!isHex(res)) {
+        throw new Error("Invalid signed payload returned");
+      }
+      return res;
     },
     onTransactionRequested: async () => {
       // make sure to show the coinbase popup BEFORE doing any transaction preprocessing

package/src/wallets/in-app/native/ecosystem.ts

@@ -76,6 +76,7 @@ export function ecosystemWallet(
         ...createOptions?.auth,
         options: [], // controlled by ecosystem
       },
+      partnerId: createOptions?.partnerId,
     },
     connectorFactory: async (client: ThirdwebClient) => {
       const { InAppNativeConnector } = await import("./native-connector.js");

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

@@ -76,6 +76,7 @@ export function ecosystemWallet(
         ...createOptions?.auth,
         options: [], // controlled by ecosystem
       },
+      partnerId: ecosystem.partnerId,
     },
     connectorFactory: async (client: ThirdwebClient) => {
       const { InAppWebConnector } = await import("./lib/web-connector.js");

package/src/wallets/smart/index.ts

@@ -104,7 +104,7 @@ export async function connectSmartWallet(
   const sponsorGas =
     "gasless" in options ? options.gasless : options.sponsorGas;
 
-  if (isZkSyncChain(chain)) {
+  if (await isZkSyncChain(chain)) {
     return [
       createZkSyncAccount({
         creationOptions,

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

@@ -21,7 +21,6 @@ import {
   ENTRYPOINT_ADDRESS_v0_6,
   MANAGED_ACCOUNT_GAS_BUFFER,
   getDefaultBundlerUrl,
-  getEntryPointVersion,
 } from "./constants.js";
 import { hexlifyUserOp } from "./utils.js";
 
@@ -269,12 +268,7 @@ async function sendBundlerRequest(args: {
     console.debug(`>>> sending ${operation} with payload:`, params);
   }
 
-  const entryPointVersion = getEntryPointVersion(
-    options.entrypointAddress || ENTRYPOINT_ADDRESS_v0_6,
-  );
-  const bundlerVersion = entryPointVersion === "v0.6" ? "v1" : "v2";
-  const bundlerUrl =
-    options.bundlerUrl ?? getDefaultBundlerUrl(options.chain, bundlerVersion);
+  const bundlerUrl = options.bundlerUrl ?? getDefaultBundlerUrl(options.chain);
   const fetchWithHeaders = getClientFetch(options.client);
   const response = await fetchWithHeaders(bundlerUrl, {
     method: "POST",

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

@@ -36,12 +36,12 @@ export const getDefaultAccountFactory = (entryPointAddress?: string) => {
 /**
  * @internal
  */
-export const getDefaultBundlerUrl = (chain: Chain, version: "v1" | "v2") => {
+export const getDefaultBundlerUrl = (chain: Chain) => {
   const domain = getThirdwebDomains().bundler;
   if (domain.startsWith("localhost:")) {
-    return `http://${domain}/${version ?? "v1"}?chain=${chain.id}`;
+    return `http://${domain}/v2?chain=${chain.id}`;
   }
-  return `https://${chain.id}.${domain}/${version ?? "v1"}`;
+  return `https://${chain.id}.${domain}/v2`;
 };
 
 export const getEntryPointVersion = (address: string): "v0.6" | "v0.7" => {

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

@@ -11,7 +11,6 @@ import {
   DEBUG,
   ENTRYPOINT_ADDRESS_v0_6,
   getDefaultBundlerUrl,
-  getEntryPointVersion,
 } from "./constants.js";
 import { hexlifyUserOp } from "./utils.js";
 
@@ -53,9 +52,7 @@ export async function getPaymasterAndData(args: {
   };
 
   const entrypoint = entrypointAddress ?? ENTRYPOINT_ADDRESS_v0_6;
-  const entrypointVersion = getEntryPointVersion(entrypoint);
-  const paymasterVersion = entrypointVersion === "v0.6" ? "v1" : "v2";
-  const paymasterUrl = getDefaultBundlerUrl(chain, paymasterVersion);
+  const paymasterUrl = getDefaultBundlerUrl(chain);
 
   // Ask the paymaster to sign the transaction and return a valid paymasterAndData value.
   const fetchWithHeaders = getClientFetch(client);

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

@@ -218,12 +218,7 @@ async function getGasFees(args: {
   const { executeTx, bundlerOptions, chain, client } = args;
   let { maxFeePerGas, maxPriorityFeePerGas } = executeTx;
 
-  const entrypointVersion = getEntryPointVersion(
-    bundlerOptions.entrypointAddress || ENTRYPOINT_ADDRESS_v0_6,
-  );
-  const bundlerVersion = entrypointVersion === "v0.6" ? "v1" : "v2";
-  const bundlerUrl =
-    bundlerOptions?.bundlerUrl ?? getDefaultBundlerUrl(chain, bundlerVersion);
+  const bundlerUrl = bundlerOptions?.bundlerUrl ?? getDefaultBundlerUrl(chain);
 
   if (isThirdwebUrl(bundlerUrl)) {
     // get gas prices from bundler

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

@@ -27,7 +27,8 @@ const contract = getContract({
   client,
 });
 
-describe.runIf(process.env.TW_SECRET_KEY).skip(
+// TODO run this on every CI run, needs proper zk fork setup
+describe.runIf(process.env.TW_SECRET_KEY).todo(
   "SmartWallet zksync tests",
   {
     retry: 0,
@@ -112,5 +113,28 @@ describe.runIf(process.env.TW_SECRET_KEY).skip(
       });
       expect(tx.transactionHash.length).toBe(66);
     });
+
+    it("should send a transaction on Creator Testnet", async () => {
+      const abstractSmartWallet = smartWallet({
+        chain: defineChain(4654),
+        gasless: true,
+      });
+      const account = await abstractSmartWallet.connect({
+        client: TEST_CLIENT,
+        personalAccount,
+      });
+      const tx = await sendTransaction({
+        transaction: prepareTransaction({
+          chain: defineChain(4654),
+          client: TEST_CLIENT,
+          to: account.address,
+          value: BigInt(0),
+          data: "0x",
+        }),
+        account: account,
+      });
+      console.log(tx.transactionHash);
+      expect(tx.transactionHash.length).toBe(66);
+    });
   },
 );