Skip to content

Commit

Permalink
fix: l1-contracts/bootstrap.sh (#5479)
Browse files Browse the repository at this point in the history
bootstrap.sh in l1-contracts failed to rebuild contracts when foundry
was already installed. This PR fixes it.
  • Loading branch information
benesjan authored Mar 27, 2024
1 parent bbd33fb commit f7d1d70
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
25 changes: 12 additions & 13 deletions l1-contracts/scripts/install_foundry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion yarn-project/archiver/src/archiver/archiver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit f7d1d70

Please sign in to comment.