diff --git a/contracts b/contracts index 6e9af1a1835d..501691051a74 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit 6e9af1a1835d871c57bff041bd0cd1a6992c1ec5 +Subproject commit 501691051a745bdb03922e57f263497a866701dd diff --git a/infrastructure/protocol-upgrade/src/hyperchain-upgrade.ts b/infrastructure/protocol-upgrade/src/hyperchain-upgrade.ts index 4d5cb98450a3..ce7d434d3af3 100644 --- a/infrastructure/protocol-upgrade/src/hyperchain-upgrade.ts +++ b/infrastructure/protocol-upgrade/src/hyperchain-upgrade.ts @@ -134,11 +134,22 @@ async function hyperchainFullUpgrade() { 'cp etc/env/.init.env etc/env/l1-inits/.init.env && rm ./etc/env/l2-inits/zksync_local.init.env && rm ./etc/env/target/zksync_local.env' ); await spawn('zk env zksync_local'); + env.reload('zksync_local'); env.modify( 'CONTRACTS_ERA_DIAMOND_PROXY_ADDR', process.env.CONTRACTS_DIAMOND_PROXY_ADDR, `etc/env/l1-inits/${process.env.L1_ENV_NAME ? process.env.L1_ENV_NAME : '.init'}.env` ); + env.modify( + 'CONTRACTS_L2_SHARED_BRIDGE_ADDR', + process.env.CONTRACTS_L2_ERC20_BRIDGE_ADDR, + `etc/env/l2-inits/${process.env.ZKSYNC_ENV}.init.env` + ); + env.modify( + 'CONTRACTS_BASE_TOKEN_ADDR', + '0x0000000000000000000000000000000000000001', + `etc/env/l2-inits/${process.env.ZKSYNC_ENV}.init.env` + ); await deploySharedBridgeL2Implementation(); @@ -170,7 +181,7 @@ async function hyperchainFullUpgrade() { async function postPropose() { // we need to set up the prover dal await setupForDal(DalPath.ProverDal, process.env.DATABASE_PROVER_URL); - await 'zk db migrate'; + await spawn('zk db migrate'); } export const command = new Command('hyperchain-upgrade').description('create and publish custom l2 upgrade');