Update to v24 upstream, minor build edits, add Full RBF config option (Start9Labs#107)

* Update to v24 upstream, minor build edits, add Full RBF config option

* Update migrations/gt_22_0_0_lt_23_0_0.sh

Co-authored-by: Chris Guida <[email protected]>

* Update scripts/services/getConfig.ts

Co-authored-by: Chris Guida <[email protected]>

* Cleanup

* cleanup

* strip all binaries

Co-authored-by: Chris Guida <[email protected]>
Co-authored-by: Chris Guida <[email protected]>

Author: kn0wmad

Dockerfile

@@ -8,8 +8,6 @@ FROM alpine:3.12 as bitcoin-core
 
 COPY --from=berkeleydb /opt /opt
 
-COPY ./SHA256SUMS.asc.patch SHA256SUMS.asc.patch
-
 RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories
 RUN apk --no-cache add autoconf
 RUN apk --no-cache add automake
@@ -22,7 +20,6 @@ RUN apk --no-cache add libevent-dev
 RUN apk --no-cache add libressl
 RUN apk --no-cache add libtool
 RUN apk --no-cache add linux-headers
-# RUN apk --no-cache add sqlite-libs
 RUN apk --no-cache add sqlite-dev
 RUN apk --no-cache add zeromq-dev
 RUN set -ex \
@@ -84,9 +81,9 @@ AEC1884398647C47413C1C3FB1179EB7347DC10D \
 71A3B16735405025D447E8F274810B012346C9A6 \
 287AE4CA1187C68C08B49CB2D11BD4F33F1DB499 \
 F9A8737BF4FF5C89C903DF31DD78544CF91B1514 \
-# C388F6961FB972A95678E327F62711DBDCA8AE56 \
 4DAF18FE948E7A965B30F9457E296D555E7F63A7 \
 28E72909F1717FE9607754F8A7BEB2621678D37D \
+F19F5FF2B0589EC341220045BA03F4DBE0C63FB4 \
   ; do \
   gpg --batch --keyserver hkps://keyserver.ubuntu.com --recv-keys "$key" || \
   gpg --batch --keyserver hkps://pgp.mit.edu --recv-keys "$key" || \
@@ -103,16 +100,13 @@ ENV BITCOIN_PREFIX=/opt/bitcoin-${BITCOIN_VERSION}
 RUN wget https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/SHA256SUMS
 RUN wget https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/SHA256SUMS.asc
 RUN wget https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/bitcoin-${BITCOIN_VERSION}.tar.gz
-RUN patch -u SHA256SUMS.asc -i SHA256SUMS.asc.patch
 RUN gpg --verify SHA256SUMS.asc
 RUN grep " bitcoin-${BITCOIN_VERSION}.tar.gz\$" SHA256SUMS | sha256sum -c -
 RUN tar -xzf *.tar.gz
 
 WORKDIR /bitcoin-${BITCOIN_VERSION}
 
-RUN sed -i '/AC_PREREQ/a\AR_FLAGS=cr' src/univalue/configure.ac
 RUN sed -i '/AX_PROG_CC_FOR_BUILD/a\AR_FLAGS=cr' src/secp256k1/configure.ac
-RUN sed -i s:sys/fcntl.h:fcntl.h: src/compat.h
 RUN ./autogen.sh
 RUN ./configure LDFLAGS=-L`ls -d /opt/db*`/lib/ CPPFLAGS=-I`ls -d /opt/db*`/include/ \
   # If building on Mac make sure to increase Docker VM memory, or uncomment this line. See https://github.com/bitcoin/bitcoin/issues/6658 for more info.
@@ -128,9 +122,7 @@ RUN ./configure LDFLAGS=-L`ls -d /opt/db*`/lib/ CPPFLAGS=-I`ls -d /opt/db*`/incl
   --with-daemon
 RUN make -j$(($(nproc) - 1))
 RUN make install
-RUN strip ${BITCOIN_PREFIX}/bin/bitcoin-cli
-RUN strip ${BITCOIN_PREFIX}/bin/bitcoin-tx
-RUN strip ${BITCOIN_PREFIX}/bin/bitcoind
+RUN strip ${BITCOIN_PREFIX}/bin/*
 RUN strip ${BITCOIN_PREFIX}/lib/libbitcoinconsensus.a
 RUN strip ${BITCOIN_PREFIX}/lib/libbitcoinconsensus.so.0.0.0
 

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 := "23.0"
+VERSION_CORE := "24.0"
 
 .DELETE_ON_ERROR:
 

SHA256SUMS.asc.patch

@@ -23,6 +23,12 @@ rpcthreads={{rpc.advanced.threads}}
 rpcworkqueue={{rpc.advanced.workqueue}}
 
 ## MEMPOOL
+{{#IF advanced.mempool.mempoolfullrbf
+mempoolfullrbf=1
+}}
+{{#IF !advanced.mempool.mempoolfullrbf
+mempoolfullrbf=0
+}}
 {{#IF advanced.mempool.persistmempool
 persistmempool=1
 }}

assets/compat/bitcoin.conf.template

@@ -1,8 +1,10 @@
 id: bitcoind
 title: "Bitcoin Core"
-version: 23.0.1
+version: 24.0.0
 release-notes: |
     * Add build for x86
+    * Update to latest upstream
+    * Add Full RBF Config option
 license: mit
 wrapper-repo: https://github.com/Start9Labs/bitcoind-wrapper
 upstream-repo: https://github.com/bitcoin/bitcoin
@@ -182,7 +184,17 @@ migrations:
       mounts:
         main: /root/.bitcoin
       inject: false
-    "=23.0.0":
+    "=23.0.0 <24.0.0":
+      type: docker
+      image: main
+      system: false
+      entrypoint: /usr/local/bin/migrations/eq_23_0_0_lt_24_0_0.sh
+      args: ["from"]
+      io-format: json
+      mounts:
+        main: /root/.bitcoin
+      inject: false
+    "=24.0.0":
       type: docker
       image: main
       system: false
@@ -211,7 +223,17 @@ migrations:
       mounts:
         main: /root/.bitcoin
       inject: false
-    "=23.0.0":
+    "=23.0.0 <24.0.0":
+      type: docker
+      image: main
+      system: false
+      entrypoint: /usr/local/bin/migrations/eq_23_0_0_lt_24_0_0.sh
+      args: ["to"]
+      io-format: json
+      mounts:
+        main: /root/.bitcoin
+      inject: false
+    "=24.0.0":
       type: docker
       image: main
       system: false

manifest.yaml

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+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
+    yq -i '.advanced.peers.addnode |= map_values(.hostname)' /root/.bitcoin/start9/config.yaml
+    yq -i 'del(.advanced.bloomfilters)' /root/.bitcoin/start9/config.yaml
+    yq -i 'del(.advanced.mempool.mempoolfullrbf)' /root/.bitcoin/start9/config.yaml
+    echo '{"configured": false }'
+    exit 0
+else
+    echo "FATAL: Invalid argument: {from, to}. Migration failed." >&2
+    exit 1
+fi

migrations/eq_23_0_0_lt_24_0_0.sh

@@ -5,15 +5,17 @@ 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
     yq -i '.advanced.peers.addnode |= map_values(.hostname)' /root/.bitcoin/start9/config.yaml
     yq -i 'del(.advanced.bloomfilters)' /root/.bitcoin/start9/config.yaml
+    yq -i 'del(.advanced.mempool.mempoolfullrbf)' /root/.bitcoin/start9/config.yaml
     echo '{"configured": false }'
     exit 0
 else
     echo "FATAL: Invalid argument: {from, to}. Migration failed." >&2
     exit 1
 fi
-``
+

migrations/gt_22_0_0_lt_23_0_0.sh

@@ -5,17 +5,17 @@ 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.blockfilters.blockfilterindex, .advanced.blockfilters.peerblockfilters, .advanced.bloomfilters.peerbloomfilters) = false' /root/.bitcoin/start9/config.yaml
+    yq -i '(.advanced.blockfilters.blockfilterindex, .advanced.blockfilters.peerblockfilters, .advanced.bloomfilters.peerbloomfilters, .advanced.mempool.mempoolfullrbf) = false' /root/.bitcoin/start9/config.yaml
     echo '{"configured": true }'
     exit 0
 elif [ $1 = "to" ]; then
     yq -i '.advanced.peers.addnode |= map_values(.hostname)' /root/.bitcoin/start9/config.yaml
     yq -i 'del(.advanced.blockfilters)' /root/.bitcoin/start9/config.yaml
     yq -i 'del(.advanced.bloomfilters)' /root/.bitcoin/start9/config.yaml
+    yq -i 'del(.advanced.mempool.mempoolfullrbf)' /root/.bitcoin/start9/config.yaml
     echo '{"configured": false }'
     exit 0
 else
     echo "FATAL: Invalid argument: {from, to}. Migration failed." >&2
     exit 1
 fi
-``

migrations/lt_22_0_0.sh

@@ -116,7 +116,7 @@ export const getConfig: T.ExpectedExports.getConfig = compat.getConfig({
               "Set the depth of the work queue to service RPC calls. Determines how long the backlog of RPC requests can get before it just rejects new ones.",
             "type": "number",
             "nullable": false,
-            "default": 64,
+            "default": 128,
             "range": "[8,256]",
             "integral": true,
             "units": "requests",
@@ -178,6 +178,13 @@ export const getConfig: T.ExpectedExports.getConfig = compat.getConfig({
         "name": "Mempool",
         "description": "Mempool Settings",
         "spec": {
+          "mempoolfullrbf": {
+            "name": "Enable Full RBF",
+            "description":
+              "Policy for your node to use for relaying and mining unconfirmed transactions.  For details, see https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-24.0.md#notice-of-new-option-for-transaction-replacement-policies",
+            "type": "boolean",
+            "default": false,
+          },
           "persistmempool": {
             "type": "boolean",
             "name": "Persist Mempool",