fix(deps): lift btcd off the vulnerable v0.22.3 downgrade pin

.github/workflows/client.yml

@@ -61,6 +61,56 @@ jobs:
             path-filter:
               - './config/_electrum_urls/**'
               - './pkg/bitcoin/electrum/**'
+  btcec-vendor-byte-identity:
+    # Enforces the VENDOR.md byte-identity recipe and runs the
+    # vendored upstream test suite. The root module's `go test ./...`
+    # cannot reach third_party/btcsuite/btcec (it is its own Go
+    # module), so this job is the only automated gate. Cheap (checkout
+    # + go install + two short steps) and runs on every event, every
+    # branch - gating by path was producing broken `if:` combinations
+    # with no upside.
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.24.1'
+
+      - name: Verify vendored btcec byte identity vs upstream v0.22.3
+        run: |
+          set -e
+          go mod download github.com/btcsuite/btcd@v0.22.3
+          upstream="$(go env GOMODCACHE)/github.com/btcsuite/btcd@v0.22.3/btcec"
+          rm -rf /tmp/btcec-upstream
+          cp -R "$upstream" /tmp/btcec-upstream
+          chmod -R u+w /tmp/btcec-upstream
+          gofmt -w /tmp/btcec-upstream
+
+          # Hash manifest comparison: every file in the upstream tree
+          # (minus the four vendoring-only files) must match the
+          # vendored copy byte-for-byte, and the file set must match
+          # exactly. Two small text streams reach `diff`, so this is
+          # tool-independent (BusyBox and GNU diff both handle it)
+          # and a non-zero exit is the gate directly.
+          manifest() {
+            ( cd "$1" && find . -type f \
+                ! -name go.mod ! -name go.sum ! -name LICENSE ! -name VENDOR.md \
+                -print0 | sort -z | xargs -0 sha256sum )
+          }
+          manifest /tmp/btcec-upstream | sort > /tmp/up.txt
+          manifest third_party/btcsuite/btcec | sort > /tmp/vend.txt
+          if ! diff -q /tmp/up.txt /tmp/vend.txt > /dev/null; then
+            echo '::error::Vendored btcec differs from upstream v0.22.3 beyond the four vendoring-only files:'
+            diff /tmp/up.txt /tmp/vend.txt | head -40
+            exit 1
+          fi
+          echo 'byte-identity OK'
+
+      - name: Run vendored btcec test suite
+        run: |
+          cd third_party/btcsuite/btcec && go test ./...
 
   client-build-test-publish:
     needs: client-detect-changes

Dockerfile

@@ -32,8 +32,11 @@ RUN mkdir -p $APP_DIR $TEST_RESULTS_DIR
 
 WORKDIR $APP_DIR
 
-# Get dependencies.
+# Get dependencies. The third_party directory holds an in-tree module served
+# by a directory `replace` in go.mod, so it must be present before the module
+# graph can be resolved.
 COPY go.mod go.sum $APP_DIR/
+COPY ./third_party $APP_DIR/third_party
 RUN go mod download
 
 # Copy source code for generation.

go.mod

@@ -6,11 +6,18 @@ toolchain go1.24.1
 
 replace (
 	github.com/bnb-chain/tss-lib => github.com/threshold-network/tss-lib v0.0.0-20230901144531-2e712689cfbe
-	// btcd in version v.0.23 extracted `btcd/btcec` to a separate package `btcd/btcec/v2`.
-	// Some of the dependencies still require the old version, which we workaround
-	// here:
-	github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.3
-	github.com/btcsuite/btcd/v2 => github.com/btcsuite/btcd v0.23.4
+	// btcd v0.23 extracted `btcd/btcec` into the separate module `btcd/btcec/v2`
+	// and later btcd versions no longer ship the pre-split package. The tss-lib
+	// fork (replace above) and first-party key-handling code still import the
+	// pre-split `btcd/btcec` path, so that single package is served from an
+	// in-tree copy of the btcec sources from btcd v0.22.3 (unmodified except
+	// for a mechanical gofmt pass — see third_party/btcsuite/btcec/VENDOR.md
+	// for provenance and verification). This lets the main btcd module stay
+	// on a current, fully patched release instead of being downgraded to v0.22.3
+	// for btcec's sake, which reintroduced fixed security advisories
+	// (GO-2022-1098, GO-2024-2818, GO-2024-3189) into the Bitcoin consensus,
+	// wire, and script packages.
+	github.com/btcsuite/btcd/btcec => ./third_party/btcsuite/btcec
 	github.com/checksum0/go-electrum => github.com/keep-network/go-electrum v0.0.0-20240206170935-6038cb594daa
 	github.com/keep-network/keep-common => github.com/threshold-network/keep-common v1.7.1-tlabs.0
 	// Temporary replacement until v1.28.2 is released containing `protodelim` package.
@@ -20,11 +27,23 @@ replace (
 
 require (
 	github.com/bnb-chain/tss-lib v1.3.5
-	github.com/btcsuite/btcd v0.23.2
+	// v0.24.2 is the lowest release that fixes every advisory open against the
+	// former v0.22.3 pin, and going higher is not currently possible:
+	//
+	//   - v0.25.0 requires btcec/v2 v2.3.5, and btcec/v2 v2.3.4 changed
+	//     `ecdsa.SignCompact` to drop its error return. go-ethereum v1.13.15
+	//     calls the two-value form in crypto/signature_nocgo.go, so pulling
+	//     btcec/v2 that far forward breaks every cgo-less build (notably the
+	//     cross-compiled release binaries). Raising btcd past v0.24.2 requires
+	//     upgrading go-ethereum first.
+	//   - v0.26 additionally moved wire, txscript and chaincfg into separate
+	//     /v2 modules and dropped the plain import paths that the go-electrum
+	//     and tss-lib forks above use.
+	github.com/btcsuite/btcd v0.24.2
+	github.com/btcsuite/btcd/btcec v0.0.0-00010101000000-000000000000
 	github.com/btcsuite/btcd/btcec/v2 v2.2.0
-	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1
-	github.com/btcsuite/btcd/v2 v2.0.0-00010101000000-000000000000
-	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
+	github.com/btcsuite/btcd/btcutil v1.1.5
+	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
 	github.com/checksum0/go-electrum v0.0.0-20220912200153-b862ac442cf9
 	github.com/ethereum/go-ethereum v1.13.15
 	github.com/ferranbt/fastssz v0.1.2
@@ -60,7 +79,9 @@ require (
 )
 
 require (
+	github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pion/datachannel v1.5.10 // indirect
@@ -81,6 +102,7 @@ require (
 	github.com/pion/turn/v2 v2.1.6 // indirect
 	github.com/pion/webrtc/v3 v3.3.5 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/stretchr/testify v1.11.1 // indirect
 	github.com/wlynxg/anet v0.0.5 // indirect
 )
@@ -93,7 +115,6 @@ require (
 	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.10.0 // indirect
-	github.com/btcsuite/btcd/btcutil v1.1.1 // indirect
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/consensys/bavard v0.1.13 // indirect