Skip to content

Commit a184408

Browse files
committed
Merge branch 'ripple/se/fees' into ripple/smart-escrow
2 parents ac173b6 + f625fb9 commit a184408

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2033
-1526
lines changed

.cmake-format.yaml

Lines changed: 247 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,247 @@
1+
_help_parse: Options affecting listfile parsing
2+
parse:
3+
_help_additional_commands:
4+
- Specify structure for custom cmake functions
5+
additional_commands:
6+
target_protobuf_sources:
7+
pargs:
8+
- target
9+
- prefix
10+
kwargs:
11+
PROTOS: "*"
12+
LANGUAGE: cpp
13+
IMPORT_DIRS: "*"
14+
GENERATE_EXTENSIONS: "*"
15+
PLUGIN: "*"
16+
_help_override_spec:
17+
- Override configurations per-command where available
18+
override_spec: {}
19+
_help_vartags:
20+
- Specify variable tags.
21+
vartags: []
22+
_help_proptags:
23+
- Specify property tags.
24+
proptags: []
25+
_help_format: Options affecting formatting.
26+
format:
27+
_help_disable:
28+
- Disable formatting entirely, making cmake-format a no-op
29+
disable: false
30+
_help_line_width:
31+
- How wide to allow formatted cmake files
32+
line_width: 120
33+
_help_tab_size:
34+
- How many spaces to tab for indent
35+
tab_size: 4
36+
_help_use_tabchars:
37+
- If true, lines are indented using tab characters (utf-8
38+
- 0x09) instead of <tab_size> space characters (utf-8 0x20).
39+
- In cases where the layout would require a fractional tab
40+
- character, the behavior of the fractional indentation is
41+
- governed by <fractional_tab_policy>
42+
use_tabchars: false
43+
_help_fractional_tab_policy:
44+
- If <use_tabchars> is True, then the value of this variable
45+
- indicates how fractional indentions are handled during
46+
- whitespace replacement. If set to 'use-space', fractional
47+
- indentation is left as spaces (utf-8 0x20). If set to
48+
- "`round-up` fractional indentation is replaced with a single"
49+
- tab character (utf-8 0x09) effectively shifting the column
50+
- to the next tabstop
51+
fractional_tab_policy: use-space
52+
_help_max_subgroups_hwrap:
53+
- If an argument group contains more than this many sub-groups
54+
- (parg or kwarg groups) then force it to a vertical layout.
55+
max_subgroups_hwrap: 4
56+
_help_max_pargs_hwrap:
57+
- If a positional argument group contains more than this many
58+
- arguments, then force it to a vertical layout.
59+
max_pargs_hwrap: 5
60+
_help_max_rows_cmdline:
61+
- If a cmdline positional group consumes more than this many
62+
- lines without nesting, then invalidate the layout (and nest)
63+
max_rows_cmdline: 2
64+
_help_separate_ctrl_name_with_space:
65+
- If true, separate flow control names from their parentheses
66+
- with a space
67+
separate_ctrl_name_with_space: true
68+
_help_separate_fn_name_with_space:
69+
- If true, separate function names from parentheses with a
70+
- space
71+
separate_fn_name_with_space: false
72+
_help_dangle_parens:
73+
- If a statement is wrapped to more than one line, than dangle
74+
- the closing parenthesis on its own line.
75+
dangle_parens: false
76+
_help_dangle_align:
77+
- If the trailing parenthesis must be 'dangled' on its on
78+
- "line, then align it to this reference: `prefix`: the start"
79+
- "of the statement, `prefix-indent`: the start of the"
80+
- "statement, plus one indentation level, `child`: align to"
81+
- the column of the arguments
82+
dangle_align: prefix
83+
_help_min_prefix_chars:
84+
- If the statement spelling length (including space and
85+
- parenthesis) is smaller than this amount, then force reject
86+
- nested layouts.
87+
min_prefix_chars: 18
88+
_help_max_prefix_chars:
89+
- If the statement spelling length (including space and
90+
- parenthesis) is larger than the tab width by more than this
91+
- amount, then force reject un-nested layouts.
92+
max_prefix_chars: 10
93+
_help_max_lines_hwrap:
94+
- If a candidate layout is wrapped horizontally but it exceeds
95+
- this many lines, then reject the layout.
96+
max_lines_hwrap: 2
97+
_help_line_ending:
98+
- What style line endings to use in the output.
99+
line_ending: unix
100+
_help_command_case:
101+
- Format command names consistently as 'lower' or 'upper' case
102+
command_case: canonical
103+
_help_keyword_case:
104+
- Format keywords consistently as 'lower' or 'upper' case
105+
keyword_case: unchanged
106+
_help_always_wrap:
107+
- A list of command names which should always be wrapped
108+
always_wrap: []
109+
_help_enable_sort:
110+
- If true, the argument lists which are known to be sortable
111+
- will be sorted lexicographicall
112+
enable_sort: true
113+
_help_autosort:
114+
- If true, the parsers may infer whether or not an argument
115+
- list is sortable (without annotation).
116+
autosort: true
117+
_help_require_valid_layout:
118+
- By default, if cmake-format cannot successfully fit
119+
- everything into the desired linewidth it will apply the
120+
- last, most aggressive attempt that it made. If this flag is
121+
- True, however, cmake-format will print error, exit with non-
122+
- zero status code, and write-out nothing
123+
require_valid_layout: false
124+
_help_layout_passes:
125+
- A dictionary mapping layout nodes to a list of wrap
126+
- decisions. See the documentation for more information.
127+
layout_passes: {}
128+
_help_markup: Options affecting comment reflow and formatting.
129+
markup:
130+
_help_bullet_char:
131+
- What character to use for bulleted lists
132+
bullet_char: "-"
133+
_help_enum_char:
134+
- What character to use as punctuation after numerals in an
135+
- enumerated list
136+
enum_char: .
137+
_help_first_comment_is_literal:
138+
- If comment markup is enabled, don't reflow the first comment
139+
- block in each listfile. Use this to preserve formatting of
140+
- your copyright/license statements.
141+
first_comment_is_literal: false
142+
_help_literal_comment_pattern:
143+
- If comment markup is enabled, don't reflow any comment block
144+
- which matches this (regex) pattern. Default is `None`
145+
- (disabled).
146+
literal_comment_pattern: null
147+
_help_fence_pattern:
148+
- Regular expression to match preformat fences in comments
149+
- default= ``r'^\s*([`~]{3}[`~]*)(.*)$'``
150+
fence_pattern: ^\s*([`~]{3}[`~]*)(.*)$
151+
_help_ruler_pattern:
152+
- Regular expression to match rulers in comments default=
153+
- '``r''^\s*[^\w\s]{3}.*[^\w\s]{3}$''``'
154+
ruler_pattern: ^\s*[^\w\s]{3}.*[^\w\s]{3}$
155+
_help_explicit_trailing_pattern:
156+
- If a comment line matches starts with this pattern then it
157+
- is explicitly a trailing comment for the preceding
158+
- argument. Default is '#<'
159+
explicit_trailing_pattern: "#<"
160+
_help_hashruler_min_length:
161+
- If a comment line starts with at least this many consecutive
162+
- hash characters, then don't lstrip() them off. This allows
163+
- for lazy hash rulers where the first hash char is not
164+
- separated by space
165+
hashruler_min_length: 10
166+
_help_canonicalize_hashrulers:
167+
- If true, then insert a space between the first hash char and
168+
- remaining hash chars in a hash ruler, and normalize its
169+
- length to fill the column
170+
canonicalize_hashrulers: true
171+
_help_enable_markup:
172+
- enable comment markup parsing and reflow
173+
enable_markup: false
174+
_help_lint: Options affecting the linter
175+
lint:
176+
_help_disabled_codes:
177+
- a list of lint codes to disable
178+
disabled_codes: []
179+
_help_function_pattern:
180+
- regular expression pattern describing valid function names
181+
function_pattern: "[0-9a-z_]+"
182+
_help_macro_pattern:
183+
- regular expression pattern describing valid macro names
184+
macro_pattern: "[0-9A-Z_]+"
185+
_help_global_var_pattern:
186+
- regular expression pattern describing valid names for
187+
- variables with global (cache) scope
188+
global_var_pattern: "[A-Z][0-9A-Z_]+"
189+
_help_internal_var_pattern:
190+
- regular expression pattern describing valid names for
191+
- variables with global scope (but internal semantic)
192+
internal_var_pattern: _[A-Z][0-9A-Z_]+
193+
_help_local_var_pattern:
194+
- regular expression pattern describing valid names for
195+
- variables with local scope
196+
local_var_pattern: "[a-z][a-z0-9_]+"
197+
_help_private_var_pattern:
198+
- regular expression pattern describing valid names for
199+
- privatedirectory variables
200+
private_var_pattern: _[0-9a-z_]+
201+
_help_public_var_pattern:
202+
- regular expression pattern describing valid names for public
203+
- directory variables
204+
public_var_pattern: "[A-Z][0-9A-Z_]+"
205+
_help_argument_var_pattern:
206+
- regular expression pattern describing valid names for
207+
- function/macro arguments and loop variables.
208+
argument_var_pattern: "[a-z][a-z0-9_]+"
209+
_help_keyword_pattern:
210+
- regular expression pattern describing valid names for
211+
- keywords used in functions or macros
212+
keyword_pattern: "[A-Z][0-9A-Z_]+"
213+
_help_max_conditionals_custom_parser:
214+
- In the heuristic for C0201, how many conditionals to match
215+
- within a loop in before considering the loop a parser.
216+
max_conditionals_custom_parser: 2
217+
_help_min_statement_spacing:
218+
- Require at least this many newlines between statements
219+
min_statement_spacing: 1
220+
_help_max_statement_spacing:
221+
- Require no more than this many newlines between statements
222+
max_statement_spacing: 2
223+
max_returns: 6
224+
max_branches: 12
225+
max_arguments: 5
226+
max_localvars: 15
227+
max_statements: 50
228+
_help_encode: Options affecting file encoding
229+
encode:
230+
_help_emit_byteorder_mark:
231+
- If true, emit the unicode byte-order mark (BOM) at the start
232+
- of the file
233+
emit_byteorder_mark: false
234+
_help_input_encoding:
235+
- Specify the encoding of the input file. Defaults to utf-8
236+
input_encoding: utf-8
237+
_help_output_encoding:
238+
- Specify the encoding of the output file. Defaults to utf-8.
239+
- Note that cmake only claims to support utf-8 so be careful
240+
- when using anything else
241+
output_encoding: utf-8
242+
_help_misc: Miscellaneous configurations options.
243+
misc:
244+
_help_per_command:
245+
- A dictionary containing any per-command configuration
246+
- overrides. Currently only `command_case` is supported.
247+
per_command: {}

.config/cspell.config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ words:
101101
- gpgcheck
102102
- gpgkey
103103
- hotwallet
104+
- hwrap
104105
- ifndef
105106
- inequation
106107
- insuf
@@ -114,6 +115,8 @@ words:
114115
- keylet
115116
- keylets
116117
- keyvadb
118+
- kwarg
119+
- kwargs
117120
- ledgerentry
118121
- ledgerhash
119122
- ledgerindex
@@ -163,6 +166,7 @@ words:
163166
- nunl
164167
- Nyffenegger
165168
- ostr
169+
- pargs
166170
- partitioner
167171
- paychan
168172
- paychans

.github/scripts/levelization/results/ordering.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ tests.libxrpl > xrpl.json
153153
tests.libxrpl > xrpl.net
154154
xrpl.core > xrpl.basics
155155
xrpl.core > xrpl.json
156+
xrpl.core > xrpl.ledger
156157
xrpl.json > xrpl.basics
157158
xrpl.ledger > xrpl.basics
158159
xrpl.ledger > xrpl.protocol

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
# Call the workflow in the XRPLF/actions repo that runs the pre-commit hooks.
1313
run-hooks:
14-
uses: XRPLF/actions/.github/workflows/pre-commit.yml@282890f46d6921249d5659dd38babcb0bd8aef48
14+
uses: XRPLF/actions/.github/workflows/pre-commit.yml@320be44621ca2a080f05aeb15817c44b84518108
1515
with:
1616
runs_on: ubuntu-latest
1717
container: '{ "image": "ghcr.io/xrplf/ci/tools-rippled-pre-commit:sha-ab4d1f0" }'

.github/workflows/publish-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
3737

3838
- name: Get number of processors
39-
uses: XRPLF/actions/get-nproc@2ece4ec6ab7de266859a6f053571425b2bd684b6
39+
uses: XRPLF/actions/get-nproc@cf0433aa74563aead044a1e395610c96d65a37cf
4040
id: nproc
4141
with:
4242
subtract: ${{ env.NPROC_SUBTRACT }}

.github/workflows/reusable-build-test-config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ jobs:
101101
steps:
102102
- name: Cleanup workspace (macOS and Windows)
103103
if: ${{ runner.os == 'macOS' || runner.os == 'Windows' }}
104-
uses: XRPLF/actions/cleanup-workspace@2ece4ec6ab7de266859a6f053571425b2bd684b6
104+
uses: XRPLF/actions/cleanup-workspace@cf0433aa74563aead044a1e395610c96d65a37cf
105105

106106
- name: Checkout repository
107107
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
108108

109109
- name: Prepare runner
110-
uses: XRPLF/actions/prepare-runner@f05cab7b8541eee6473aa42beb9d2fe35608a190
110+
uses: XRPLF/actions/prepare-runner@2cbf481018d930656e9276fcc20dc0e3a0be5b6d
111111
with:
112112
enable_ccache: ${{ inputs.ccache_enabled }}
113113

@@ -119,7 +119,7 @@ jobs:
119119
uses: ./.github/actions/print-env
120120

121121
- name: Get number of processors
122-
uses: XRPLF/actions/get-nproc@2ece4ec6ab7de266859a6f053571425b2bd684b6
122+
uses: XRPLF/actions/get-nproc@cf0433aa74563aead044a1e395610c96d65a37cf
123123
id: nproc
124124
with:
125125
subtract: ${{ inputs.nproc_subtract }}

.github/workflows/upload-conan-deps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,21 @@ jobs:
6464
steps:
6565
- name: Cleanup workspace (macOS and Windows)
6666
if: ${{ runner.os == 'macOS' || runner.os == 'Windows' }}
67-
uses: XRPLF/actions/cleanup-workspace@2ece4ec6ab7de266859a6f053571425b2bd684b6
67+
uses: XRPLF/actions/cleanup-workspace@cf0433aa74563aead044a1e395610c96d65a37cf
6868

6969
- name: Checkout repository
7070
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
7171

7272
- name: Prepare runner
73-
uses: XRPLF/actions/prepare-runner@f05cab7b8541eee6473aa42beb9d2fe35608a190
73+
uses: XRPLF/actions/prepare-runner@2cbf481018d930656e9276fcc20dc0e3a0be5b6d
7474
with:
7575
enable_ccache: false
7676

7777
- name: Print build environment
7878
uses: ./.github/actions/print-env
7979

8080
- name: Get number of processors
81-
uses: XRPLF/actions/get-nproc@2ece4ec6ab7de266859a6f053571425b2bd684b6
81+
uses: XRPLF/actions/get-nproc@cf0433aa74563aead044a1e395610c96d65a37cf
8282
id: nproc
8383
with:
8484
subtract: ${{ env.NPROC_SUBTRACT }}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ DerivedData
6464
/.vs/
6565
/.vscode/
6666

67+
# zed IDE.
68+
/.zed/
69+
6770
# AI tools.
6871
/.augment
6972
/.claude

.pre-commit-config.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ repos:
2626
args: [--style=file]
2727
"types_or": [c++, c, proto]
2828

29+
- repo: https://github.com/cheshirekow/cmake-format-precommit
30+
rev: e2c2116d86a80e72e7146a06e68b7c228afc6319 # frozen: v0.6.13
31+
hooks:
32+
- id: cmake-format
33+
additional_dependencies: [PyYAML]
34+
2935
- repo: https://github.com/rbubley/mirrors-prettier
3036
rev: 5ba47274f9b181bce26a5150a725577f3c336011 # frozen: v3.6.2
3137
hooks:

0 commit comments

Comments
 (0)