From 1d5d06b3edf96e42f21881a19fd437243fd1673d Mon Sep 17 00:00:00 2001 From: Henri Devieux Date: Wed, 18 Dec 2024 16:23:30 -0500 Subject: [PATCH] Upgrade op-node(v1.10.2) op-geth(v1.101411.4) and reth(v1.1.4) (#367) * Upgrade: op-node(v1.10.2) op-geth(v1.101411.4) and reth(v1.1.4) for Holocene * Install just in Dockerfilefiles --- geth/Dockerfile | 11 +++++++---- reth/Dockerfile | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/geth/Dockerfile b/geth/Dockerfile index 9c03b57..34e9922 100644 --- a/geth/Dockerfile +++ b/geth/Dockerfile @@ -3,12 +3,15 @@ FROM golang:1.22 AS op WORKDIR /app ENV REPO=https://github.com/ethereum-optimism/optimism.git -ENV VERSION=v1.10.0 -ENV COMMIT=910c9ade39c0bcdff5f2badd94efbe016a428e73 +ENV VERSION=v1.10.2 +ENV COMMIT=8bf7ff60f34a7c5082cec5c56bed1f76cc1893ad RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \ git switch -c branch-$VERSION && \ bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]' +# Install 'just' +RUN curl -sSfL 'https://just.systems/install.sh' | bash -s -- --to /usr/local/bin + RUN cd op-node && \ make VERSION=$VERSION op-node @@ -17,8 +20,8 @@ FROM golang:1.22 AS geth WORKDIR /app ENV REPO=https://github.com/ethereum-optimism/op-geth.git -ENV VERSION=v1.101411.2 -ENV COMMIT=3dd9b0274bae3d3d2c80ef517563a360108e8cf6 +ENV VERSION=v1.101411.4 +ENV COMMIT=efa05b1bf5c22a60745e638ad9d4adadfe3daba9 RUN git clone $REPO --branch $VERSION --single-branch . && \ git switch -c branch-$VERSION && \ bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]' diff --git a/reth/Dockerfile b/reth/Dockerfile index 3e24a46..9c06d95 100644 --- a/reth/Dockerfile +++ b/reth/Dockerfile @@ -3,12 +3,15 @@ FROM golang:1.22 AS op WORKDIR /app ENV REPO=https://github.com/ethereum-optimism/optimism.git -ENV VERSION=v1.10.0 -ENV COMMIT=910c9ade39c0bcdff5f2badd94efbe016a428e73 +ENV VERSION=v1.10.2 +ENV COMMIT=8bf7ff60f34a7c5082cec5c56bed1f76cc1893ad RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \ git switch -c branch-$VERSION && \ bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]' +# Install 'just' +RUN curl -sSfL 'https://just.systems/install.sh' | bash -s -- --to /usr/local/bin + RUN cd op-node && \ make VERSION=$VERSION op-node @@ -21,8 +24,8 @@ WORKDIR /app RUN apt-get update && apt-get -y upgrade && apt-get install -y git libclang-dev pkg-config curl build-essential ENV REPO=https://github.com/paradigmxyz/reth.git -ENV VERSION=v1.1.2 -ENV COMMIT=496bf0bf715f0a1fafc198f8d72ccd71913d1a40 +ENV VERSION=v1.1.4 +ENV COMMIT=15fac0873e91ea29ab2e605bfba17bedcd7a6084 RUN git clone $REPO --branch $VERSION --single-branch . && \ git switch -c branch-$VERSION && \ bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'