Skip to content

Commit fde000f

Browse files
authored
Merge branch 'develop' into ximinez/acquireAsyncDispatch
2 parents d0a6222 + b33b506 commit fde000f

Some content is hidden

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

47 files changed

+10
-15428
lines changed

BUILD.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,12 @@ cd external
145145
git init
146146
git remote add origin [email protected]:XRPLF/conan-center-index.git
147147
git sparse-checkout init
148-
git sparse-checkout set recipes/snappy
148+
git sparse-checkout set recipes/ed25519
149+
git sparse-checkout add recipes/snappy
149150
git sparse-checkout add recipes/soci
150151
git fetch origin master
151152
git checkout master
153+
conan export --version 2015.03 recipes/ed25519/all
152154
conan export --version 1.1.10 recipes/snappy/all
153155
conan export --version 4.0.3 recipes/soci/all
154156
rm -rf .git
@@ -162,7 +164,8 @@ the new recipe will be automatically pulled from the official Conan Center.
162164

163165
> [!NOTE]
164166
> You might need to add `--lockfile=""` to your `conan install` command
165-
> to avoid automatic use of the existing `conan.lock` file when you run `conan export` manually on your machine
167+
> to avoid automatic use of the existing `conan.lock` file when you run
168+
> `conan export` manually on your machine
166169
167170
### Conan profile tweaks
168171

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ set(SECP256K1_BUILD_CTIME_TESTS FALSE)
9797
set(SECP256K1_BUILD_EXAMPLES FALSE)
9898
add_subdirectory(external/secp256k1)
9999
add_library(secp256k1::secp256k1 ALIAS secp256k1)
100-
add_subdirectory(external/ed25519-donna)
101100
add_subdirectory(external/antithesis-sdk)
102101
find_package(gRPC REQUIRED)
103102
find_package(lz4 REQUIRED)
@@ -117,8 +116,9 @@ if(rocksdb)
117116
target_link_libraries(xrpl_libs INTERFACE RocksDB::rocksdb)
118117
endif()
119118

120-
find_package(nudb REQUIRED)
121119
find_package(date REQUIRED)
120+
find_package(ed25519 REQUIRED)
121+
find_package(nudb REQUIRED)
122122
find_package(xxHash REQUIRED)
123123

124124
target_link_libraries(xrpl_libs INTERFACE

conan.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"libarchive/3.8.1#ffee18995c706e02bf96e7a2f7042e0d%1764175360.142",
1818
"jemalloc/5.3.0#e951da9cf599e956cebc117880d2d9f8%1729241615.244",
1919
"grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1756234248.958",
20+
"ed25519/2015.03#17c1f1910e769f368025267a53c23c13%1764259445.491",
2021
"doctest/2.4.12#eb9fb352fb2fdfc8abb17ec270945165%1762797941.757",
2122
"date/3.0.4#862e11e80030356b53c2c38599ceb32b%1763584497.32",
2223
"c-ares/1.34.5#5581c2b62a608b40bb85d965ab3ec7c8%1764175359.429",

conanfile.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ class Xrpl(ConanFile):
2828
}
2929

3030
requires = [
31+
"ed25519/2015.03",
3132
"grpc/1.50.1",
3233
"libarchive/3.8.1",
3334
"nudb/2.0.9",
@@ -188,6 +189,7 @@ def package_info(self):
188189
"boost::system",
189190
"boost::thread",
190191
"date::date",
192+
"ed25519::ed25519",
191193
"grpc::grpc++",
192194
"libarchive::libarchive",
193195
"lz4::lz4",

external/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ The subdirectories in this directory contain external libraries used by rippled.
55
| Folder | Upstream | Description |
66
| :--------------- | :------------------------------------------------------------- | :------------------------------------------------------------------------------------------- |
77
| `antithesis-sdk` | [Project](https://github.com/antithesishq/antithesis-sdk-cpp/) | [Antithesis](https://antithesis.com/docs/using_antithesis/sdk/cpp/overview.html) SDK for C++ |
8-
| `ed25519-donna` | [Project](https://github.com/floodyberry/ed25519-donna) | [Ed25519](http://ed25519.cr.yp.to/) digital signatures |
98
| `secp256k1` | [Project](https://github.com/bitcoin-core/secp256k1) | ECDSA digital signatures using the **secp256k1** curve |

external/ed25519-donna/CMakeLists.txt

Lines changed: 0 additions & 51 deletions
This file was deleted.

external/ed25519-donna/README.md

Lines changed: 0 additions & 183 deletions
This file was deleted.

0 commit comments

Comments
 (0)