Skip to content

Commit ed9223d

Browse files
authored
Merge branch 'develop' into release/2024.7-doubledecker
2 parents ebac4e8 + 962684f commit ed9223d

File tree

228 files changed

+5290
-2888
lines changed

Some content is hidden

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

228 files changed

+5290
-2888
lines changed

.github/workflows/cd-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ jobs:
4141
# This is a workaround replacement which builds on the last working commit b332a6b55668f60988e36961f3f62a794ba82ddb and then on current branch
4242
- name: Save current branch to ~/current_branch
4343
run: git rev-parse --abbrev-ref HEAD > ~/current_branch
44-
- name: Git pull & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
45-
run: git pull && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
44+
- name: Git pull, reset & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
45+
run: git pull && git reset --hard && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
4646
- name: Build all projects in documentation/ & move to ~/dist/docs/ from b332a6b55668f60988e36961f3f62a794ba82ddb
4747
run: cd documentation && ./build_all_to_dist.sh
4848

.github/workflows/ci-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ jobs:
4646
# This is a workaround replacement which builds on the last working commit b332a6b55668f60988e36961f3f62a794ba82ddb and then on current branch
4747
- name: Save current branch to ~/current_branch
4848
run: git rev-parse --abbrev-ref HEAD > ~/current_branch
49-
- name: Git pull & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
50-
run: git pull && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
49+
- name: Git pull, reset & switch to b332a6b55668f60988e36961f3f62a794ba82ddb
50+
run: git pull && git reset --hard && git checkout b332a6b55668f60988e36961f3f62a794ba82ddb
5151
- name: Build all projects in documentation/ & move to ~/dist/docs/ from b332a6b55668f60988e36961f3f62a794ba82ddb
5252
run: cd documentation && ./build_all_to_dist.sh
5353

Cargo.lock

Lines changed: 68 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ members = [
2020
"clients/native",
2121
"clients/native/websocket-requests",
2222
"clients/socks5",
23+
"common/authenticator-requests",
2324
"common/async-file-watcher",
2425
"common/bandwidth-controller",
2526
"common/bin-common",
@@ -76,7 +77,6 @@ members = [
7677
"common/socks5-client-core",
7778
"common/socks5/proxy-helpers",
7879
"common/socks5/requests",
79-
"common/statistics",
8080
"common/store-cipher",
8181
"common/task",
8282
"common/topology",
@@ -96,10 +96,10 @@ members = [
9696
"mixnode",
9797
"sdk/lib/socks5-listener",
9898
"sdk/rust/nym-sdk",
99+
"service-providers/authenticator",
99100
"service-providers/common",
100101
"service-providers/ip-packet-router",
101102
"service-providers/network-requester",
102-
"service-providers/network-statistics",
103103
"nym-api",
104104
"nym-browser-extension/storage",
105105
"nym-api/nym-api-requests",
@@ -127,7 +127,6 @@ default-members = [
127127
"clients/socks5",
128128
"gateway",
129129
"service-providers/network-requester",
130-
"service-providers/network-statistics",
131130
"mixnode",
132131
"nym-api",
133132
"tools/nymvisor",
@@ -192,12 +191,15 @@ cupid = "0.6.1"
192191
curve25519-dalek = "4.1"
193192
dashmap = "5.5.3"
194193
defguard_wireguard_rs = "0.4.2"
194+
digest = "0.10.7"
195+
dirs = "4.0"
195196
doc-comment = "0.3"
196197
dotenvy = "0.15.6"
197198
ecdsa = "0.16"
198199
ed25519-dalek = "2.1"
199200
etherparse = "0.13.0"
200201
eyre = "0.6.9"
202+
fastrand = "2.1.0"
201203
flate2 = "1.0.28"
202204
futures = "0.3.28"
203205
generic-array = "0.14.7"
@@ -209,14 +211,15 @@ hex = "0.4.3"
209211
hex-literal = "0.3.3"
210212
hkdf = "0.12.3"
211213
hmac = "0.12.1"
214+
http = "1"
212215
httpcodec = "0.2.3"
213216
humantime = "2.1.0"
214217
humantime-serde = "1.1.1"
215-
http = "1"
216218
hyper = "1.3.1"
217219
indexed_db_futures = "0.3.0"
218220
inquire = "0.6.2"
219221
ip_network = "0.4.1"
222+
ipnetwork = "0.16"
220223
isocountry = "0.3.2"
221224
k256 = "0.13"
222225
lazy_static = "1.4.0"
@@ -239,6 +242,7 @@ publicsuffix = "2.2.3"
239242
quote = "1"
240243
rand = "0.8.5"
241244
rand-07 = "0.7.3"
245+
rand_chacha = "0.3"
242246
rand_chacha_02 = "0.2"
243247
rand_core = "0.6.3"
244248
rand_distr = "0.4"
@@ -252,19 +256,22 @@ rocket_cors = "0.6.0"
252256
rocket_okapi = "0.8.0"
253257
safer-ffi = "0.1.4"
254258
schemars = "0.8.1"
259+
semver = "1.0.23"
255260
serde = "1.0.152"
256261
serde_bytes = "0.11.6"
257262
serde_derive = "1.0"
258263
serde_json = "1.0.91"
259264
serde_repr = "0.1"
260265
serde_with = "3.4.0"
261266
serde_yaml = "0.9.25"
267+
sha2 = "0.10.8"
262268
si-scale = "0.2.2"
263269
sphinx-packet = "0.1.1"
264270
sqlx = "0.6.3"
265271
strum = "0.25"
266272
subtle-encoding = "0.5"
267273
syn = "1"
274+
sysinfo = "0.30.12"
268275
tap = "1.0.1"
269276
tar = "0.4.40"
270277
tempfile = "3.5.0"
@@ -275,6 +282,7 @@ tokio-stream = "0.1.14"
275282
tokio-test = "0.4.2"
276283
tokio-tungstenite = { version = "0.20.1" }
277284
tokio-util = "0.7.10"
285+
toml = "0.8.14"
278286
tower = "0.4.13"
279287
tower-http = "0.5.2"
280288
tracing = "0.1.37"
@@ -289,6 +297,7 @@ utoipa-swagger-ui = "6.0.0"
289297
vergen = { version = "=8.3.1", default-features = false }
290298
walkdir = "2"
291299
wasm-bindgen-test = "0.3.36"
300+
x25519-dalek = "2.0.0"
292301
zeroize = "1.6.0"
293302

294303
prometheus = { version = "0.13.0" }
@@ -336,6 +345,7 @@ wasm-bindgen = "0.2.92"
336345
wasm-bindgen-futures = "0.4.39"
337346
wasmtimer = "0.2.0"
338347
web-sys = "0.3.69"
348+
itertools = "0.12.0"
339349

340350

341351
# Profile settings for individual crates

0 commit comments

Comments
 (0)