ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2026-04-29 15:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into copilot/add-ctid-to-ledger-response

Browse Source 
Resolve conflicts in LedgerToJson.cpp:
- Keep both includes: NetworkIDService.h (ours) and TokenHelpers.h (develop)
- Keep CTID block and use develop's ownerFunds check style (!= 0)

Agent-Logs-Url: https://github.com/XRPLF/rippled/sessions/949ea030-9a83-49a4-8684-33a1ee221a3d

Co-authored-by: mvadari <8029314+mvadari@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-04-02 17:06:03 +00:00
committed by GitHub
parent 6f90025fc1
commit 89a6bb495e
1129 changed files with 79049 additions and 14762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/pre-commit.yml vendored
View File

@@ -1,6 +1,9 @@
name: Run pre-commit hooks
on:
merge_group:
types:
- checks_requested
pull_request:
push:
branches:
@@ -11,7 +14,7 @@ on:
jobs:
# Call the workflow in the XRPLF/actions repo that runs the pre-commit hooks.
run-hooks:
uses: XRPLF/actions/.github/workflows/pre-commit.yml@44856eb0d6ecb7d376370244324ab3dc8b863bad
uses: XRPLF/actions/.github/workflows/pre-commit.yml@e7896f15cc60d0da1a272c77ee5c4026b424f9c7
with:
runs_on: ubuntu-latest
container: '{ "image": "ghcr.io/xrplf/ci/tools-rippled-pre-commit:sha-41ec7c1" }'