From f7d1d700ac84264c73c8d15e27b57ac130eebe7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Bene=C5=A1?= Date: Wed, 27 Mar 2024 15:13:30 +0100 Subject: [PATCH] fix: `l1-contracts/bootstrap.sh` (#5479) bootstrap.sh in l1-contracts failed to rebuild contracts when foundry was already installed. This PR fixes it. --- l1-contracts/scripts/install_foundry.sh | 25 +++++++++---------- .../archiver/src/archiver/archiver.ts | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/l1-contracts/scripts/install_foundry.sh b/l1-contracts/scripts/install_foundry.sh index c5d8833a001..e1866372587 100755 --- a/l1-contracts/scripts/install_foundry.sh +++ b/l1-contracts/scripts/install_foundry.sh @@ -13,18 +13,17 @@ echo "$FOUNDRY_SHORT_VERSION" # Check if forge is installed and matches the expected version if command -v "forge" > /dev/null 2>&1 && [[ "$(forge --version)" == *"$FOUNDRY_SHORT_VERSION"* ]]; then echo "Foundry is already installed and at the correct version." - exit 0 -fi - -# Clean -rm -rf $FOUNDRY_DIR +else + # Clean + rm -rf $FOUNDRY_DIR -# Install foundryup. -mkdir -p $FOUNDRY_BIN_DIR -mkdir -p $FOUNDRY_MAN_DIR -curl -# -L $BIN_URL -o $BIN_PATH -chmod +x $BIN_PATH -export PATH=$FOUNDRY_BIN_DIR:$PATH + # Install foundryup. + mkdir -p $FOUNDRY_BIN_DIR + mkdir -p $FOUNDRY_MAN_DIR + curl -# -L $BIN_URL -o $BIN_PATH + chmod +x $BIN_PATH + export PATH=$FOUNDRY_BIN_DIR:$PATH -# Use version. -foundryup --version $FOUNDRY_VERSION + # Use version. + foundryup --version $FOUNDRY_VERSION +fi diff --git a/yarn-project/archiver/src/archiver/archiver.ts b/yarn-project/archiver/src/archiver/archiver.ts index e7228ff5bf4..b0c994cb2d0 100644 --- a/yarn-project/archiver/src/archiver/archiver.ts +++ b/yarn-project/archiver/src/archiver/archiver.ts @@ -137,7 +137,7 @@ export class Archiver implements ArchiveSource { } /** - * Fetches `L2BlockProcessed` and `ContractDeployment` logs from `nextL2BlockFromBlock` and processes them. + * Fetches logs from L1 contracts and processes them. * @param blockUntilSynced - If true, blocks until the archiver has fully synced. */ private async sync(blockUntilSynced: boolean) {