Skip to content

Commit bd18d17

Browse files
mvadarimvadari
committed
Merge remote-tracking branch 'upstream/ripple/smart-escrow' into develop5
2 parents 4eae037 + 38c7a27 commit bd18d17

File tree

96 files changed

+25506
-402
lines changed

Some content is hidden

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

96 files changed

+25506
-402
lines changed

‎.clang-format‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
Language: Cpp
2+
Language: Cpp
33
AccessModifierOffset: -4
44
AlignAfterOpenBracket: AlwaysBreak
55
AlignConsecutiveAssignments: false
@@ -19,52 +19,52 @@ AlwaysBreakTemplateDeclarations: true
1919
BinPackArguments: false
2020
BinPackParameters: false
2121
BraceWrapping:
22-
AfterClass: true
22+
AfterClass: true
2323
AfterControlStatement: true
24-
AfterEnum: false
25-
AfterFunction: true
26-
AfterNamespace: false
24+
AfterEnum: false
25+
AfterFunction: true
26+
AfterNamespace: false
2727
AfterObjCDeclaration: true
28-
AfterStruct: true
29-
AfterUnion: true
30-
BeforeCatch: true
31-
BeforeElse: true
32-
IndentBraces: false
28+
AfterStruct: true
29+
AfterUnion: true
30+
BeforeCatch: true
31+
BeforeElse: true
32+
IndentBraces: false
3333
BreakBeforeBinaryOperators: false
3434
BreakBeforeBraces: Custom
3535
BreakBeforeTernaryOperators: true
3636
BreakConstructorInitializersBeforeComma: true
37-
ColumnLimit: 80
38-
CommentPragmas: '^ IWYU pragma:'
37+
ColumnLimit: 80
38+
CommentPragmas: "^ IWYU pragma:"
3939
ConstructorInitializerAllOnOneLineOrOnePerLine: true
4040
ConstructorInitializerIndentWidth: 4
4141
ContinuationIndentWidth: 4
4242
Cpp11BracedListStyle: true
4343
DerivePointerAlignment: false
44-
DisableFormat: false
44+
DisableFormat: false
4545
ExperimentalAutoDetectBinPacking: false
46-
ForEachMacros: [ Q_FOREACH, BOOST_FOREACH ]
47-
IncludeBlocks: Regroup
46+
ForEachMacros: [Q_FOREACH, BOOST_FOREACH]
47+
IncludeBlocks: Regroup
4848
IncludeCategories:
49-
- Regex: '^<(test)/'
50-
Priority: 0
51-
- Regex: '^<(xrpld)/'
52-
Priority: 1
53-
- Regex: '^<(xrpl)/'
54-
Priority: 2
55-
- Regex: '^<(boost)/'
56-
Priority: 3
57-
- Regex: '^.*/'
58-
Priority: 4
59-
- Regex: '^.*\.h'
60-
Priority: 5
61-
- Regex: '.*'
62-
Priority: 6
63-
IncludeIsMainRegex: '$'
49+
- Regex: "^<(test)/"
50+
Priority: 0
51+
- Regex: "^<(xrpld)/"
52+
Priority: 1
53+
- Regex: "^<(xrpl)/"
54+
Priority: 2
55+
- Regex: "^<(boost)/"
56+
Priority: 3
57+
- Regex: "^.*/"
58+
Priority: 4
59+
- Regex: '^.*\.h'
60+
Priority: 5
61+
- Regex: ".*"
62+
Priority: 6
63+
IncludeIsMainRegex: "$"
6464
IndentCaseLabels: true
6565
IndentFunctionDeclarationAfterType: false
6666
IndentRequiresClause: true
67-
IndentWidth: 4
67+
IndentWidth: 4
6868
IndentWrappedFunctionNames: false
6969
KeepEmptyLinesAtTheStartOfBlocks: false
7070
MaxEmptyLinesToKeep: 1
@@ -78,20 +78,20 @@ PenaltyBreakString: 1000
7878
PenaltyExcessCharacter: 1000000
7979
PenaltyReturnTypeOnItsOwnLine: 200
8080
PointerAlignment: Left
81-
ReflowComments: true
81+
ReflowComments: true
8282
RequiresClausePosition: OwnLine
83-
SortIncludes: true
83+
SortIncludes: true
8484
SpaceAfterCStyleCast: false
8585
SpaceBeforeAssignmentOperators: true
8686
SpaceBeforeParens: ControlStatements
8787
SpaceInEmptyParentheses: false
8888
SpacesBeforeTrailingComments: 2
89-
SpacesInAngles: false
89+
SpacesInAngles: false
9090
SpacesInContainerLiterals: true
9191
SpacesInCStyleCastParentheses: false
9292
SpacesInParentheses: false
9393
SpacesInSquareBrackets: false
94-
Standard: Cpp11
95-
TabWidth: 8
96-
UseTab: Never
97-
QualifierAlignment: Right
94+
Standard: Cpp11
95+
TabWidth: 8
96+
UseTab: Never
97+
QualifierAlignment: Right

‎.github/CODEOWNERS‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,2 @@
11
# Allow anyone to review any change by default.
22
*
3-
4-
# Require the rpc-reviewers team to review changes to the rpc code.
5-
include/xrpl/protocol/ @xrplf/rpc-reviewers
6-
src/libxrpl/protocol/ @xrplf/rpc-reviewers
7-
src/xrpld/rpc/ @xrplf/rpc-reviewers
8-
src/xrpld/app/misc/ @xrplf/rpc-reviewers

‎.github/actions/dependencies/action.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ runs:
1111
run: |
1212
conan export --version 1.1.10 external/snappy
1313
conan export --version 4.0.3 external/soci
14+
conan export --version 2.4.1 external/wamr
1415
- name: add Ripple Conan remote
1516
if: env.CONAN_URL != ''
1617
shell: bash

‎.github/workflows/macos.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- release
1212
- master
1313
# Branches that opt-in to running
14-
- 'ci/**'
14+
- "ci/**"
1515
concurrency:
1616
group: ${{ github.workflow }}-${{ github.ref }}
1717
cancel-in-progress: true
@@ -29,7 +29,6 @@ env:
2929
tools.compilation:verbosity=verbose
3030
3131
jobs:
32-
3332
test:
3433
if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
3534
strategy:
@@ -86,7 +85,7 @@ jobs:
8685
sysctl -n hw.logicalcpu
8786
clang --version
8887
- name: configure Conan
89-
run : |
88+
run: |
9089
echo "${CONAN_GLOBAL_CONF}" >> $(conan config home)/global.conf
9190
conan config install conan/profiles/ -tf $(conan config home)/profiles/
9291
conan profile show
@@ -95,6 +94,7 @@ jobs:
9594
run: |
9695
conan export --version 1.1.10 external/snappy
9796
conan export --version 4.0.3 external/soci
97+
conan export --version 2.4.1 external/wamr
9898
- name: add Ripple Conan remote
9999
if: env.CONAN_URL != ''
100100
shell: bash

‎.github/workflows/nix.yml‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -363,59 +363,59 @@ jobs:
363363
env:
364364
build_dir: .build
365365
steps:
366-
- name: download cache
367-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
368-
with:
369-
name: linux-clang-Debug
366+
- name: download cache
367+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093
368+
with:
369+
name: linux-clang-Debug
370370

371-
- name: extract cache
372-
run: |
373-
mkdir -p ${CONAN_HOME}
374-
tar -xzf conan.tar.gz -C ${CONAN_HOME}
371+
- name: extract cache
372+
run: |
373+
mkdir -p ${CONAN_HOME}
374+
tar -xzf conan.tar.gz -C ${CONAN_HOME}
375375
376-
- name: check environment
377-
run: |
378-
echo ${PATH} | tr ':' '\n'
379-
conan --version
380-
cmake --version
381-
env | sort
382-
ls ${CONAN_HOME}
376+
- name: check environment
377+
run: |
378+
echo ${PATH} | tr ':' '\n'
379+
conan --version
380+
cmake --version
381+
env | sort
382+
ls ${CONAN_HOME}
383383
384-
- name: checkout
385-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
384+
- name: checkout
385+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
386386

387-
- name: dependencies
388-
uses: ./.github/actions/dependencies
389-
with:
390-
configuration: Debug
387+
- name: dependencies
388+
uses: ./.github/actions/dependencies
389+
with:
390+
configuration: Debug
391391

392-
- name: prepare environment
393-
run: |
394-
mkdir -p ${build_dir}
395-
echo "SOURCE_DIR=$(pwd)" >> $GITHUB_ENV
396-
echo "BUILD_DIR=$(pwd)/${build_dir}" >> $GITHUB_ENV
392+
- name: prepare environment
393+
run: |
394+
mkdir -p ${build_dir}
395+
echo "SOURCE_DIR=$(pwd)" >> $GITHUB_ENV
396+
echo "BUILD_DIR=$(pwd)/${build_dir}" >> $GITHUB_ENV
397397
398-
- name: build with instrumentation
399-
run: |
400-
cd ${BUILD_DIR}
401-
cmake -S ${SOURCE_DIR} -B ${BUILD_DIR} \
402-
-Dvoidstar=ON \
403-
-Dtests=ON \
404-
-Dxrpld=ON \
405-
-DCMAKE_BUILD_TYPE=Debug \
406-
-DSECP256K1_BUILD_BENCHMARK=OFF \
407-
-DSECP256K1_BUILD_TESTS=OFF \
408-
-DSECP256K1_BUILD_EXHAUSTIVE_TESTS=OFF \
409-
-DCMAKE_TOOLCHAIN_FILE=${BUILD_DIR}/build/generators/conan_toolchain.cmake
410-
cmake --build . --parallel $(nproc)
398+
- name: build with instrumentation
399+
run: |
400+
cd ${BUILD_DIR}
401+
cmake -S ${SOURCE_DIR} -B ${BUILD_DIR} \
402+
-Dvoidstar=ON \
403+
-Dtests=ON \
404+
-Dxrpld=ON \
405+
-DCMAKE_BUILD_TYPE=Debug \
406+
-DSECP256K1_BUILD_BENCHMARK=OFF \
407+
-DSECP256K1_BUILD_TESTS=OFF \
408+
-DSECP256K1_BUILD_EXHAUSTIVE_TESTS=OFF \
409+
-DCMAKE_TOOLCHAIN_FILE=${BUILD_DIR}/build/generators/conan_toolchain.cmake
410+
cmake --build . --parallel $(nproc)
411411
412-
- name: verify instrumentation enabled
413-
run: |
414-
cd ${BUILD_DIR}
415-
./rippled --version | grep libvoidstar
412+
- name: verify instrumentation enabled
413+
run: |
414+
cd ${BUILD_DIR}
415+
./rippled --version | grep libvoidstar
416416
417-
- name: run unit tests
418-
run: |
419-
cd ${BUILD_DIR}
420-
./rippled -u --unittest-jobs $(( $(nproc)/4 ))
421-
ctest -j $(nproc) --output-on-failure
417+
- name: run unit tests
418+
run: |
419+
cd ${BUILD_DIR}
420+
./rippled -u --unittest-jobs $(( $(nproc)/4 ))
421+
ctest -j $(nproc) --output-on-failure

‎.github/workflows/windows.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- release
1313
- master
1414
# Branches that opt-in to running
15-
- 'ci/**'
15+
- "ci/**"
1616

1717
# https://docs.github.com/en/actions/using-jobs/using-concurrency
1818
concurrency:
@@ -32,7 +32,6 @@ env:
3232
tools.compilation:verbosity=verbose
3333
3434
jobs:
35-
3635
test:
3736
if: ${{ github.event_name == 'push' || github.event.pull_request.draft != true || contains(github.event.pull_request.labels.*.name, 'DraftRunCI') }}
3837
strategy:
@@ -68,8 +67,8 @@ jobs:
6867
- name: restore Python cache directory
6968
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684
7069
with:
71-
path: ${{ steps.pip-cache.outputs.dir }}
72-
key: ${{ runner.os }}-${{ hashFiles('.github/workflows/windows.yml') }}
70+
path: ${{ steps.pip-cache.outputs.dir }}
71+
key: ${{ runner.os }}-${{ hashFiles('.github/workflows/windows.yml') }}
7372
- name: install Conan
7473
run: pip install wheel conan
7574
- name: check environment
@@ -90,6 +89,7 @@ jobs:
9089
run: |
9190
conan export --version 1.1.10 external/snappy
9291
conan export --version 4.0.3 external/soci
92+
conan export --version 2.4.1 external/wamr
9393
- name: add Ripple Conan remote
9494
if: env.CONAN_URL != ''
9595
shell: bash
@@ -107,10 +107,10 @@ jobs:
107107
- name: build
108108
uses: ./.github/actions/build
109109
with:
110-
generator: '${{ matrix.version.generator }}'
110+
generator: "${{ matrix.version.generator }}"
111111
configuration: ${{ matrix.configuration.type }}
112112
# Hard code for now. Move to the matrix if varied options are needed
113-
cmake-args: '-Dassert=TRUE -Dwerr=TRUE -Dreporting=OFF -Dunity=ON'
113+
cmake-args: "-Dassert=TRUE -Dwerr=TRUE -Dreporting=OFF -Dunity=ON"
114114
cmake-target: install
115115
- name: test
116116
shell: bash

0 commit comments

Comments
 (0)