Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/node_docker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ jobs:
file: Dockerfile
platforms: ${{ matrix.platform }}
push: true
build-args: |
BLST_PORTABLE=1
outputs: type=image,name=${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_REPOSITORY_PROD }},push-by-digest=true,name-canonical=true

- name: Set digest output
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ RUN apt-get update && apt-get install -y \
# Set the working directory inside the container
WORKDIR /app/catalyst_node

# Force blst (and the blst vendored by c-kzg) to compile without ADX/BMI2 asm.
# Without this, binaries built on modern CI runners SIGILL on older Intel CPUs
# (e.g. pre-Broadwell Macs, and Intel-Mac Docker Desktop VMs that don't expose
# those features to the guest).
ARG BLST_PORTABLE=1
ENV BLST_PORTABLE=${BLST_PORTABLE}

# Copy only the toolchain file first
COPY rust-toolchain.toml .

Expand Down
2 changes: 1 addition & 1 deletion common/src/config/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ impl Config {
let taiko_anchor_address = Address::from_str(&taiko_anchor_address_str)
.map_err(|e| address_parse_error(TAIKO_ANCHOR_ADDRESS, e, &taiko_anchor_address_str))?;

const BRIDGE_ADDRESS: &str = "TAIKO_BRIDGE_L2_ADDRESS";
const BRIDGE_ADDRESS: &str = "L2_BRIDGE_ADDRESS";
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can’t rename that constant because it would interfere with our running nodes and require changes to our infrastructure, so it should be done in a separate PR

let taiko_bridge_address_str = std::env::var(BRIDGE_ADDRESS).unwrap_or_else(|_| {
warn!(
"No Bridge contract address found in {} env var, using default",
Expand Down
Loading
Loading