From 7aba32ca83c5b6182f7c3494da3c3863af408ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9len?= <59291854+melenxyz@users.noreply.github.com>
Date: Wed, 13 Mar 2024 16:09:14 +1000
Subject: [PATCH 1/2] feat: added support for Optimistic Ecotone Mainnet
 Release (4844)

---
 dappnode_package.json |  4 ++--
 docker-compose.yml    |  3 ++-
 op-node/entrypoint.sh | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/dappnode_package.json b/dappnode_package.json
index 5d52626..d0e6e0e 100644
--- a/dappnode_package.json
+++ b/dappnode_package.json
@@ -1,7 +1,7 @@
 {
   "name": "op-node.dnp.dappnode.eth",
   "version": "0.1.1",
-  "upstreamVersion": "v1.4.2",
+  "upstreamVersion": "v1.7.1",
   "upstreamRepo": "ethereum-optimism/optimism",
   "upstreamArg": "UPSTREAM_VERSION",
   "shortDescription": "Optimism Rollup node",
@@ -36,7 +36,7 @@
   },
   "globalEnvs": [
     {
-      "envs": ["EXECUTION_CLIENT_MAINNET", "OP_EXECUTION_CLIENT"],
+      "envs": ["EXECUTION_CLIENT_MAINNET", "CONSENSUS_CLIENT_MAINNET","OP_EXECUTION_CLIENT"],
       "services": ["op-node"]
     }
   ]
diff --git a/docker-compose.yml b/docker-compose.yml
index c717e9e..97ff78a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,8 +4,9 @@ services:
     build:
       context: op-node
       args:
-        UPSTREAM_VERSION: v1.4.2
+        UPSTREAM_VERSION: v1.7.1
     environment:
       - CUSTOM_L1_RPC
+      - CUSTOM_L1_BEACON_API
     restart: unless-stopped
     image: "op-node.op-node.dnp.dappnode.eth:0.1.1"
diff --git a/op-node/entrypoint.sh b/op-node/entrypoint.sh
index 7844287..2dadc19 100755
--- a/op-node/entrypoint.sh
+++ b/op-node/entrypoint.sh
@@ -29,6 +29,39 @@ else
   exit 1
 fi
 
+# If CUSTOM_L1_BEACON_API is set, use it. Otherwise, use the proper value depending on the _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_MAINNET variable
+
+if [ ! -z "$CUSTOM_L1_BEACON_API" ]; then
+  L1_BEACON_API=$CUSTOM_L1_BEACON_API
+elif [ ! -z "$_DAPPNODE_GLOBAL_CONSENSUS_CLIENT_MAINNET" ]; then
+  case $_DAPPNODE_GLOBAL_CONSENSUS_CLIENT_MAINNET in
+  "lodestar.dnp.dappnode.eth")
+    L1_BEACON_API="http://beacon-chain.lodestar.dappnode:3500"
+    ;;
+  "lighthouse.dnp.dappnode.eth")
+    L1_BEACON_API="http://beacon-chain.lighthouse.dappnode:3500"
+    ;;
+  "prysm.dnp.dappnode.eth")
+    L1_BEACON_API="http://beacon-chain.prysm.dappnode:3500"
+    ;;
+  "teku.dnp.dappnode.eth")
+    L1_BEACON_API="http://beacon-chain.teku.dappnode:3500"
+    ;;
+  "nimbus.dnp.dappnode.eth")
+    L1_BEACON_API="http://nimbus.dappnode:4500"
+    ;;
+  *)
+    echo "Unknown value for _DAPPNODE_GLOBAL_CONSENSUS_CLIENT_MAINNET: $_DAPPNODE_GLOBAL_CONSENSUS_CLIENT_MAINNET"
+    sleep 60
+    exit 1
+    ;;
+  esac
+else
+  echo "No L1_BEACON_API value set"
+  sleep 60
+  exit 1
+fi
+
 case $_DAPPNODE_GLOBAL_OP_EXECUTION_CLIENT in
 "op-geth.dnp.dappnode.eth")
   L2_ENGINE="http://op-geth.dappnode:8551"
@@ -48,6 +81,7 @@ esac
 while true; do
   op-node --network=op-mainnet \
     --l1="$L1_RPC" \
+    --l1.beacon="$L1_BEACON_API" \
     --l2="$L2_ENGINE" \
     --l2.jwt-secret="$JWT_PATH" \
     --rpc.addr=0.0.0.0 \

From e737249fa496bf716bc5360c52d98e6c21eb297e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9len?= <59291854+melenxyz@users.noreply.github.com>
Date: Wed, 13 Mar 2024 16:11:23 +1000
Subject: [PATCH 2/2] fix: updated package version

---
 dappnode_package.json | 2 +-
 docker-compose.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dappnode_package.json b/dappnode_package.json
index d0e6e0e..14052fe 100644
--- a/dappnode_package.json
+++ b/dappnode_package.json
@@ -1,6 +1,6 @@
 {
   "name": "op-node.dnp.dappnode.eth",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "upstreamVersion": "v1.7.1",
   "upstreamRepo": "ethereum-optimism/optimism",
   "upstreamArg": "UPSTREAM_VERSION",
diff --git a/docker-compose.yml b/docker-compose.yml
index 97ff78a..685e3f1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,4 +9,4 @@ services:
       - CUSTOM_L1_RPC
       - CUSTOM_L1_BEACON_API
     restart: unless-stopped
-    image: "op-node.op-node.dnp.dappnode.eth:0.1.1"
+    image: "op-node.op-node.dnp.dappnode.eth:0.1.2"