Update/040

.github/workflows/buildService.yml

@@ -4,29 +4,30 @@ on:
   workflow_dispatch:
   pull_request:
     paths-ignore: ['*.md']
-    branches: ['main', 'master']
+    branches: ['main', 'master', 'update/040']
   push:
     paths-ignore: ['*.md']
-    branches: ['main', 'master']
+    branches: ['main', 'master', 'update/040']
 
 jobs:
   BuildPackage:
     runs-on: ubuntu-latest
     steps:
       - name: Prepare StartOS SDK
-        uses: Start9Labs/sdk@v1
+        uses: start9labs/sdk@v2
 
       - name: Checkout services repository
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Build the service package
         id: build
         run: |
-          git submodule update --init --recursive
-          start-sdk init
-          make
-          PACKAGE_ID=$(yq -oy ".id" manifest.*)
-          echo "package_id=$PACKAGE_ID" >> $GITHUB_ENV
+          start-cli init
+          RUST_LOG=debug RUST_BACKTRACE=1 make
+          PACKAGE_ID=$(start-cli s9pk inspect *.s9pk manifest | jq -r '.id')
+          echo "package_id=${PACKAGE_ID}" >> $GITHUB_ENV
           printf "\n SHA256SUM: $(sha256sum ${PACKAGE_ID}.s9pk) \n"
         shell: bash
 

.github/workflows/releaseService.yml

@@ -12,39 +12,49 @@ jobs:
       contents: write
     steps:
       - name: Prepare StartOS SDK
-        uses: Start9Labs/sdk@v1
+        uses: start9labs/sdk@v2
 
       - name: Checkout services repository
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
       - name: Build the service package
+        id: build
+        env:
+          S9DEVKEY: ${{ secrets.S9DEVKEY }}
         run: |
-          git submodule update --init --recursive
-          start-sdk init
-          make
-
-      - name: Setting package ID and title from the manifest
-        id: package
-        run: |
-          echo "package_id=$(yq -oy ".id" manifest.*)" >> $GITHUB_ENV
-          echo "package_title=$(yq -oy ".title" manifest.*)" >> $GITHUB_ENV
+          start-cli init
+          if [[ -n "$S9DEVKEY" ]]; then
+            echo "Using developer key from secrets to sign the package."
+            printf '%s' "$S9DEVKEY" > ~/.startos/developer.key.pem
+          else
+            echo "Using newly generated developer key to sign the package."
+          fi
+          RUST_LOG=debug RUST_BACKTRACE=1 make
+          sleep 2
+          MANIFEST_JSON=$(start-cli s9pk inspect *.s9pk manifest)
+          PACKAGE_ID=$(echo "$MANIFEST_JSON" | jq -r '.id')
+          PACKAGE_TITLE=$(echo "$MANIFEST_JSON" | jq -r '.title')
+          echo "package_id=${PACKAGE_ID}" >> $GITHUB_ENV
+          echo "package_title=${PACKAGE_TITLE}" >> $GITHUB_ENV
+          printf "\n SHA256SUM: $(sha256sum ${PACKAGE_ID}.s9pk) \n"
         shell: bash
 
       - name: Generate sha256 checksum
         run: |
-          PACKAGE_ID=${{ env.package_id }}
-          printf "\n SHA256SUM: $(sha256sum ${PACKAGE_ID}.s9pk) \n"
-          sha256sum ${PACKAGE_ID}.s9pk > ${PACKAGE_ID}.s9pk.sha256
+          sha256sum ${{ env.package_id }}.s9pk > ${{ env.package_id }}.s9pk.sha256
         shell: bash
 
       - name: Generate changelog
         run: |
-          PACKAGE_ID=${{ env.package_id }}
           echo "## What's Changed" > change-log.txt
-          yq -oy '.release-notes' manifest.* >> change-log.txt
+          echo "" >> change-log.txt
+          RELEASE_NOTES=$(start-cli s9pk inspect *.s9pk manifest | jq -r '.releaseNotes') 
+          echo "${RELEASE_NOTES}" >> change-log.txt
           echo "## SHA256 Hash" >> change-log.txt
           echo '```' >> change-log.txt
-          sha256sum ${PACKAGE_ID}.s9pk >> change-log.txt
+          sha256sum ${{ env.package_id }}.s9pk >> change-log.txt
           echo '```' >> change-log.txt
         shell: bash
 
@@ -61,12 +71,13 @@ jobs:
 
       - name: Publish to Registry
         env:
-          S9USER: ${{ secrets.S9USER }}
-          S9PASS: ${{ secrets.S9PASS }}
+          S9DEVKEY: ${{ secrets.S9DEVKEY }}
           S9REGISTRY: ${{ secrets.S9REGISTRY }}
         run: |
-          if [[ -z "$S9USER" || -z "$S9PASS" || -z "$S9REGISTRY" ]]; then
-            echo "Publish skipped: missing registry credentials."
+          if [[ -z "$S9DEVKEY" || -z "$S9REGISTRY" ]]; then
+          echo "Publish skipped: One or both of S9DEVKEY and S9REGISTRY secrets are not set."
           else
-            start-sdk publish https://$S9USER:$S9PASS@$S9REGISTRY ${{ env.package_id }}.s9pk
+          echo "Publishing package to registry..."
+          start-cli --registry https://$S9REGISTRY registry package add ${{ env.package_id }}.s9pk ${{ github.server_url }}/${{ github.repository }}/releases/download/${{ github.ref_name }}/${{ env.package_id }}.s9pk
           fi
+        shell: bash

.gitignore

@@ -1,7 +1,8 @@
-manager/target/
-**/*.rs.bk
 *.s9pk
+startos/*.js
+node_modules/
 .DS_Store
 .vscode/
-scripts/embassy.js
-docker-images/
+docker-images
+javascript
+ncc-cache

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "bitcoin"]
 	path = bitcoin
-	url = https://github.com/bitcoin/bitcoin
+	url = git@github.com:bitcoin/bitcoin.git

Dockerfile

@@ -1,18 +1,9 @@
-# From https://github.com/ruimarinho/docker-bitcoin-core
-
-# Build stage for BerkeleyDB
-ARG PLATFORM
-
-FROM lncm/berkeleydb:db-4.8.30.NC-${PLATFORM} AS berkeleydb
-
 # Build stage for Bitcoin Core
 FROM alpine:3.21 AS bitcoin-core
 
-COPY --from=berkeleydb /opt /opt
-
 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 \
+        cmake \
         automake \
         boost-dev \
         build-base \
@@ -25,41 +16,45 @@ RUN apk --no-cache add \
         libtool \
         linux-headers \
         sqlite-dev \
-        zeromq-dev
+        zeromq-dev \
+        bash \
+        curl
 
 ADD ./bitcoin /bitcoin
 
 ENV BITCOIN_PREFIX=/opt/bitcoin
 
 WORKDIR /bitcoin
 
-RUN ./autogen.sh
-RUN ./configure LDFLAGS=-L`ls -d /opt/db*`/lib/ CPPFLAGS=-I`ls -d /opt/db*`/include/ \
+RUN make -C depends NO_BOOST=1 NO_LIBEVENT=1 NO_QT=1 NO_SQLITE=1 NO_UPNP=1 NO_ZMQ=1 NO_USDT=1
+
+RUN cmake -B build -DCMAKE_LD_FLAGS=-L`ls -d /opt/db*`/lib/ -DCMAKE_CPP_FLAGS=-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.
   # CXXFLAGS="--param ggc-min-expand=1 --param ggc-min-heapsize=32768" \
-  CXXFLAGS="-O1" \
-  CXX=clang++ CC=clang \
-  --prefix=${BITCOIN_PREFIX} \
-  --disable-man \
-  --disable-tests \
-  --disable-bench \
-  --disable-ccache \
-  --with-gui=no \
-  --with-utils \
-  --with-libs \
-  --with-sqlite=yes \
-  --with-daemon
-RUN make -j$(nproc)
-RUN make install
+  -DENABLE_IPC=OFF \
+  -DCMAKE_CXX_FLAGS="-O2" \
+  -DCMAKE_CXX=clang++ CC=clang \
+  -DCMAKE_INSTALL_PREFIX=${BITCOIN_PREFIX} \
+  -DINSTALL_MAN=OFF \
+  -DBUILD_TESTS=OFF \
+  -DBUILD_BENCH=OFF \
+  -DWITH_CCACHE=OFF \
+  -DBUILD_GUI=OFF \
+  #--with-utils \
+  -DBUILD_CLI=ON \
+  -DBUILD_BITCOINCONSENSUS_LIB=ON \
+  -DWITH_SQLITE=ON \
+  -DBUILD_DAEMON=ON \
+  -DENABLE_HARDENING=ON \
+  -DREDUCE_EXPORTS=ON \
+  -DWITH_ZMQ=ON
+RUN cmake --build build -j$(nproc)
+RUN cmake --install build
 RUN strip ${BITCOIN_PREFIX}/bin/*
 
 # Build stage for compiled artifacts
 FROM alpine:3.21
 
-LABEL maintainer.0="João Fonseca (@joaopaulofonseca)" \
-  maintainer.1="Pedro Branco (@pedrobranco)" \
-  maintainer.2="Rui Marinho (@ruimarinho)" \
-  maintainer.3="Aiden McClelland (@dr-bonez)"
 
 RUN sed -i 's/http\:\/\/dl-cdn.alpinelinux.org/https\:\/\/alpine.global.ssl.fastly.net/g' /etc/apk/repositories
 RUN apk --no-cache add \
@@ -69,7 +64,8 @@ RUN apk --no-cache add \
   libzmq \
   sqlite-dev \
   tini \
-  yq
+  yq \
+  jq \
 RUN rm -rf /var/cache/apk/*
 
 ARG ARCH
@@ -79,17 +75,5 @@ ENV BITCOIN_PREFIX=/opt/bitcoin
 ENV PATH=${BITCOIN_PREFIX}/bin:$PATH
 
 COPY --from=bitcoin-core /opt /opt
-COPY ./manager/target/${ARCH}-unknown-linux-musl/release/bitcoind-manager \
-     ./docker_entrypoint.sh \
-     ./actions/reindex.sh \
-     ./actions/reindex_chainstate.sh \
-     ./check-rpc.sh \
-     ./check-synced.sh \
-     /usr/local/bin/
-
-RUN chmod a+x /usr/local/bin/bitcoind-manager \
-    /usr/local/bin/*.sh
-
-EXPOSE 8332 8333
 
-ENTRYPOINT ["/usr/local/bin/docker_entrypoint.sh"]
+EXPOSE 8332 8333

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2011-2025 The Bootstrap Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.