From e6571134f698ea6792db458b415cbd931fda3840 Mon Sep 17 00:00:00 2001
From: kn0wmad <kn0wmad@protonmail.com>
Date: Mon, 12 Dec 2022 15:47:37 -0700
Subject: [PATCH 1/3] Update for upstream v24.0.1

---
 Makefile      | 2 +-
 manifest.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index e1957d05..57c55222 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 PKG_VERSION := $(shell yq e ".version" manifest.yaml)
 PKG_ID := $(shell yq e ".id" manifest.yaml)
 MANAGER_SRC := $(shell find ./manager -name '*.rs') manager/Cargo.toml manager/Cargo.lock
-VERSION_CORE := "24.0"
+VERSION_CORE := "24.0.1"
 
 .DELETE_ON_ERROR:
 
diff --git a/manifest.yaml b/manifest.yaml
index 207d11b3..aa3c0172 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -1,9 +1,9 @@
 id: bitcoind
 title: "Bitcoin Core"
-version: 24.0.0
+version: 24.0.1
 release-notes: |
     * Add build for x86
-    * Update to latest upstream
+    * Update to latest upstream (v24.0.1)
     * Add Full RBF Config option
     * Add action to delete peers.dat in case of corruption
     * Remove dbcache limit (Please use large dbcache values with caution! We recommend not touching this setting unless you know what you're doing.)

From 5b97050641ca6ad48f42ac19c53bf7c03a76b21e Mon Sep 17 00:00:00 2001
From: kn0wmad <kn0wmad@protonmail.com>
Date: Mon, 12 Dec 2022 21:08:09 -0700
Subject: [PATCH 2/3] Migration fix

---
 manifest.yaml                     | 2 +-
 migrations/eq_23_0_0_lt_24_0_0.sh | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifest.yaml b/manifest.yaml
index aa3c0172..5f84ba99 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -235,7 +235,7 @@ migrations:
       mounts:
         main: /root/.bitcoin
       inject: false
-    "=24.0.0":
+    "=24.0.0 <25.0.0":
       type: docker
       image: main
       system: false
diff --git a/migrations/eq_23_0_0_lt_24_0_0.sh b/migrations/eq_23_0_0_lt_24_0_0.sh
index ca4a2a60..e16fa0e8 100644
--- a/migrations/eq_23_0_0_lt_24_0_0.sh
+++ b/migrations/eq_23_0_0_lt_24_0_0.sh
@@ -5,7 +5,6 @@ set -ea
 if [ $1 = "from" ]; then 
     yq -i '.advanced.peers.addnode |= map(select(.hostname != ~ or . == "*"))' /root/.bitcoin/start9/config.yaml
     yq -i '.advanced.peers.addnode.[] |= {"hostname":., "port":~}' /root/.bitcoin/start9/config.yaml
-    yq -i '(.advanced.mempool.mempoolfullrbf) = false' /root/.bitcoin/start9/config.yaml
     echo '{"configured": false }'
     exit 0
 elif [ $1 = "to" ]; then

From d64b1bd6d5d29588a02360f96c6cc94334f63116 Mon Sep 17 00:00:00 2001
From: kn0wmad <kn0wmad@protonmail.com>
Date: Fri, 16 Dec 2022 12:17:51 -0700
Subject: [PATCH 3/3] Fix migrations

---
 manifest.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.yaml b/manifest.yaml
index 5f84ba99..28e8335c 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -186,7 +186,7 @@ migrations:
       mounts:
         main: /root/.bitcoin
       inject: false
-    "=23.0.0 <24.0.0":
+    ">=23.0.0 <24.0.0":
       type: docker
       image: main
       system: false
@@ -225,7 +225,7 @@ migrations:
       mounts:
         main: /root/.bitcoin
       inject: false
-    "=23.0.0 <24.0.0":
+    ">=23.0.0 <24.0.0":
       type: docker
       image: main
       system: false
@@ -235,7 +235,7 @@ migrations:
       mounts:
         main: /root/.bitcoin
       inject: false
-    "=24.0.0 <25.0.0":
+    ">=24.0.0 <25.0.0":
       type: docker
       image: main
       system: false