Merge branch 'main' into fix/wallet-seed-rng-osrng-286

Author: satyakwok

.github/workflows/build_and_lint.yml

@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - dev
+      - main
   pull_request:
     branches:
       - main

.github/workflows/integration_test.yml

@@ -2,7 +2,6 @@ on:
   push:
     branches:
       - main
-      - dev
   pull_request:
     branches:
       - main
@@ -14,6 +13,10 @@ env:
   # rippled binary was renamed to xrpld; use the new image name.
   # Tracks xrpl.js PR #3270 (https://github.com/XRPLF/xrpl.js/pull/3270).
   XRPLD_DOCKER_IMAGE: rippleci/xrpld:develop
+  # Files measured by the integration coverage gate are the inverse of this regex.
+  # Unit-test territory (models, core, utils, _serde) is excluded; integration territory
+  # (CLI, asynch::clients, account/, ledger/, transaction/, faucet) is what remains.
+  COVERAGE_IGNORE_REGEX: '(_serde|core|models|utils)/|constants\.rs$|macros\.rs$|lib\.rs$|wallet/(mod|exceptions)\.rs$|tests/'
 
 jobs:
   integration_test:
@@ -31,12 +34,17 @@ jobs:
             --rm \
             --publish 5005:5005 \
             --publish 6006:6006 \
-            --volume "${{ github.workspace }}/.ci-config/":"/etc/opt/xrpld/" \
+            --volume "${{ github.workspace }}/.ci-config/":"/etc/xrpld/" \
             --name xrpld-service \
             ${{ env.XRPLD_DOCKER_IMAGE }} --standalone
 
       - uses: dtolnay/rust-toolchain@stable
 
+      - name: Install cargo-llvm-cov
+        uses: taiki-e/install-action@65851e10cd6c377f11a60e600abc07cb08643468 # v2.79.3
+        with:
+          tool: cargo-llvm-cov
+
       - name: Cache cargo registry
         uses: actions/cache@v4
         with:
@@ -48,11 +56,40 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-cargo-integration-
 
-      - name: Run integration tests
-        run: cargo test --release --features std,json-rpc,helpers,integration --test integration_test -- --test-threads=1
+      - name: Run integration tests under coverage
+        run: |
+          cargo llvm-cov --no-report --release \
+            --features std,json-rpc,helpers,cli,websocket,integration \
+            --test integration_test \
+            --test cli_integration \
+            --test funding \
+            --test utils \
+            --test test_utils \
+            -- --test-threads=1
         env:
           RUST_BACKTRACE: 1
 
+      - name: Generate lcov report (scoped to integration territory)
+        run: |
+          cargo llvm-cov report --release \
+            --lcov --output-path lcov.info \
+            --ignore-filename-regex '${{ env.COVERAGE_IGNORE_REGEX }}'
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5.5.4
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: lcov.info
+          flags: integration
+          fail_ci_if_error: true
+
+      - name: Upload coverage report
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: integration-lcov-report
+          path: lcov.info
+
       - name: Dump xrpld logs and stop container
         if: always()
         run: |

.github/workflows/quality_test.yml

@@ -1,13 +1,13 @@
 on:
   push:
     branches:
-      - dev
+      - main
   pull_request:
     branches:
       - main
       - dev
   schedule:
-    - cron: '0 0 * * *'
+    - cron: "0 0 * * *"
 
 name: Quality Check
 

.github/workflows/unit_test.yml

@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - dev
+      - main
   pull_request:
     branches:
       - main
@@ -34,22 +34,44 @@ jobs:
           RUST_BACKTRACE: 1
 
       - name: Test for no_std
-        run: cargo test --release --no-default-features --features embassy-rt,core,utils,wallet,models,helpers,websocket,json-rpc
+        run: cargo test --release --no-default-features --features
+          embassy-rt,core,utils,wallet,models,helpers,websocket,json-rpc
         env:
           RUST_BACKTRACE: 1
 
       - name: Install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
 
+      # Unit-test coverage is scoped via Cargo features rather than path
+      # exclusion. The minimal feature set (`std,core,utils,wallet,models`)
+      # compiles only the pure-logic modules — pure crypto, codec, address
+      # codec, transaction models, and the `signing` module. Integration-
+      # territory code (CLI, async network clients, sync wrappers around
+      # network calls, faucet client) is gated behind `helpers`/`json-rpc`/
+      # `websocket`/`cli` features, so it simply isn't compiled here and
+      # doesn't appear in the coverage report. Those files are exercised by
+      # the integration-test workflow against a live rippled.
       - name: Generate coverage report
-        run: cargo llvm-cov --lcov --output-path lcov.info
+        run: |
+          cargo llvm-cov \
+            --no-default-features --features std,core,utils,wallet,models \
+            --lcov --output-path lcov.info
 
       - name: Check coverage thresholds
         run: |
           cargo llvm-cov --summary-only \
-            --fail-under-lines 73 \
-            --fail-under-regions 75 \
-            --fail-under-functions 67
+            --no-default-features --features std,core,utils,wallet,models \
+            --fail-under-lines 83 \
+            --fail-under-regions 85 \
+            --fail-under-functions 73
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: lcov.info
+          flags: unit
+          fail_ci_if_error: true
 
       - name: Upload coverage report
         uses: actions/upload-artifact@v4

CHANGELOG.md

@@ -14,8 +14,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- New `xrpl::signing` module containing the pure-crypto signing helpers (`sign`, `multisign`, `prepare_transaction`) extracted from `asynch::transaction` and `transaction`. Available with just `core + models + wallet` features (no `helpers`/runtime/client dependency). The legacy paths `asynch::transaction::sign` and `transaction::multisign` are preserved as re-exports for backward compatibility.
+- Expanded unit-test coverage and raised CI thresholds: lines `73 → 83`, regions `75 → 85`, functions `67 → 73`.
+- Codecov integration with per-PR project (≥83%) and patch (≥80% on new/modified lines) gates.
+- Integration-test coverage gate: a CI workflow runs all five integration test binaries under `cargo-llvm-cov`, uploads to codecov under an `integration` flag, and gates the project at ≥65%.
+
+### Changed
+
+- Unit-test and integration-test coverage are now scoped via Cargo feature flags rather than path regex. The unit-test workflow builds with `--no-default-features --features std,core,utils,wallet,models`, so integration-territory code (CLI, async clients, sync wrappers, faucet) simply isn't compiled and doesn't appear in the unit coverage report.
+- Network-dependent inline tests in `src/asynch/transaction/` and `src/asynch/wallet/` (`test_autofill_txn`, `test_autofill_and_sign`, `test_submit_and_wait`, `test_generate_faucet_wallet`) are now gated behind `feature = "integration"` so `cargo test --release` is hermetic by default.
+- Codecov **patch** coverage is now gated per flag (separate `unit` and `integration` sections) rather than a single combined gate.
+
 ### Fixed
 
+- `RipplePathFind::destination_amount` changed from `Currency<'a>` to `Amount<'a>` to match the XRPL wire format.
+- `NoRippleCheckRole` no longer serializes with the `#[serde(tag = "role")]` discriminator; now emits a plain `snake_case` string matching the XRPL wire format.
+- `is_success()` now reports success correctly for responses deserialized into typed `XRPLResult` variants (e.g. `ServerInfo`); it consults the preserved raw result JSON instead of the re-serialized typed value.
+- `get_latest_open_ledger_sequence` now uses the `ledger_current` request; it previously sent `ledger { ledger_index: "open" }`, which rippled rejects with `invalidParams`.
+
 ## [[v1.1.0]]
 
 ### Added

CONTRIBUTING.md

@@ -74,24 +74,33 @@ From the `xrpl-rust` folder, run the following commands:
 ```bash
 # Sets up the xrpld standalone Docker container — skip if you already have it running
 docker run -p 5005:5005 -p 6006:6006 --rm -it --name xrpld_standalone \
-  --volume "$PWD/.ci-config/:/etc/opt/xrpld/" \
+  --volume "$PWD/.ci-config/:/etc/xrpld/" \
   rippleci/xrpld:develop --standalone
-cargo test --release --features integration,std,json-rpc,helpers
+cargo test --release \
+  --features std,json-rpc,helpers,cli,websocket,integration \
+  -- --test-threads=1
 ```
 
 To run a specific group of tests (e.g. escrow):
 
 ```bash
-cargo test --release --features integration,std,json-rpc,helpers escrow
+cargo test --release \
+  --features std,json-rpc,helpers,cli,websocket,integration \
+  escrow -- --test-threads=1
 ```
 
+The feature set matches `.github/workflows/integration_test.yml`; `cli` and
+`websocket` are required for `cli_integration.rs` and the websocket tests in
+`utils.rs` to compile. `--test-threads=1` matches CI and prevents concurrent
+tests from racing on the shared `xrpld` container.
+
 Breaking down the `docker run` command:
 
 - `-p 5005:5005 -p 6006:6006` exposes the HTTP JSON-RPC and WebSocket admin ports.
 - `--rm` closes the container automatically when it exits.
 - `-it` keeps stdin open so you can stop the node with Ctrl-C.
 - `--name xrpld_standalone` is an instance name for clarity.
-- `--volume $PWD/.ci-config/:/etc/opt/xrpld/`: bind-mounts the host directory (left side) into the container (right side). `xrpld.cfg` lives in `$PWD/.ci-config/`, and this command is intended to be run from the root of the `xrpl-rust` project. The `xrpld` binary searches for its configuration file inside `/etc/opt/xrpld/`. An absolute path is required, so we use `$PWD` instead of `./`.
+- `--volume $PWD/.ci-config/:/etc/xrpld/`: bind-mounts the host directory (left side) into the container (right side). `xrpld.cfg` lives in `$PWD/.ci-config/`, and this command is intended to be run from the root of the `xrpl-rust` project. The `xrpld` binary searches for its configuration file inside `/etc/xrpld/`. An absolute path is required, so we use `$PWD` instead of `./`.
 - `rippleci/xrpld` is an image that is regularly updated with the latest `xrpld` releases (the binary formerly known as `rippled`; see xrpl.js PR #3270).
 - `--standalone` starts `xrpld` in standalone mode, where ledgers only close on demand.
 
@@ -102,24 +111,69 @@ Breaking down the `docker run` command:
 
 ### Coverage
 
-Coverage is measured with [`cargo-llvm-cov`](https://github.com/taiki-e/cargo-llvm-cov).
+Coverage is measured with [`cargo-llvm-cov`](https://github.com/taiki-e/cargo-llvm-cov)
+and uploaded to codecov under two separate flags:
+
+- **unit** — pure-logic code (models, core, utils, `_serde`, signing). Built
+  with a minimal feature set so network-bound modules are not compiled.
+- **integration** — network-bound code (CLI, async clients, faucet, helpers
+  under `account/`, `ledger/`, `transaction/`). Scoped via
+  `--ignore-filename-regex` so unit-territory files do not dilute the
+  integration metric.
 
-Install the tool and run a coverage report locally:
+Install the tool once:
 
 ```bash
 cargo install cargo-llvm-cov --locked
-cargo llvm-cov --summary-only
 ```
 
-The CI enforces the following minimum thresholds (current baseline is ~78% lines / ~68% regions / ~75% functions, measured with default features only — integration tests are excluded from coverage):
+#### Unit coverage
+
+Matches `.github/workflows/unit_test.yml`:
+
+```bash
+cargo llvm-cov \
+  --no-default-features --features std,core,utils,wallet,models \
+  --summary-only \
+  --fail-under-lines 83 \
+  --fail-under-regions 85 \
+  --fail-under-functions 73
+```
+
+The `--fail-under-*` flags mirror the thresholds CI enforces:
+
+| Metric    | Threshold |
+| --------- | --------- |
+| Lines     | 83%       |
+| Regions   | 85%       |
+| Functions | 73%       |
+
+#### Integration coverage
+
+Requires the standalone `xrpld` container running (see [Integration Tests](#integration-tests)).
+Matches `.github/workflows/integration_test.yml`:
+
+```bash
+# Collect coverage from the integration suite (writes raw profile data)
+cargo llvm-cov --no-report --release \
+  --features std,json-rpc,helpers,cli,websocket,integration \
+  --test integration_test --test cli_integration --test funding \
+  --test utils --test test_utils \
+  -- --test-threads=1
+
+# Generate lcov scoped to integration territory
+cargo llvm-cov report --release --lcov --output-path lcov.info \
+  --ignore-filename-regex '(_serde|core|models|utils)/|constants\.rs$|macros\.rs$|lib\.rs$|wallet/(mod|exceptions)\.rs$|tests/'
+```
+
+The codecov integration target is 65%. The `--ignore-filename-regex` value
+mirrors `COVERAGE_IGNORE_REGEX` in the workflow; without it the integration
+metric would be dominated by unit-territory files the integration suite is
+not designed to exercise.
 
-| Metric    | Minimum |
-|-----------|---------|
-| Lines     | 75%     |
-| Regions   | 65%     |
-| Functions | 72%     |
+#### HTML report
 
-To generate an HTML report and open it in a browser:
+For local exploration:
 
 ```bash
 cargo llvm-cov --open

codecov.yml

@@ -0,0 +1,36 @@
+coverage:
+  status:
+    project:
+      default:
+        target: 83%
+        threshold: 1%
+        flags:
+          - unit
+      integration:
+        target: 65%
+        threshold: 1%
+        flags:
+          - integration
+    patch:
+      default:
+        target: 80%
+        threshold: 1%
+        flags:
+          - unit
+      integration:
+        target: 80%
+        threshold: 1%
+        flags:
+          - integration
+
+comment:
+  layout: "reach, diff, flags, files"
+  require_changes: false
+
+flags:
+  unit:
+    paths:
+      - src/
+  integration:
+    paths:
+      - src/

docker-compose.yml

@@ -4,7 +4,7 @@ services:
   xrpld:
     image: rippleci/xrpld:develop
     volumes:
-      - ./.ci-config:/etc/opt/xrpld
+      - ./.ci-config:/etc/xrpld
     ports:
       - "5005:5005"
       - "6006:6006"