thirdweb 5.60.1-nightly-79c50cb311ffef769b7bdba3006ae67ddf257caf-20241002000323 → 5.60.1-nightly-985c4b08048c3676dc9be0c2069fefc73a742a3a-20241003000322

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

@@ -6,23 +6,26 @@ export async function isZkSyncChain(chain: Chain) {
     return false;
   }
 
-  const stack = await getChainStack(chain.id).catch(() => {
-    // fall back to checking against these zksync chain-ids
-    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 "zksync-stack";
-    }
-
-    return "";
-  });
+  // 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;
+  }
 
-  return stack === "zksync-stack";
+  // 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> {

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.60.1-nightly-79c50cb311ffef769b7bdba3006ae67ddf257caf-20241002000323";
+export const version = "5.60.1-nightly-985c4b08048c3676dc9be0c2069fefc73a742a3a-20241003000322";

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/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);
+    });
   },
 );