From 0f6f03887e44a261bdbac2be8b0532a58b2fbd1f Mon Sep 17 00:00:00 2001
From: 3alpha <3alpha@users.noreply.github.com>
Date: Wed, 4 Mar 2026 14:28:07 +0000
Subject: [PATCH 1/2] bump sigp/anchor to v1.2.1,
 dappnode/staker-package-scripts to v0.1.2

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

diff --git a/dappnode_package.json b/dappnode_package.json
index aabb6f2..be37afa 100644
--- a/dappnode_package.json
+++ b/dappnode_package.json
@@ -2,7 +2,7 @@
   "upstream": [
     {
       "repo": "sigp/anchor",
-      "version": "v1.2.0",
+      "version": "v1.2.1",
       "arg": "UPSTREAM_VERSION"
     },
     {
@@ -11,10 +11,7 @@
       "arg": "STAKER_SCRIPTS_VERSION"
     }
   ],
-  "architectures": [
-    "linux/amd64",
-    "linux/arm64"
-  ],
+  "architectures": ["linux/amd64", "linux/arm64"],
   "shortDescription": "Anchor",
   "description": "Anchor is an open source implementation of the Secret Shared Validator (SSV) protocol, written in Rust and maintained by Sigma Prime.",
   "type": "service",
@@ -23,10 +20,7 @@
     "Tan Chee Keong <tanck@sigmaprime.io> (https://github.com/chong-he)",
     "Daniel Knopik <daniel@sigmaprime.io> (https://github.com/dknopik)"
   ],
-  "categories": [
-    "Blockchain",
-    "ETH2.0"
-  ],
+  "categories": ["Blockchain", "ETH2.0"],
   "repository": {
     "type": "git",
     "url": "https://github.com/dappnode/DAppNodePackage-Anchor.git"
@@ -54,4 +48,4 @@
       "service": "operator"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/docker-compose.yml b/docker-compose.yml
index b33a60d..f1d9439 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     build:
       context: operator
       args:
-        UPSTREAM_VERSION: v1.2.0
+        UPSTREAM_VERSION: v1.2.1
         STAKER_SCRIPTS_VERSION: v0.1.2
         DATA_DIR: /root/.anchor
     restart: unless-stopped
@@ -16,4 +16,4 @@ services:
       EXTRA_OPTS: ""
       EXISTING_PASSWORD: ""
 volumes:
-  operator-data: {}
\ No newline at end of file
+  operator-data: {}

From 21079ff6c768cce649954c53867bc7f4fbe41659 Mon Sep 17 00:00:00 2001
From: Tan Chee Keong <tanck@sigmaprime.io>
Date: Thu, 5 Mar 2026 08:44:16 +0800
Subject: [PATCH 2/2] fix compile

---
 docker-compose.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index af46ff4..d7c0310 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,4 @@ services:
       EXISTING_PASSWORD: ""
 volumes:
   operator-data: {}
-<<<<<<< dappnodebot/bump-upstream/sigp/anchor@v1.2.1,dappnode/staker-package-scripts@v0.1.2
-=======
   operator-keys: {}
->>>>>>> main