Skip to content

Commit 5148098

Browse files
committed
Merge branch 'wasmi-host-functions' into ripple/se/fees
2 parents 4fe508c + 1b4a564 commit 5148098

File tree

429 files changed

+103196
-3143
lines changed

Some content is hidden

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

429 files changed

+103196
-3143
lines changed

.github/scripts/levelization/results/loops.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@ Loop: test.jtx test.toplevel
44
Loop: test.jtx test.unit_test
55
test.unit_test == test.jtx
66

7-
Loop: xrpld.app xrpld.core
8-
xrpld.app > xrpld.core
9-
107
Loop: xrpld.app xrpld.overlay
11-
xrpld.overlay > xrpld.app
8+
xrpld.overlay ~= xrpld.app
129

1310
Loop: xrpld.app xrpld.peerfinder
14-
xrpld.peerfinder ~= xrpld.app
11+
xrpld.peerfinder == xrpld.app
1512

1613
Loop: xrpld.app xrpld.rpc
1714
xrpld.rpc > xrpld.app

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

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
libxrpl.basics > xrpl.basics
2+
libxrpl.conditions > xrpl.basics
3+
libxrpl.conditions > xrpl.conditions
24
libxrpl.core > xrpl.basics
35
libxrpl.core > xrpl.core
46
libxrpl.crypto > xrpl.basics
@@ -17,16 +19,27 @@ libxrpl.nodestore > xrpl.protocol
1719
libxrpl.protocol > xrpl.basics
1820
libxrpl.protocol > xrpl.json
1921
libxrpl.protocol > xrpl.protocol
22+
libxrpl.rdb > xrpl.basics
23+
libxrpl.rdb > xrpl.rdb
2024
libxrpl.resource > xrpl.basics
2125
libxrpl.resource > xrpl.json
2226
libxrpl.resource > xrpl.resource
2327
libxrpl.server > xrpl.basics
2428
libxrpl.server > xrpl.json
2529
libxrpl.server > xrpl.protocol
30+
libxrpl.server > xrpl.rdb
2631
libxrpl.server > xrpl.server
2732
libxrpl.shamap > xrpl.basics
2833
libxrpl.shamap > xrpl.protocol
2934
libxrpl.shamap > xrpl.shamap
35+
libxrpl.tx > xrpl.basics
36+
libxrpl.tx > xrpl.conditions
37+
libxrpl.tx > xrpl.core
38+
libxrpl.tx > xrpl.json
39+
libxrpl.tx > xrpl.ledger
40+
libxrpl.tx > xrpl.protocol
41+
libxrpl.tx > xrpl.server
42+
libxrpl.tx > xrpl.tx
3043
test.app > test.jtx
3144
test.app > test.rpc
3245
test.app > test.toplevel
@@ -41,7 +54,10 @@ test.app > xrpl.json
4154
test.app > xrpl.ledger
4255
test.app > xrpl.nodestore
4356
test.app > xrpl.protocol
57+
test.app > xrpl.rdb
4458
test.app > xrpl.resource
59+
test.app > xrpl.server
60+
test.app > xrpl.tx
4561
test.basics > test.jtx
4662
test.basics > test.unit_test
4763
test.basics > xrpl.basics
@@ -51,7 +67,7 @@ test.basics > xrpl.json
5167
test.basics > xrpl.protocol
5268
test.beast > xrpl.basics
5369
test.conditions > xrpl.basics
54-
test.conditions > xrpld.conditions
70+
test.conditions > xrpl.conditions
5571
test.consensus > test.csf
5672
test.consensus > test.toplevel
5773
test.consensus > test.unit_test
@@ -60,13 +76,15 @@ test.consensus > xrpld.app
6076
test.consensus > xrpld.consensus
6177
test.consensus > xrpl.json
6278
test.consensus > xrpl.ledger
79+
test.consensus > xrpl.tx
6380
test.core > test.jtx
6481
test.core > test.toplevel
6582
test.core > test.unit_test
6683
test.core > xrpl.basics
6784
test.core > xrpl.core
6885
test.core > xrpld.core
6986
test.core > xrpl.json
87+
test.core > xrpl.rdb
7088
test.core > xrpl.server
7189
test.csf > xrpl.basics
7290
test.csf > xrpld.consensus
@@ -75,6 +93,7 @@ test.csf > xrpl.protocol
7593
test.json > test.jtx
7694
test.json > xrpl.json
7795
test.jtx > xrpl.basics
96+
test.jtx > xrpl.core
7897
test.jtx > xrpld.app
7998
test.jtx > xrpld.core
8099
test.jtx > xrpld.rpc
@@ -84,6 +103,7 @@ test.jtx > xrpl.net
84103
test.jtx > xrpl.protocol
85104
test.jtx > xrpl.resource
86105
test.jtx > xrpl.server
106+
test.jtx > xrpl.tx
87107
test.ledger > test.jtx
88108
test.ledger > test.toplevel
89109
test.ledger > xrpl.basics
@@ -95,8 +115,8 @@ test.nodestore > test.jtx
95115
test.nodestore > test.toplevel
96116
test.nodestore > test.unit_test
97117
test.nodestore > xrpl.basics
98-
test.nodestore > xrpld.core
99118
test.nodestore > xrpl.nodestore
119+
test.nodestore > xrpl.rdb
100120
test.overlay > test.jtx
101121
test.overlay > test.toplevel
102122
test.overlay > test.unit_test
@@ -129,8 +149,11 @@ test.rpc > xrpld.core
129149
test.rpc > xrpld.overlay
130150
test.rpc > xrpld.rpc
131151
test.rpc > xrpl.json
152+
test.rpc > xrpl.ledger
132153
test.rpc > xrpl.protocol
133154
test.rpc > xrpl.resource
155+
test.rpc > xrpl.server
156+
test.rpc > xrpl.tx
134157
test.server > test.jtx
135158
test.server > test.toplevel
136159
test.server > test.unit_test
@@ -151,40 +174,57 @@ test.unit_test > xrpl.basics
151174
tests.libxrpl > xrpl.basics
152175
tests.libxrpl > xrpl.json
153176
tests.libxrpl > xrpl.net
177+
xrpl.conditions > xrpl.basics
178+
xrpl.conditions > xrpl.protocol
154179
xrpl.core > xrpl.basics
155180
xrpl.core > xrpl.json
156181
xrpl.core > xrpl.ledger
182+
xrpl.core > xrpl.protocol
157183
xrpl.json > xrpl.basics
158184
xrpl.ledger > xrpl.basics
159185
xrpl.ledger > xrpl.protocol
186+
xrpl.ledger > xrpl.server
187+
xrpl.ledger > xrpl.shamap
160188
xrpl.net > xrpl.basics
161189
xrpl.nodestore > xrpl.basics
162190
xrpl.nodestore > xrpl.protocol
163191
xrpl.protocol > xrpl.basics
164192
xrpl.protocol > xrpl.json
193+
xrpl.rdb > xrpl.basics
194+
xrpl.rdb > xrpl.core
195+
xrpl.rdb > xrpl.protocol
165196
xrpl.resource > xrpl.basics
166197
xrpl.resource > xrpl.json
167198
xrpl.resource > xrpl.protocol
168199
xrpl.server > xrpl.basics
200+
xrpl.server > xrpl.core
169201
xrpl.server > xrpl.json
170202
xrpl.server > xrpl.protocol
203+
xrpl.server > xrpl.rdb
204+
xrpl.server > xrpl.resource
205+
xrpl.server > xrpl.shamap
171206
xrpl.shamap > xrpl.basics
172207
xrpl.shamap > xrpl.nodestore
173208
xrpl.shamap > xrpl.protocol
209+
xrpl.tx > xrpl.basics
210+
xrpl.tx > xrpl.core
211+
xrpl.tx > xrpl.ledger
212+
xrpl.tx > xrpl.protocol
174213
xrpld.app > test.unit_test
175214
xrpld.app > xrpl.basics
176215
xrpld.app > xrpl.core
177-
xrpld.app > xrpld.conditions
178216
xrpld.app > xrpld.consensus
217+
xrpld.app > xrpld.core
179218
xrpld.app > xrpl.json
180219
xrpld.app > xrpl.ledger
181220
xrpld.app > xrpl.net
182221
xrpld.app > xrpl.nodestore
183222
xrpld.app > xrpl.protocol
223+
xrpld.app > xrpl.rdb
184224
xrpld.app > xrpl.resource
225+
xrpld.app > xrpl.server
185226
xrpld.app > xrpl.shamap
186-
xrpld.conditions > xrpl.basics
187-
xrpld.conditions > xrpl.protocol
227+
xrpld.app > xrpl.tx
188228
xrpld.consensus > xrpl.basics
189229
xrpld.consensus > xrpl.json
190230
xrpld.consensus > xrpl.protocol
@@ -193,17 +233,21 @@ xrpld.core > xrpl.core
193233
xrpld.core > xrpl.json
194234
xrpld.core > xrpl.net
195235
xrpld.core > xrpl.protocol
236+
xrpld.core > xrpl.rdb
196237
xrpld.overlay > xrpl.basics
197238
xrpld.overlay > xrpl.core
198239
xrpld.overlay > xrpld.core
199240
xrpld.overlay > xrpld.peerfinder
200241
xrpld.overlay > xrpl.json
201242
xrpld.overlay > xrpl.protocol
243+
xrpld.overlay > xrpl.rdb
202244
xrpld.overlay > xrpl.resource
203245
xrpld.overlay > xrpl.server
246+
xrpld.overlay > xrpl.tx
204247
xrpld.peerfinder > xrpl.basics
205248
xrpld.peerfinder > xrpld.core
206249
xrpld.peerfinder > xrpl.protocol
250+
xrpld.peerfinder > xrpl.rdb
207251
xrpld.perflog > xrpl.basics
208252
xrpld.perflog > xrpl.core
209253
xrpld.perflog > xrpld.rpc
@@ -216,6 +260,8 @@ xrpld.rpc > xrpl.ledger
216260
xrpld.rpc > xrpl.net
217261
xrpld.rpc > xrpl.nodestore
218262
xrpld.rpc > xrpl.protocol
263+
xrpld.rpc > xrpl.rdb
219264
xrpld.rpc > xrpl.resource
220265
xrpld.rpc > xrpl.server
266+
xrpld.rpc > xrpl.tx
221267
xrpld.shamap > xrpl.shamap

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,6 @@ DerivedData
7171
/.augment
7272
/.claude
7373
/CLAUDE.md
74+
75+
# clangd cache
76+
/.cache

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repos:
2020
args: [--assume-in-merge]
2121

2222
- repo: https://github.com/pre-commit/mirrors-clang-format
23-
rev: 7d85583be209cb547946c82fbe51f4bc5dd1d017 # frozen: v18.1.8
23+
rev: 75ca4ad908dc4a99f57921f29b7e6c1521e10b26 # frozen: v21.1.8
2424
hooks:
2525
- id: clang-format
2626
args: [--style=file]

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ coherent rather than a set of _thou shalt not_ commandments.
219219

220220
## Formatting
221221

222-
All code must conform to `clang-format` version 18,
222+
All code must conform to `clang-format` version 21,
223223
according to the settings in [`.clang-format`](./.clang-format),
224224
unless the result would be unreasonably difficult to read or maintain.
225225
To demarcate lines that should be left as-is, surround them with comments like

cmake/CodeCoverage.cmake

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -466,11 +466,6 @@ function (add_code_coverage_to_target name scope)
466466
target_compile_options(${name} ${scope} $<$<COMPILE_LANGUAGE:CXX>:${COVERAGE_CXX_COMPILER_FLAGS}>
467467
$<$<COMPILE_LANGUAGE:C>:${COVERAGE_C_COMPILER_FLAGS}>)
468468

469-
target_link_libraries(
470-
${name}
471-
${scope}
472-
$<$<LINK_LANGUAGE:CXX>:${COVERAGE_CXX_LINKER_FLAGS}
473-
gcov>
474-
$<$<LINK_LANGUAGE:C>:${COVERAGE_C_LINKER_FLAGS}
475-
gcov>)
469+
target_link_libraries(${name} ${scope} $<$<LINK_LANGUAGE:CXX>:${COVERAGE_CXX_LINKER_FLAGS}>
470+
$<$<LINK_LANGUAGE:C>:${COVERAGE_C_LINKER_FLAGS}>)
476471
endfunction () # add_code_coverage_to_target

cmake/XrplCore.cmake

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,36 @@ add_module(xrpl net)
8585
target_link_libraries(xrpl.libxrpl.net PUBLIC xrpl.libxrpl.basics xrpl.libxrpl.json xrpl.libxrpl.protocol
8686
xrpl.libxrpl.resource)
8787

88-
add_module(xrpl server)
89-
target_link_libraries(xrpl.libxrpl.server PUBLIC xrpl.libxrpl.protocol)
90-
9188
add_module(xrpl nodestore)
9289
target_link_libraries(xrpl.libxrpl.nodestore PUBLIC xrpl.libxrpl.basics xrpl.libxrpl.json xrpl.libxrpl.protocol)
9390

9491
add_module(xrpl shamap)
9592
target_link_libraries(xrpl.libxrpl.shamap PUBLIC xrpl.libxrpl.basics xrpl.libxrpl.crypto xrpl.libxrpl.protocol
9693
xrpl.libxrpl.nodestore)
9794

95+
add_module(xrpl rdb)
96+
target_link_libraries(xrpl.libxrpl.rdb PUBLIC xrpl.libxrpl.basics xrpl.libxrpl.core)
97+
98+
add_module(xrpl server)
99+
target_link_libraries(xrpl.libxrpl.server PUBLIC xrpl.libxrpl.protocol xrpl.libxrpl.core xrpl.libxrpl.rdb
100+
xrpl.libxrpl.resource)
101+
102+
add_module(xrpl conditions)
103+
target_link_libraries(xrpl.libxrpl.conditions PUBLIC xrpl.libxrpl.server)
104+
98105
add_module(xrpl ledger)
99-
target_link_libraries(xrpl.libxrpl.ledger PUBLIC xrpl.libxrpl.basics xrpl.libxrpl.json xrpl.libxrpl.protocol)
106+
target_link_libraries(
107+
xrpl.libxrpl.ledger
108+
PUBLIC xrpl.libxrpl.basics
109+
xrpl.libxrpl.json
110+
xrpl.libxrpl.protocol
111+
xrpl.libxrpl.rdb
112+
xrpl.libxrpl.server
113+
xrpl.libxrpl.shamap
114+
xrpl.libxrpl.conditions)
115+
116+
add_module(xrpl tx)
117+
target_link_libraries(xrpl.libxrpl.tx PUBLIC xrpl.libxrpl.ledger)
100118

101119
add_library(xrpl.libxrpl)
102120
set_target_properties(xrpl.libxrpl PROPERTIES OUTPUT_NAME xrpl)
@@ -111,16 +129,19 @@ target_link_modules(
111129
PUBLIC
112130
basics
113131
beast
132+
conditions
114133
core
115134
crypto
116135
json
136+
ledger
137+
net
138+
nodestore
117139
protocol
140+
rdb
118141
resource
119142
server
120-
nodestore
121143
shamap
122-
net
123-
ledger)
144+
tx)
124145

125146
# All headers in libxrpl are in modules.
126147
# Uncomment this stanza if you have not yet moved new headers into a module.

cmake/XrplInstall.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,19 @@ install(TARGETS common
2020
xrpl.libxrpl
2121
xrpl.libxrpl.basics
2222
xrpl.libxrpl.beast
23+
xrpl.libxrpl.conditions
2324
xrpl.libxrpl.core
2425
xrpl.libxrpl.crypto
2526
xrpl.libxrpl.json
27+
xrpl.libxrpl.rdb
2628
xrpl.libxrpl.ledger
2729
xrpl.libxrpl.net
2830
xrpl.libxrpl.nodestore
2931
xrpl.libxrpl.protocol
3032
xrpl.libxrpl.resource
3133
xrpl.libxrpl.server
3234
xrpl.libxrpl.shamap
35+
xrpl.libxrpl.tx
3336
antithesis-sdk-cpp
3437
EXPORT XrplExports
3538
LIBRARY DESTINATION lib

docs/CodingStyle.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ guideline is to maintain the standards that are used in those libraries.
1717
## Guidelines
1818

1919
If you want to do something contrary to these guidelines, understand
20-
why you're doing it. Think, use common sense, and consider that this
21-
your changes will probably need to be maintained long after you've
20+
why you're doing it. Think, use common sense, and consider that these
21+
changes will probably need to be maintained long after you've
2222
moved on to other projects.
2323

2424
- Use white space and blank lines to guide the eye and keep your intent clear.

include/xrpl/basics/IntrusivePointer.ipp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ SharedIntrusive<T>::operator->() const noexcept
208208
}
209209

210210
template <class T>
211-
SharedIntrusive<T>::operator bool() const noexcept
211+
SharedIntrusive<T>::
212+
operator bool() const noexcept
212213
{
213214
return bool(unsafeGetRawPtr());
214215
}
@@ -503,7 +504,8 @@ SharedWeakUnion<T>::getStrong() const
503504
}
504505

505506
template <class T>
506-
SharedWeakUnion<T>::operator bool() const noexcept
507+
SharedWeakUnion<T>::
508+
operator bool() const noexcept
507509
{
508510
return bool(get());
509511
}

0 commit comments

Comments
 (0)