feat: Uncomment steps (#12)

* re-add weth step in zk init * add correct commit hash in contracts submodule * uncomment steps from init * update contracts submodule commit --------- Co-authored-by: Santiago Pittella <[email protected]>
lambdaclass · Dec 18, 2023 · 1181aa3 · 1181aa3
1 parent 495c2ec
commit 1181aa3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/contracts b/contracts
diff --git a/infrastructure/zk/src/contract.ts b/infrastructure/zk/src/contract.ts
@@ -79,19 +79,19 @@ export async function deployL2(args: any[] = [], includePaymaster?: boolean, inc
     // In the localhost setup scenario we don't have the workspace,
     // so we have to `--cwd` into the required directory.
     const baseCommandL2 = isLocalSetup ? `yarn --cwd /contracts/zksync` : `yarn l2-contracts`;
-    // const baseCommandL1 = isLocalSetup ? `yarn --cwd /contracts/ethereum` : `yarn l1-contracts`;
+    const baseCommandL1 = isLocalSetup ? `yarn --cwd /contracts/ethereum` : `yarn l1-contracts`;
 
     // Skip compilation for local setup, since we already copied artifacts into the container.
     await utils.spawn(`${baseCommandL2} build`);
 
-    // await utils.spawn(`${baseCommandL1} initialize-bridges ${args.join(' ')} | tee deployL2.log`);
+    await utils.spawn(`${baseCommandL1} initialize-bridges ${args.join(' ')} | tee deployL2.log`);
 
     if (includePaymaster) {
-        // await utils.spawn(`${baseCommandL2} deploy-testnet-paymaster ${args.join(' ')} | tee -a deployL2.log`);
+        await utils.spawn(`${baseCommandL2} deploy-testnet-paymaster ${args.join(' ')} | tee -a deployL2.log`);
     }
 
     if (includeWETH) {
-        // await utils.spawn(`${baseCommandL2} deploy-l2-weth ${args.join(' ')} | tee -a deployL2.log`);
+        await utils.spawn(`${baseCommandL2} deploy-l2-weth ${args.join(' ')} | tee -a deployL2.log`);
     }
 
     await utils.spawn(`${baseCommandL2} deploy-force-deploy-upgrader ${args.join(' ')} | tee -a deployL2.log`);
@@ -107,7 +107,7 @@ export async function deployL2(args: any[] = [], includePaymaster?: boolean, inc
     updateContractsEnv(l2DeployLog, l2DeploymentEnvVars);
 
     if (includeWETH) {
-        // await utils.spawn(`${baseCommandL1} initialize-weth-bridges ${args.join(' ')} | tee -a deployL1.log`);
+        await utils.spawn(`${baseCommandL1} initialize-weth-bridges ${args.join(' ')} | tee -a deployL1.log`);
     }
 
     const l1DeployLog = fs.readFileSync('deployL1.log').toString();
+7 −4		ethereum/contracts/bridge/L1ERC20Bridge.sol
+7 −4		ethereum/contracts/bridge/L1WethBridge.sol
+3 −2		ethereum/contracts/bridge/libraries/BridgeInitializationHelper.sol
+2 −1		ethereum/scripts/initialize-bridges.ts
+1 −0		ethereum/scripts/initialize-weth-bridges.ts