Merge branch 'main' into feat/xls-65-single-asset-vault

Author: ckeshava

.ci-config/rippled.cfg .ci-config/xrpld.cfg.ci-config/rippled.cfg renamed to .ci-config/xrpld.cfg

@@ -43,7 +43,7 @@ small
 
 [node_db]
 type=NuDB
-path=/var/lib/rippled/db/nudb
+path=/var/lib/xrpld/db/nudb
 advisory_delete=0
 
 # How many ledgers do we want to keep (history)?
@@ -58,10 +58,10 @@ online_delete=256
 256
 
 [database_path]
-/var/lib/rippled/db
+/var/lib/xrpld/db
 
 [debug_logfile]
-/var/log/rippled/debug.log
+/var/log/xrpld/debug.log
 
 [network_id]
 0

.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
@@ -11,8 +10,14 @@ on:
 name: Integration Test
 
 env:
+<<<<<<< feat/xls-65-single-asset-vault
   # Pin to known-good digest; rippleci/rippled:develop broke after 2026-04-01
   RIPPLED_DOCKER_IMAGE: rippleci/rippled:develop@sha256:328175bf14b7b83db9e5e6b50c7458bf828b02b2855453efc038233094aa8d85
+=======
+  # 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
+>>>>>>> main
 
 jobs:
   integration_test:
@@ -23,25 +28,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Start rippled standalone
-        run: |
-          docker run --detach --rm \
-            -p 5005:5005 \
-            -p 6006:6006 \
-            --volume "${{ github.workspace }}/.ci-config/":"/etc/opt/ripple/" \
-            --name rippled-service \
-            --health-cmd="rippled server_info || exit 1" \
-            --health-interval=5s \
-            --health-retries=10 \
-            --health-timeout=2s \
-            --env GITHUB_ACTIONS=true \
-            --env CI=true \
-            --entrypoint bash \
-            ${{ env.RIPPLED_DOCKER_IMAGE }} \
-            -c "mkdir -p /var/lib/rippled/db/ && rippled -a"
-
-      - name: Wait for rippled to be healthy
+      - name: Run xrpld in standalone mode
         run: |
+<<<<<<< feat/xls-65-single-asset-vault
           for i in $(seq 1 30); do
             if ! docker ps -q -f name=rippled-service | grep -q .; then
               echo "Container exited unexpectedly"
@@ -58,6 +47,16 @@ jobs:
           echo "Timed out waiting for rippled"
           docker logs rippled-service 2>&1 || true
           exit 1
+=======
+          docker run \
+            --detach \
+            --rm \
+            --publish 5005:5005 \
+            --publish 6006:6006 \
+            --volume "${{ github.workspace }}/.ci-config/":"/etc/xrpld/" \
+            --name xrpld-service \
+            ${{ env.XRPLD_DOCKER_IMAGE }} --standalone
+>>>>>>> main
 
       - uses: dtolnay/rust-toolchain@stable
 
@@ -77,6 +76,8 @@ jobs:
         env:
           RUST_BACKTRACE: 1
 
-      - name: Stop rippled
+      - name: Dump xrpld logs and stop container
         if: always()
-        run: docker stop rippled-service
+        run: |
+          docker logs xrpld-service 2>&1 || echo "::warning::xrpld-service container not present for logs"
+          docker stop xrpld-service 2>/dev/null || true

.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,20 @@ 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.
+
+### 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.
+
 ### 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.
+
 ## [[v1.1.0]]
 
 ### Added

CONTRIBUTING.md

@@ -54,7 +54,7 @@ cargo clippy
 
 ### Running Tests
 
-For integration tests, we use a `rippled` node in standalone mode to test xrpl-rust code against. To set this up, you can either configure and run `rippled` locally, or set up the Docker container `rippleci/rippled` by [following these instructions](#integration-tests). The latter will require you to [install Docker](https://docs.docker.com/get-docker/).
+For integration tests, we use an `xrpld` node in standalone mode to test xrpl-rust code against. To set this up, you can either configure and run `xrpld` locally, or set up the Docker container `rippleci/xrpld` by [following these instructions](#integration-tests). The latter will require you to [install Docker](https://docs.docker.com/get-docker/).
 
 #### Unit Tests
 
@@ -72,10 +72,10 @@ cargo test --release --no-default-features --features embassy-rt,core,utils,wall
 From the `xrpl-rust` folder, run the following commands:
 
 ```bash
-# Sets up the rippled standalone Docker container — skip if you already have it running
-docker run -p 5005:5005 -p 6006:6006 --rm -it --name rippled_standalone \
-  --entrypoint bash rippleci/rippled:develop \
-  -c 'mkdir -p /var/lib/rippled/db/ && rippled -a'
+# 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/xrpld/" \
+  rippleci/xrpld:develop --standalone
 cargo test --release --features integration,std,json-rpc,helpers
 ```
 
@@ -90,11 +90,10 @@ 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 rippled_standalone` is an instance name for clarity.
-- `--volume $PWD/.ci-config:/etc/opt/ripple/` mounts `rippled.cfg` so the node binds on `0.0.0.0` and is reachable from the host. It must be an absolute path, so we use `$PWD` instead of `./`.
-- `rippleci/rippled` is an image that is regularly updated with the latest `rippled` releases.
-- `--entrypoint bash rippleci/rippled:develop` manually overrides the entrypoint (for the latest version of rippled on the `develop` branch).
-- `-c 'mkdir -p /var/lib/rippled/db/ && rippled -a'` starts `rippled` in standalone mode, where ledgers only close on demand.
+- `--name xrpld_standalone` is an instance name for clarity.
+- `--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.
 
 **Notes**
 
@@ -115,7 +114,7 @@ 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):
 
 | Metric    | Minimum |
-|-----------|---------|
+| --------- | ------- |
 | Lines     | 75%     |
 | Regions   | 65%     |
 | Functions | 72%     |

codecov.yml

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

docker-compose.yml

@@ -1,17 +1,16 @@
 version: "3"
 
 services:
-  rippled:
-    image: rippleci/rippled:develop
+  xrpld:
+    image: rippleci/xrpld:develop
     volumes:
-      - ./.ci-config:/etc/opt/ripple
+      - ./.ci-config:/etc/xrpld
     ports:
       - "5005:5005"
       - "6006:6006"
-    entrypoint: bash
-    command: -c "mkdir -p /var/lib/rippled/db/ && rippled -a"
+    command: ["--standalone"]
     healthcheck:
-      test: ["CMD", "rippled", "server_info"]
+      test: ["CMD", "xrpld", "server_info"]
       interval: 5s
       timeout: 2s
       retries: 10

src/asynch/exceptions.rs

@@ -4,25 +4,27 @@ use thiserror_no_std::Error;
 use super::clients::exceptions::XRPLClientException;
 #[cfg(feature = "helpers")]
 use super::{
-    transaction::exceptions::{
-        XRPLSignTransactionException, XRPLSubmitAndWaitException, XRPLTransactionHelperException,
-    },
+    transaction::exceptions::{XRPLSubmitAndWaitException, XRPLTransactionHelperException},
     wallet::exceptions::XRPLFaucetException,
 };
-#[cfg(feature = "helpers")]
+#[cfg(feature = "wallet")]
+use crate::wallet::exceptions::XRPLWalletException;
+// Available whenever `signing` is compiled (which requires core+models+wallet),
+// or whenever `helpers` is on — the former is a subset of the latter.
+#[cfg(all(feature = "core", feature = "models", feature = "wallet"))]
 use crate::{
     core::exceptions::XRPLCoreException,
     models::transactions::exceptions::XRPLTransactionFieldException,
-    transaction::exceptions::XRPLMultisignException, utils::exceptions::XRPLUtilsException,
-    wallet::exceptions::XRPLWalletException,
+    signing::exceptions::{XRPLMultisignException, XRPLSignTransactionException},
+    utils::exceptions::XRPLUtilsException,
 };
 use crate::{models::XRPLModelException, XRPLSerdeJsonError};
 
 pub type XRPLHelperResult<T, E = XRPLHelperException> = core::result::Result<T, E>;
 
 #[derive(Debug, Error)]
 pub enum XRPLHelperException {
-    #[cfg(feature = "helpers")]
+    #[cfg(feature = "wallet")]
     #[error("XRPL Wallet error: {0}")]
     XRPLWalletError(#[from] XRPLWalletException),
     #[cfg(feature = "helpers")]
@@ -33,18 +35,21 @@ pub enum XRPLHelperException {
     XRPLTransactionHelperError(#[from] XRPLTransactionHelperException),
     #[error("XRPL Model error: {0}")]
     XRPLModelError(#[from] XRPLModelException),
-    #[cfg(feature = "helpers")]
+    #[cfg(all(feature = "core", feature = "models", feature = "wallet"))]
     #[error("XRPL Core error: {0}")]
     XRPLCoreError(#[from] XRPLCoreException),
-    #[cfg(feature = "helpers")]
+    #[cfg(all(feature = "core", feature = "models", feature = "wallet"))]
     #[error("XRPL Transaction Field error: {0}")]
     XRPLTransactionFieldError(#[from] XRPLTransactionFieldException),
-    #[cfg(feature = "helpers")]
+    #[cfg(all(feature = "core", feature = "models", feature = "wallet"))]
     #[error("XRPL Utils error: {0}")]
     XRPLUtilsError(#[from] XRPLUtilsException),
-    #[cfg(feature = "helpers")]
+    #[cfg(all(feature = "core", feature = "models", feature = "wallet"))]
     #[error("XRPL MultiSign error: {0}")]
     XRPLMultiSignError(#[from] XRPLMultisignException),
+    #[cfg(all(feature = "core", feature = "models", feature = "wallet"))]
+    #[error("XRPL Sign Transaction error: {0}")]
+    XRPLSignTransactionError(#[from] XRPLSignTransactionException),
     #[cfg(any(feature = "json-rpc", feature = "websocket"))]
     #[error("XRPL Client error: {0}")]
     XRPLClientError(#[from] XRPLClientException),
@@ -63,14 +68,9 @@ impl From<serde_json::Error> for XRPLHelperException {
     }
 }
 
-#[cfg(feature = "helpers")]
-impl From<XRPLSignTransactionException> for XRPLHelperException {
-    fn from(error: XRPLSignTransactionException) -> Self {
-        XRPLHelperException::XRPLTransactionHelperError(
-            XRPLTransactionHelperException::XRPLSignTransactionError(error),
-        )
-    }
-}
+// `XRPLSignTransactionException` is now a direct variant of
+// `XRPLHelperException` (see `XRPLSignTransactionError`), so the `From` impl
+// is derived automatically.
 
 #[cfg(feature = "helpers")]
 impl From<XRPLSubmitAndWaitException> for XRPLHelperException {