wip

Author: joaquim-verges

packages/thirdweb/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,13 +30,15 @@ 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,
     ),
   });
 
+  console.log("deploying", options.deploymentType);
+
   const receipt = await sendAndConfirmTransaction({
     account: options.account,
     transaction: prepareTransaction({
@@ -46,16 +49,23 @@ export async function zkDeployContract(
       eip712: {
         factoryDeps: [options.bytecode],
         // TODO (zksync): allow passing in a paymaster
+        paymaster: "0x950e3Bb8C6bab20b56a70550EC037E22032A413e",
+        paymasterInput:
+          "0x8c5a344500000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000",
       },
     }),
   });
 
+  console.log("receipt", receipt);
+
   const events = parseEventLogs({
     logs: receipt.logs,
     events: [contractDeployedEvent()],
   });
 
   const contractAddress = events[0]?.args.contractAddress;
+
+  console.log("deployed contractAddress", contractAddress);
   if (!contractAddress) {
     throw new Error("Contract creation failed");
   }

packages/thirdweb/src/contract/deployment/zksync/zkDeployCreate2Factory.ts

@@ -34,16 +34,18 @@ export async function zkDeployCreate2Factory(
     client: options.client,
     privateKey: PUBLISHED_PRIVATE_KEY,
   });
+  console.log("create2Signer", create2Signer);
   const valueToSend = toWei("0.01");
   const balance = await getWalletBalance({
     address: create2Signer.address,
     chain: options.chain,
     client: options.client,
   });
+  console.log("balance", balance);
 
   if (balance.value < valueToSend) {
     await sendAndConfirmTransaction({
-      account: options.account,
+      account: create2Signer,
       transaction: prepareTransaction({
         chain: options.chain,
         client: options.client,
@@ -56,9 +58,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;

packages/thirdweb/src/contract/deployment/zksync/zkDeployDeterministic.ts

@@ -9,12 +9,14 @@ import { keccakId } from "../../../utils/any-evm/keccak-id.js";
 import { computeDeploymentAddress } from "../../../utils/any-evm/zksync/computeDeploymentAddress.js";
 import {
   KNOWN_CODES_STORAGE,
+  PUBLISHED_PRIVATE_KEY,
   singletonFactoryAbi,
 } from "../../../utils/any-evm/zksync/constants.js";
 import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed.js";
 import { ensureBytecodePrefix } from "../../../utils/bytecode/prefix.js";
 import { type Hex, uint8ArrayToHex } from "../../../utils/encoding/hex.js";
 import type { ClientAndChainAndAccount } from "../../../utils/types.js";
+import { privateKeyToAccount } from "../../../wallets/private-key.js";
 import { getContract } from "../../contract.js";
 import { zkDeployContract } from "./zkDeployContract.js";
 import { zkDeployCreate2Factory } from "./zkDeployCreate2Factory.js";
@@ -69,10 +71,15 @@ export async function zkDeployContractDeterministic(
     });
     // if not known, publish the bytecodehash
     if (marker !== 1n) {
+      console.log("deploying marker");
+      const create2Signer = privateKeyToAccount({
+        client: options.client,
+        privateKey: PUBLISHED_PRIVATE_KEY,
+      });
       await zkDeployContract({
         client: options.client,
         chain: options.chain,
-        account: options.account,
+        account: create2Signer,
         abi: options.abi,
         bytecode,
         params: options.params,

packages/thirdweb/src/contract/deployment/zksync/zkDeployProxy.ts

@@ -37,6 +37,7 @@ export async function zkDeployProxy(
       `Implementation contract at ${implementationAddress} is not deployed`,
     );
   }
+  console.log("deploying tw proxy");
   // deploy tw proxy of the implementation
   const proxyAddress = await zkDeployContract({
     client: options.client,
@@ -49,6 +50,7 @@ export async function zkDeployProxy(
       _data: await encode(options.initializeTransaction),
     },
     salt: options.salt,
+    deploymentType: "create2",
   });
 
   // return address of proxy

packages/thirdweb/src/utils/any-evm/zksync/constants.ts

@@ -3,7 +3,8 @@ export const ZKSYNC_SINGLETON_FACTORY =
 export const CONTRACT_DEPLOYER_ADDRESS =
   "0x0000000000000000000000000000000000008006" as const;
 export const KNOWN_CODES_STORAGE = "0x0000000000000000000000000000000000008004";
-export const PUBLISHED_PRIVATE_KEY = "";
+export const PUBLISHED_PRIVATE_KEY =
+  "0xfa550fb8205119c91cf8f380d15b70a0b2945221a286398ffc0c85680697ed9c";
 
 export const singletonFactoryAbi = [
   "function deploy(bytes32,bytes32,bytes) external payable",

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: 3,
+    retry: process.env.CI ? 3 : 0,
     maxConcurrency: 3,
     bail: 1,
     // clear any mocks between any tests