feat: handle zksync direct deploys in deployContract

Author: joaquim-verges

.changeset/rich-steaks-guess.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Handle zk sync direct deploys in `deployContract`

packages/thirdweb/src/contract/deployment/deploy-with-abi.ts

@@ -5,6 +5,7 @@ import { encodeAbiParameters } from "../../utils/abi/encodeAbiParameters.js";
 import { normalizeFunctionParams } from "../../utils/abi/normalizeFunctionParams.js";
 import { computeDeploymentAddress } from "../../utils/any-evm/compute-deployment-address.js";
 import { computeDeploymentInfoFromBytecode } from "../../utils/any-evm/compute-published-contract-deploy-info.js";
+import { isZkSyncChain } from "../../utils/any-evm/zksync/isZkSyncChain.js";
 import { isContractDeployed } from "../../utils/bytecode/is-contract-deployed.js";
 import { ensureBytecodePrefix } from "../../utils/bytecode/prefix.js";
 import { concatHex } from "../../utils/encoding/helpers/concat-hex.js";
@@ -13,6 +14,7 @@ import type { Prettify } from "../../utils/type-utils.js";
 import type { ClientAndChain } from "../../utils/types.js";
 import type { Account } from "../../wallets/interfaces/wallet.js";
 import { getContract } from "../contract.js";
+import { zkDeployContract } from "./zksync/zkDeployContract.js";
 
 /**
  * @extension DEPLOY
@@ -121,6 +123,18 @@ export async function deployContract(
     salt?: string;
   },
 ) {
+  if (await isZkSyncChain(options.chain)) {
+    return zkDeployContract({
+      account: options.account,
+      client: options.client,
+      chain: options.chain,
+      bytecode: options.bytecode,
+      abi: options.abi,
+      params: options.constructorParams,
+      salt: options.salt,
+    });
+  }
+
   if (options.salt !== undefined) {
     // Deploy with CREATE2 if salt is provided
     const info = await computeDeploymentInfoFromBytecode(options);

packages/thirdweb/src/extensions/ens/resolve-avatar.test.ts

@@ -1,5 +1,4 @@
 import { describe, expect, it } from "vitest";
-
 import { TEST_CLIENT } from "../../../test/src/test-clients.js";
 import { resolveAvatar } from "./resolve-avatar.js";
 
@@ -22,9 +21,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("ENS:resolve-avatar", () => {
       client: TEST_CLIENT,
       name: "vitalik.eth",
     });
-    expect(avatarUri?.split("/ipfs/")[1]).toMatchInlineSnapshot(
-      `"QmSP4nq9fnN9dAiCj42ug9Wa79rqmQerZXZch82VqpiH7U/image.gif"`,
-    );
+    expect(avatarUri).toMatchInlineSnapshot(`"https://euc.li/vitalik.eth"`);
   });
 
   it("resolves name without avatar record to null", async () => {

packages/thirdweb/src/extensions/prebuilts/deploy-published.ts

@@ -4,8 +4,6 @@ import type { ThirdwebClient } from "../../client/client.js";
 import { type ThirdwebContract, getContract } from "../../contract/contract.js";
 import { fetchPublishedContractMetadata } from "../../contract/deployment/publisher.js";
 import { getOrDeployInfraContractFromMetadata } from "../../contract/deployment/utils/bootstrap.js";
-import {} from "../../contract/deployment/utils/infra.js";
-import { zkDeployContract } from "../../contract/deployment/zksync/zkDeployContract.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { simulateTransaction } from "../../transaction/actions/simulate.js";
 import { prepareContractCall } from "../../transaction/prepare-contract-call.js";
@@ -18,7 +16,6 @@ import {
   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";
 import type { Account } from "../../wallets/interfaces/wallet.js";
 import { getAllDefaultConstructorParamsForImplementation } from "./get-required-transactions.js";
@@ -263,22 +260,6 @@ async function directDeploy(options: {
   const { account, client, chain, compilerMetadata, contractParams, salt } =
     options;
 
-  if (await isZkSyncChain(chain)) {
-    return zkDeployContract({
-      account,
-      client,
-      chain,
-      bytecode: await fetchBytecodeFromCompilerMetadata({
-        compilerMetadata,
-        client,
-        chain,
-      }),
-      abi: compilerMetadata.abi,
-      params: contractParams,
-      salt,
-    });
-  }
-
   const { deployContract } = await import(
     "../../contract/deployment/deploy-with-abi.js"
   );

packages/thirdweb/test/vitest.config.ts

@@ -37,7 +37,7 @@ export default defineConfig({
     setupFiles: [join(__dirname, "./reactSetup.ts")],
     globalSetup: [join(__dirname, "./globalSetup.ts")],
     testTimeout: 90_000,
-    retry: 0,
+    retry: 3,
     bail: 1,
     // clear any mocks between any tests
     clearMocks: true,