shinghim · shinghim · Dec 21, 2025 · Dec 9, 2025 · Dec 9, 2025 · Dec 9, 2025
diff --git a/.cargo/mutants.toml b/.cargo/mutants.toml
@@ -26,8 +26,10 @@ exclude_re = [
     "units/.* FeeRate::fee_vb", # Deprecated
     "units/.* FeeRate::fee_wu", # Deprecated
     "units/.* SignedAmount::checked_abs", # Deprecated
+    "units/.* NumberOfBlocks::to_consensus_u32", # Deprecated
     "units/.* NumberOfBlocks::value", # Deprecated
     "units/.* NumberOf512Seconds::to_consensus_u32", # Deprecated
+    "units/.* NumberOf512Seconds::value", # Deprecated
     "units/.* MedianTimePast::to_consensus_u32", # Deprecated
     "units/.* Height::to_consensus_u32", # Deprecated
     "units/.* Sequence::to_hex", # Deprecated

diff --git a/.github/docker/Dockerfile.s390x b/.github/docker/Dockerfile.s390x
@@ -0,0 +1,37 @@
+FROM ubuntu:24.04
+
+# Install both native (x86_64) and cross (s390x) compilation toolchains
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    gcc g++ \
+    gcc-13-s390x-linux-gnu \
+    g++-13-s390x-linux-gnu \
+    libc6-dev-s390x-cross \
+    qemu-user-static \
+    binfmt-support \
+    curl \
+    ca-certificates && \
+    rm -rf /var/lib/apt/lists/*
+
+# Set up alternatives to use GCC 13 for s390x
+RUN update-alternatives --install /usr/bin/s390x-linux-gnu-gcc s390x-linux-gnu-gcc /usr/bin/s390x-linux-gnu-gcc-13 100 && \
+    update-alternatives --install /usr/bin/s390x-linux-gnu-g++ s390x-linux-gnu-g++ /usr/bin/s390x-linux-gnu-g++-13 100
+
+# Register QEMU for s390x binary execution
+RUN update-binfmts --enable qemu-s390x || true
+
+# Verify GCC versions
+RUN gcc --version && \
+    s390x-linux-gnu-gcc --version && \
+    s390x-linux-gnu-g++ --version
+
+# Install Rust
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal
+ENV PATH="/root/.cargo/bin:${PATH}"
+RUN rustup target add s390x-unknown-linux-gnu
+
+# Set up cross-compilation environment
+ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \
+    CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_RUNNER="qemu-s390x-static -L /usr/s390x-linux-gnu" \
+    CC_s390x_unknown_linux_gnu=s390x-linux-gnu-gcc \
+    CXX_s390x_unknown_linux_gnu=s390x-linux-gnu-g++
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -262,11 +262,15 @@ jobs:
           persist-credentials: false
       - name: "Select toolchain"
         uses: dtolnay/rust-toolchain@5d458579430fc14a04a08a1e7d3694f545e91ce6 # stable
-      - name: "Add architecture i386"
+      - name: "Add architecture i386 and install dependencies"
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update -y
-          sudo apt-get install -y gcc-multilib g++-multilib
+          sudo apt-get install -y \
+            gcc-multilib \
+            g++-multilib \
+            libc6-dev-i386 \
+            lib32stdc++-13-dev
       - name: "Install i686 gcc"
         run: sudo apt-get update -y && sudo apt-get install -y gcc-multilib
       - name: "Install target"

diff --git a/.github/workflows/stable-version b/.github/workflows/stable-version
@@ -1 +1 @@
-1.91.1
+1.92.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,6 +13,13 @@ changes to this document in a pull request.
 - [General](#general)
 - [Communication channels](#communication-channels)
 - [Asking questions](#asking-questions)
+- [Getting Started](#getting-started)
+  * [Installing Rust](#installing-rust)
+  * [Building](#building)
+- [Development Tools](#development-tools)
+  * [Just](#just)
+  * [Githooks](#githooks)
+  * [Building the docs](#building-the-docs)
 - [Contribution workflow](#contribution-workflow)
   * [Preparing PRs](#preparing-prs)
   * [Peer review](#peer-review)
@@ -25,6 +32,10 @@ changes to this document in a pull request.
   * [Policy](#policy)
 - [Security](#security)
 - [Testing](#testing)
+  * [Unit/Integration tests](#unitintegration-tests)
+  * [Benchmarks](#benchmarks)
+  * [Mutation tests](#mutation-tests)
+  * [Code verification](#code-verification)
 - [Going further](#going-further)
 
 
@@ -68,6 +79,58 @@ We have a dedicated developer channel on IRC, #bitcoin-rust@libera.chat where
 you may get helpful advice if you have questions.
 
 
+## Getting Started
+
+### Installing Rust
+
+Rust can be installed using your package manager of choice or [rustup.rs](https://rustup.rs). The
+former way is considered more secure since it typically doesn't involve trust in the CA system. But
+you should be aware that the version of Rust shipped by your distribution might be out of date.
+Generally this isn't a problem for `rust-bitcoin` since we support much older versions than the
+current stable one (see MSRV section in [README.md](./README.md)).
+
+### Building
+
+The library can be built and tested using [`cargo`](https://github.com/rust-lang/cargo/):
+
+```
+git clone git@github.com:rust-bitcoin/rust-bitcoin.git
+cd rust-bitcoin
+cargo build
+```
+
+You can run tests with:
+
+```
+cargo test
+```
+
+Please refer to the [`cargo` documentation](https://doc.rust-lang.org/stable/cargo/) for more
+detailed instructions.
+
+
+## Development Tools
+
+### Just
+
+We support [`just`](https://just.systems/man/en/) for running dev workflow commands. Run `just` from
+your shell to see a list of available sub-commands.
+
+### Githooks
+
+To assist devs in catching errors _before_ running CI we provide some githooks. Copy the hooks in `githooks/`
+to your githooks folder or run `just githooks-install` to copy them all.
+
+### Building the docs
+
+We build docs with the nightly toolchain, you may wish to use the following shell alias to check
+your documentation changes build correctly.
+
+```
+alias build-docs='RUSTDOCFLAGS="--cfg docsrs" cargo +nightly rustdoc --features="$FEATURES" -- -D rustdoc::broken-intra-doc-links'
+```
+
+
 ## Contribution workflow
 
 The codebase is maintained using the "contributor workflow" where everyone
@@ -248,8 +311,36 @@ seriously. Due to the modular nature of the project, writing new test cases is
 easy and good test coverage of the codebase is an important goal. Refactoring
 the project to enable fine-grained unit testing is also an ongoing effort.
 
-Various methods of testing are in use (e.g. fuzzing, mutation), please see
-the [readme](./README.md) for more information.
+Unit and integration tests are available for those interested, along with benchmarks. For project
+developers, especially new contributors looking for something to work on, we do:
+
+- Fuzz testing with [`Honggfuzz`](https://github.com/rust-fuzz/honggfuzz-rs)
+- Mutation testing with [`cargo-mutants`](https://github.com/sourcefrog/cargo-mutants)
+- Code verification with [`Kani`](https://github.com/model-checking/kani)
+
+There are always more tests to write and more bugs to find. PRs are extremely welcomed.
+Please consider testing code as a first-class citizen. We definitely do take PRs
+improving and cleaning up test code.
+
+### Unit/Integration tests
+
+Run as for any other Rust project `cargo test --all-features`.
+
+### Benchmarks
+
+We use a custom Rust compiler configuration conditional to guard the bench mark code. To run the
+bench marks use: `RUSTFLAGS='--cfg=bench' cargo +nightly bench`.
+
+### Mutation tests
+
+We are doing mutation testing with [cargo-mutants](https://github.com/sourcefrog/cargo-mutants). To run
+these tests first install with `cargo install --locked cargo-mutants` then run with `cargo mutants --in-place --no-shuffle`.
+Note that running these mutation tests will take on the order of 10's of minutes.
+
+### Code verification
+
+We have started using [kani](https://github.com/model-checking/kani), install with `cargo install --locked kani-verifier`
+ (no need to run `cargo kani setup`). Run the tests with `cargo kani`.
 
 
 ## LLMs, GitHub bot accounts, and AI agents

diff --git a/Cargo-minimal.lock b/Cargo-minimal.lock
@@ -47,13 +47,14 @@ dependencies = [
 
 [[package]]
 name = "bitcoin"
-version = "0.33.0-alpha.0"
+version = "0.33.0-beta.0"
 dependencies = [
  "arbitrary",
  "base58ck",
  "base64",
  "bech32",
  "bincode",
+ "bitcoin-consensus-encoding",
  "bitcoin-internals",
  "bitcoin-io",
  "bitcoin-primitives",
@@ -72,6 +73,10 @@ dependencies = [
 name = "bitcoin-addresses"
 version = "0.0.0"
 
+[[package]]
+name = "bitcoin-bip158"
+version = "0.0.0"
+
 [[package]]
 name = "bitcoin-consensus-encoding"
 version = "1.0.0-rc.2"
@@ -126,6 +131,7 @@ dependencies = [
  "bitcoin-consensus-encoding",
  "bitcoin-internals",
  "bitcoin-io",
+ "bitcoin-primitives",
  "bitcoin-units",
  "bitcoin_hashes",
  "hex-conservative 0.3.0",
@@ -134,10 +140,9 @@ dependencies = [
 
 [[package]]
 name = "bitcoin-primitives"
-version = "1.0.0-rc.0"
+version = "1.0.0-rc.1"
 dependencies = [
  "arbitrary",
- "arrayvec",
  "bincode",
  "bitcoin-consensus-encoding",
  "bitcoin-internals",
@@ -197,15 +202,9 @@ checksum = "60f0b0d4c0a382d2734228fd12b5a6b5dac185c60e938026fd31b265b94f9bd2"
 
 [[package]]
 name = "cc"
-version = "1.2.47"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd405d82c84ff7f35739f175f67d8b9fb7687a0e84ccdc78bd3568839827cf07"
-dependencies = [
- "find-msvc-tools",
- "jobserver",
- "libc",
- "shlex",
-]
+checksum = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
 
 [[package]]
 name = "cfg-if"
@@ -220,12 +219,6 @@ dependencies = [
  "hex-conservative 0.3.0",
 ]
 
-[[package]]
-name = "find-msvc-tools"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
-
 [[package]]
 name = "getrandom"
 version = "0.3.0"
@@ -265,15 +258,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
 
-[[package]]
-name = "jobserver"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "libc"
 version = "0.2.155"
@@ -282,9 +266,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libfuzzer-sys"
-version = "0.4.10"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
+checksum = "86c975d637bc2a2f99440932b731491fc34c7f785d239e38af3addd3c2fd0e46"
 dependencies = [
  "arbitrary",
  "cc",
@@ -411,12 +395,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
 [[package]]
 name = "standard_test"
 version = "0.1.0"