From fe4eb022035f968570675778aab62bd11049103a Mon Sep 17 00:00:00 2001
From: Incede <33103370+Incede@users.noreply.github.com>
Date: Mon, 2 Sep 2024 14:27:55 +0200
Subject: [PATCH] Upgrade clients to support granite hard fork (#36)

* Upgrade clients to support granite hard fork

* Update mainnet genesis and rollup configs
---
 geth/Dockerfile      | 8 ++++----
 mainnet/genesis.json | 1 +
 mainnet/rollup.json  | 1 +
 reth/Dockerfile      | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/geth/Dockerfile b/geth/Dockerfile
index f41c6ce..95d9047 100644
--- a/geth/Dockerfile
+++ b/geth/Dockerfile
@@ -3,8 +3,8 @@ FROM golang:1.21 AS op
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/optimism.git
-ENV VERSION=v1.9.0
-ENV COMMIT=ec45f6634ab2855a4ae5d30c4e240d79f081d689
+ENV VERSION=v1.9.1
+ENV COMMIT=4797ddb70e05d4952685bad53e608cb5606284e6
 RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
@@ -21,8 +21,8 @@ FROM golang:1.21 AS geth
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/op-geth.git
-ENV VERSION=v1.101315.3
-ENV COMMIT=8af19cf20261c0b62f98cc27da3a268f542822ee
+ENV VERSION=v1.101408.0
+ENV COMMIT=5c2e75862239c77d2873de1888ba52ee84c83178
 RUN git clone $REPO --branch $VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
diff --git a/mainnet/genesis.json b/mainnet/genesis.json
index de1f115..a809b1a 100644
--- a/mainnet/genesis.json
+++ b/mainnet/genesis.json
@@ -15312,6 +15312,7 @@
     "eip150Block": 0,
     "eip155Block": 0,
     "eip158Block": 0,
+    "graniteTime": 1726070401,
     "londonBlock": 0,
     "bedrockBlock": 0,
     "regolithTime": 0,
diff --git a/mainnet/rollup.json b/mainnet/rollup.json
index cc00a2c..4ef073e 100644
--- a/mainnet/rollup.json
+++ b/mainnet/rollup.json
@@ -23,6 +23,7 @@
   "l1_chain_id": 1,
   "l2_chain_id": 1135,
   "ecotone_time": 0,
+  "granite_time": 1726070401,
   "regolith_time": 0,
   "channel_timeout": 300,
   "seq_window_size": 3600,
diff --git a/reth/Dockerfile b/reth/Dockerfile
index 3dfba45..b68f23f 100644
--- a/reth/Dockerfile
+++ b/reth/Dockerfile
@@ -3,8 +3,8 @@ FROM golang:1.21 AS op
 WORKDIR /app
 
 ENV REPO=https://github.com/ethereum-optimism/optimism.git
-ENV VERSION=v1.9.0
-ENV COMMIT=ec45f6634ab2855a4ae5d30c4e240d79f081d689
+ENV VERSION=v1.9.1
+ENV COMMIT=4797ddb70e05d4952685bad53e608cb5606284e6
 RUN git clone $REPO --branch op-node/$VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'
@@ -26,8 +26,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.0.5
-ENV COMMIT=603e39ab74509e0863fc023461a4c760fb2126d1
+ENV VERSION=v1.0.6
+ENV COMMIT=c228fe15808c3acbf18dc3af1a03ef5cbdcda07a
 RUN git clone $REPO --branch $VERSION --single-branch . && \
     git switch -c branch-$VERSION && \
     bash -c '[ "$(git rev-parse HEAD)" = "$COMMIT" ]'