[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-depolymerization] branch master updated (4f43c37 -> a5767d9)
|
From: |
gnunet |
|
Subject: |
[taler-depolymerization] branch master updated (4f43c37 -> a5767d9) |
|
Date: |
Sun, 11 Dec 2022 18:34:42 +0100 |
This is an automated email from the git hooks/post-receive script.
antoine pushed a change to branch master
in repository depolymerization.
from 4f43c37 BRAINS2022 presentation: use wide format
new 4785103 Update dependencies
new 6676e05 Bump msrv to 1.63.0 to follow debian package
new a5767d9 Merge branch 'master' of
git+ssh://git.taler.net/depolymerization
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Cargo.lock | 679 +++++++++++++++++++++++++---------------
btc-wire/Cargo.toml | 14 +-
btc-wire/src/bin/segwit-demo.rs | 2 +-
btc-wire/src/fail_point.rs | 2 +-
btc-wire/src/loops/analysis.rs | 2 +-
btc-wire/src/loops/worker.rs | 4 +-
btc-wire/src/main.rs | 2 +-
btc-wire/src/rpc.rs | 5 +-
btc-wire/src/rpc_utils.rs | 2 +-
btc-wire/src/taler_utils.rs | 6 +-
common/Cargo.toml | 18 +-
common/src/log.rs | 7 +-
common/src/metadata.rs | 4 +-
eth-wire/Cargo.toml | 12 +-
eth-wire/src/fail_point.rs | 2 +-
eth-wire/src/loops.rs | 2 +-
eth-wire/src/loops/analysis.rs | 2 +-
eth-wire/src/loops/worker.rs | 8 +-
eth-wire/src/main.rs | 2 +-
eth-wire/src/rpc.rs | 6 +-
eth-wire/src/taler_util.rs | 6 +-
instrumentation/Cargo.toml | 12 +-
instrumentation/src/eth.rs | 2 +-
instrumentation/src/main.rs | 26 +-
makefile | 5 +-
script/prepare.sh | 12 +-
uri-pack/Cargo.toml | 4 +-
uri-pack/src/lib.rs | 6 +-
wire-gateway/Cargo.toml | 24 +-
wire-gateway/src/main.rs | 4 +-
30 files changed, 523 insertions(+), 359 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 77ceb84..81b15e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -30,9 +30,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "0.7.19"
+version = "0.7.20"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
dependencies = [
"memchr",
]
@@ -54,9 +54,9 @@ checksum =
"4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]]
name = "async-trait"
-version = "0.1.57"
+version = "0.1.59"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"
+checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364"
dependencies = [
"proc-macro2",
"quote",
@@ -69,7 +69,7 @@ version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
- "hermit-abi",
+ "hermit-abi 0.1.19",
"libc",
"winapi",
]
@@ -103,9 +103,15 @@ checksum =
"23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
[[package]]
name = "base64"
-version = "0.13.0"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "base64"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
[[package]]
name = "bech32"
@@ -115,9 +121,9 @@ checksum =
"d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
[[package]]
name = "bitcoin"
-version = "0.29.1"
+version = "0.29.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9cb36de3b18ad25f396f9168302e36fb7e1e8923298ab3127da252d288d5af9d"
+checksum = "0694ea59225b0c5f3cb405ff3f670e4828358ed26aec49dc352f730f0cb1a8a3"
dependencies = [
"bech32",
"bitcoin_hashes",
@@ -165,10 +171,10 @@ dependencies = [
name = "btc-wire"
version = "0.1.0"
dependencies = [
- "base64",
+ "base64 0.20.0",
"bech32",
"bitcoin",
- "clap",
+ "clap 4.0.29",
"common",
"criterion",
"hex",
@@ -181,9 +187,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.11.0"
+version = "3.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
[[package]]
name = "byteorder"
@@ -193,9 +199,9 @@ checksum =
"14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
[[package]]
name = "bytes"
-version = "1.2.1"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"
+checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
[[package]]
name = "cast"
@@ -205,9 +211,9 @@ checksum =
"37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
-version = "1.0.73"
+version = "1.0.77"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
[[package]]
name = "cfg-if"
@@ -217,13 +223,14 @@ checksum =
"baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
-version = "0.4.22"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
dependencies = [
"iana-time-zone",
"num-integer",
"num-traits",
+ "serde",
"winapi",
]
@@ -262,26 +269,36 @@ dependencies = [
[[package]]
name = "clap"
-version = "3.2.21"
+version = "3.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1ed5341b2301a26ab80be5cbdced622e80ed808483c52e45e3310a877d3b37d7"
+checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
dependencies = [
- "atty",
"bitflags",
- "clap_derive",
- "clap_lex",
+ "clap_lex 0.2.4",
"indexmap",
+ "textwrap",
+]
+
+[[package]]
+name = "clap"
+version = "4.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d"
+dependencies = [
+ "bitflags",
+ "clap_derive",
+ "clap_lex 0.3.0",
+ "is-terminal",
"once_cell",
"strsim",
"termcolor",
- "textwrap",
]
[[package]]
name = "clap_derive"
-version = "3.2.18"
+version = "4.0.21"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
dependencies = [
"heck",
"proc-macro-error",
@@ -299,16 +316,35 @@ dependencies = [
"os_str_bytes",
]
+[[package]]
+name = "clap_lex"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
+dependencies = [
+ "os_str_bytes",
+]
+
[[package]]
name = "clap_mangen"
-version = "0.1.11"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "105180c05a72388d5f5e4e4f6c79eecb92497bda749fa8f963a16647c5d5377f"
+checksum = "e503c3058af0a0854668ea01db55c622482a080092fede9dd2e00a00a9436504"
dependencies = [
- "clap",
+ "clap 4.0.29",
"roff",
]
+[[package]]
+name = "codespan-reporting"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
+dependencies = [
+ "termcolor",
+ "unicode-width",
+]
+
[[package]]
name = "color-backtrace"
version = "0.5.1"
@@ -334,7 +370,6 @@ dependencies = [
"serde_json",
"serde_with",
"thiserror",
- "time",
"uri-pack",
"url",
"zeroize",
@@ -374,7 +409,7 @@ dependencies = [
"atty",
"cast",
"ciborium",
- "clap",
+ "clap 3.2.23",
"criterion-plot",
"itertools",
"lazy_static",
@@ -423,26 +458,24 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
-version = "0.9.10"
+version = "0.9.13"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1"
+checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
dependencies = [
"autocfg",
"cfg-if",
"crossbeam-utils",
"memoffset",
- "once_cell",
"scopeguard",
]
[[package]]
name = "crossbeam-utils"
-version = "0.8.11"
+version = "0.8.14"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
dependencies = [
"cfg-if",
- "once_cell",
]
[[package]]
@@ -483,11 +516,55 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "cxx"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
+dependencies = [
+ "cc",
+ "cxxbridge-flags",
+ "cxxbridge-macro",
+ "link-cplusplus",
+]
+
+[[package]]
+name = "cxx-build"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
+dependencies = [
+ "cc",
+ "codespan-reporting",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "scratch",
+ "syn",
+]
+
+[[package]]
+name = "cxxbridge-flags"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
+
+[[package]]
+name = "cxxbridge-macro"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "darling"
-version = "0.13.4"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
+checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa"
dependencies = [
"darling_core",
"darling_macro",
@@ -495,9 +572,9 @@ dependencies = [
[[package]]
name = "darling_core"
-version = "0.13.4"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
+checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f"
dependencies = [
"fnv",
"ident_case",
@@ -509,9 +586,9 @@ dependencies = [
[[package]]
name = "darling_macro"
-version = "0.13.4"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
+checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
dependencies = [
"darling_core",
"quote",
@@ -533,9 +610,9 @@ dependencies = [
[[package]]
name = "deadpool-postgres"
-version = "0.10.2"
+version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c668a58063c6331e3437e3146970943ad82b1b36169fd979bb2645ac2088209a"
+checksum = "e866e414e9e12fc988f0bfb89a0b86228e7ed196ca509fbc4dcbc738c56e753c"
dependencies = [
"deadpool",
"log",
@@ -554,9 +631,9 @@ dependencies = [
[[package]]
name = "digest"
-version = "0.10.3"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
+checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
dependencies = [
"block-buffer",
"crypto-common",
@@ -585,11 +662,32 @@ dependencies = [
"regex",
]
+[[package]]
+name = "errno"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
[[package]]
name = "eth-wire"
version = "0.1.0"
dependencies = [
- "clap",
+ "clap 4.0.29",
"common",
"ethereum-types",
"hex",
@@ -601,9 +699,9 @@ dependencies = [
[[package]]
name = "ethbloom"
-version = "0.12.1"
+version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "11da94e443c60508eb62cf256243a64da87304c2802ac2528847f79d750007ef"
+checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60"
dependencies = [
"crunchy",
"fixed-hash",
@@ -613,9 +711,9 @@ dependencies = [
[[package]]
name = "ethereum-types"
-version = "0.13.1"
+version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b2827b94c556145446fcce834ca86b7abf0c39a805883fe20e72c5bfdb5a0dc6"
+checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee"
dependencies = [
"ethbloom",
"fixed-hash",
@@ -641,9 +739,9 @@ dependencies = [
[[package]]
name = "fixed-hash"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
dependencies = [
"byteorder",
"rustc-hex",
@@ -652,19 +750,19 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.24"
+version = "1.0.25"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
dependencies = [
"crc32fast",
- "miniz_oxide 0.5.4",
+ "miniz_oxide 0.6.2",
]
[[package]]
name = "flexi_logger"
-version = "0.23.0"
+version = "0.24.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f8790f70905b203171c21060222f18f1df5cba07317860215b7880b32aaef290"
+checksum = "99659bcfd52cfece972bd00acb9dba7028094d47e699ea8b193b9aaebd5c362b"
dependencies = [
"chrono",
"glob",
@@ -672,7 +770,6 @@ dependencies = [
"log",
"rustversion",
"thiserror",
- "time",
]
[[package]]
@@ -690,26 +787,11 @@ dependencies = [
"percent-encoding",
]
-[[package]]
-name = "futures"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
[[package]]
name = "futures-channel"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
+checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
dependencies = [
"futures-core",
"futures-sink",
@@ -717,32 +799,15 @@ dependencies = [
[[package]]
name = "futures-core"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
+checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
[[package]]
name = "futures-macro"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
+checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
dependencies = [
"proc-macro2",
"quote",
@@ -751,29 +816,26 @@ dependencies = [
[[package]]
name = "futures-sink"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
+checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
[[package]]
name = "futures-task"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
+checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
[[package]]
name = "futures-util"
-version = "0.3.24"
+version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
+checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
dependencies = [
- "futures-channel",
"futures-core",
- "futures-io",
"futures-macro",
"futures-sink",
"futures-task",
- "memchr",
"pin-project-lite",
"pin-utils",
"slab",
@@ -791,9 +853,9 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.2.7"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
dependencies = [
"cfg-if",
"libc",
@@ -842,6 +904,15 @@ dependencies = [
"libc",
]
+[[package]]
+name = "hermit-abi"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "hex"
version = "0.4.3"
@@ -865,7 +936,7 @@ checksum =
"75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
dependencies = [
"bytes",
"fnv",
- "itoa 1.0.3",
+ "itoa 1.0.4",
]
[[package]]
@@ -893,9 +964,9 @@ checksum =
"c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
[[package]]
name = "hyper"
-version = "0.14.20"
+version = "0.14.23"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac"
+checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
dependencies = [
"bytes",
"futures-channel",
@@ -905,7 +976,7 @@ dependencies = [
"http-body",
"httparse",
"httpdate",
- "itoa 1.0.3",
+ "itoa 1.0.4",
"pin-project-lite",
"socket2",
"tokio",
@@ -929,18 +1000,28 @@ dependencies = [
[[package]]
name = "iana-time-zone"
-version = "0.1.48"
+version = "0.1.53"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "237a0714f28b1ee39ccec0770ccb544eb02c9ef2c82bb096230eefcffa6468b0"
+checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
dependencies = [
"android_system_properties",
"core-foundation-sys",
+ "iana-time-zone-haiku",
"js-sys",
- "once_cell",
"wasm-bindgen",
"winapi",
]
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+dependencies = [
+ "cxx",
+ "cxx-build",
+]
+
[[package]]
name = "ident_case"
version = "1.0.1"
@@ -959,21 +1040,22 @@ dependencies = [
[[package]]
name = "impl-serde"
-version = "0.3.2"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
+checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
dependencies = [
"serde",
]
[[package]]
name = "indexmap"
-version = "1.9.1"
+version = "1.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
dependencies = [
"autocfg",
"hashbrown",
+ "serde",
]
[[package]]
@@ -991,7 +1073,7 @@ version = "0.1.0"
dependencies = [
"bitcoin",
"btc-wire",
- "clap",
+ "clap 4.0.29",
"clap_mangen",
"color-backtrace",
"common",
@@ -1005,11 +1087,33 @@ dependencies = [
"ureq",
]
+[[package]]
+name = "io-lifetimes"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
+dependencies = [
+ "hermit-abi 0.2.6",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys",
+]
+
[[package]]
name = "itertools"
-version = "0.10.4"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d8bf247779e67a9082a4790b45e71ac7cfd1321331a5c856a74a9faebdab78d0"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
dependencies = [
"either",
]
@@ -1022,9 +1126,9 @@ checksum =
"b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
[[package]]
name = "itoa"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
[[package]]
name = "js-sys"
@@ -1043,28 +1147,43 @@ checksum =
"e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.132"
+version = "0.2.138"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
[[package]]
name = "libdeflate-sys"
-version = "0.10.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "43afa5b192ff058426ba20a4f35c290ef402478d6045ac934ac15aa947a3898d"
+checksum = "cb6784b6b84b67d71b4307963d456a9c7c29f9b47c658f533e598de369e34277"
dependencies = [
"cc",
]
[[package]]
name = "libdeflater"
-version = "0.10.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e656b7960ec49e864badc7ad1b810427a7ac8b78511a699ce5cdc3ead0b32e5b"
+checksum = "d8e285aa6a046fd338b2592c16bee148b2b00789138ed6b7bb56bb13d585050d"
dependencies = [
"libdeflate-sys",
]
+[[package]]
+name = "link-cplusplus"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
+
[[package]]
name = "listenfd"
version = "1.0.0"
@@ -1078,9 +1197,9 @@ dependencies = [
[[package]]
name = "lock_api"
-version = "0.4.8"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
dependencies = [
"autocfg",
"scopeguard",
@@ -1097,9 +1216,9 @@ dependencies = [
[[package]]
name = "md-5"
-version = "0.10.4"
+version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "66b48670c893079d3c2ed79114e3644b7004df1c361a4e0ad52e2e6940d07c3d"
+checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
dependencies = [
"digest",
]
@@ -1112,9 +1231,9 @@ checksum =
"2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]]
name = "memoffset"
-version = "0.6.5"
+version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
dependencies = [
"autocfg",
]
@@ -1139,9 +1258,9 @@ dependencies = [
[[package]]
name = "mio"
-version = "0.8.4"
+version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
+checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
dependencies = [
"libc",
"log",
@@ -1170,20 +1289,11 @@ dependencies = [
[[package]]
name = "num_cpus"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.6"
+version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
dependencies = [
+ "hermit-abi 0.1.19",
"libc",
]
@@ -1198,9 +1308,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.14.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
[[package]]
name = "oorandom"
@@ -1220,9 +1330,9 @@ dependencies = [
[[package]]
name = "os_str_bytes"
-version = "6.3.0"
+version = "6.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
[[package]]
name = "owo-colors"
@@ -1242,9 +1352,9 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.3"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
dependencies = [
"cfg-if",
"libc",
@@ -1261,18 +1371,18 @@ checksum =
"478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]]
name = "phf"
-version = "0.10.1"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
+checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
dependencies = [
"phf_shared",
]
[[package]]
name = "phf_shared"
-version = "0.10.0"
+version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
dependencies = [
"siphasher",
]
@@ -1339,13 +1449,13 @@ dependencies = [
[[package]]
name = "postgres"
-version = "0.19.3"
+version = "0.19.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c8bbcd5f6deb39585a0d9f4ef34c4a41c25b7ad26d23c75d837d78c8e7adc85f"
+checksum = "960c214283ef8f0027974c03e9014517ced5db12f021a9abb66185a5751fab0a"
dependencies = [
"bytes",
"fallible-iterator",
- "futures",
+ "futures-util",
"log",
"tokio",
"tokio-postgres",
@@ -1357,7 +1467,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "878c6cbf956e03af9aa8204b407b9cbf47c072164800aa918c516cd4b056c50c"
dependencies = [
- "base64",
+ "base64 0.13.1",
"byteorder",
"bytes",
"fallible-iterator",
@@ -1382,15 +1492,15 @@ dependencies = [
[[package]]
name = "ppv-lite86"
-version = "0.2.16"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
[[package]]
name = "primitive-types"
-version = "0.11.1"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a"
+checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
dependencies = [
"fixed-hash",
"impl-serde",
@@ -1423,9 +1533,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.43"
+version = "1.0.47"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
dependencies = [
"unicode-ident",
]
@@ -1493,21 +1603,19 @@ dependencies = [
[[package]]
name = "rayon"
-version = "1.5.3"
+version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
+checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
dependencies = [
- "autocfg",
- "crossbeam-deque",
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
-version = "1.9.3"
+version = "1.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
+checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
@@ -1526,9 +1634,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
dependencies = [
"aho-corasick",
"memchr",
@@ -1543,9 +1651,9 @@ checksum =
"6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
[[package]]
name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.28"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
[[package]]
name = "remove_dir_all"
@@ -1605,11 +1713,25 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
+[[package]]
+name = "rustix"
+version = "0.36.5"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
[[package]]
name = "rustls"
-version = "0.20.6"
+version = "0.20.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033"
+checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
dependencies = [
"log",
"ring",
@@ -1644,6 +1766,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+[[package]]
+name = "scratch"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+
[[package]]
name = "sct"
version = "0.7.0"
@@ -1656,9 +1784,9 @@ dependencies = [
[[package]]
name = "secp256k1"
-version = "0.24.0"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b7649a0b3ffb32636e60c7ce0d70511eda9c52c658cd0634e194d5a19943aeff"
+checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3"
dependencies = [
"bitcoin_hashes",
"secp256k1-sys",
@@ -1667,27 +1795,27 @@ dependencies = [
[[package]]
name = "secp256k1-sys"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7058dc8eaf3f2810d7828680320acda0b25a288f6d288e19278e249bbf74226b"
+checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
dependencies = [
"cc",
]
[[package]]
name = "serde"
-version = "1.0.144"
+version = "1.0.149"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
+checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.144"
+version = "1.0.149"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
+checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4"
dependencies = [
"proc-macro2",
"quote",
@@ -1696,11 +1824,11 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.85"
+version = "1.0.89"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
+checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
dependencies = [
- "itoa 1.0.3",
+ "itoa 1.0.4",
"ryu",
"serde",
]
@@ -1723,26 +1851,32 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [
"form_urlencoded",
- "itoa 1.0.3",
+ "itoa 1.0.4",
"ryu",
"serde",
]
[[package]]
name = "serde_with"
-version = "1.14.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
+checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef"
dependencies = [
+ "base64 0.13.1",
+ "chrono",
+ "hex",
+ "indexmap",
"serde",
+ "serde_json",
"serde_with_macros",
+ "time",
]
[[package]]
name = "serde_with_macros"
-version = "1.5.2"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
+checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa"
dependencies = [
"darling",
"proc-macro2",
@@ -1752,9 +1886,9 @@ dependencies = [
[[package]]
name = "sha2"
-version = "0.10.5"
+version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cf9db03534dff993187064c4e0c05a5708d2a9728ace9a8959b77bedf415dac5"
+checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
dependencies = [
"cfg-if",
"cpufeatures",
@@ -1778,9 +1912,9 @@ dependencies = [
[[package]]
name = "smallvec"
-version = "1.9.0"
+version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "socket2"
@@ -1828,9 +1962,9 @@ checksum =
"6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]
name = "syn"
-version = "1.0.99"
+version = "1.0.105"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
dependencies = [
"proc-macro2",
"quote",
@@ -1862,24 +1996,24 @@ dependencies = [
[[package]]
name = "textwrap"
-version = "0.15.0"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
name = "thiserror"
-version = "1.0.35"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85"
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.35"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783"
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
dependencies = [
"proc-macro2",
"quote",
@@ -1888,21 +2022,30 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.13"
+version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "db76ff9fa4b1458b3c7f077f3ff9887394058460d21e634355b273aaf11eea45"
+checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
dependencies = [
- "itoa 1.0.3",
- "libc",
- "num_threads",
+ "itoa 1.0.4",
+ "serde",
+ "time-core",
"time-macros",
]
+[[package]]
+name = "time-core"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
+
[[package]]
name = "time-macros"
-version = "0.2.4"
+version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
+checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
+dependencies = [
+ "time-core",
+]
[[package]]
name = "tiny-keccak"
@@ -1940,9 +2083,9 @@ checksum =
"cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.21.1"
+version = "1.23.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95"
+checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
dependencies = [
"autocfg",
"bytes",
@@ -1950,18 +2093,17 @@ dependencies = [
"memchr",
"mio",
"num_cpus",
- "once_cell",
"pin-project-lite",
"socket2",
"tokio-macros",
- "winapi",
+ "windows-sys",
]
[[package]]
name = "tokio-macros"
-version = "1.8.0"
+version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
+checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
dependencies = [
"proc-macro2",
"quote",
@@ -1970,15 +2112,16 @@ dependencies = [
[[package]]
name = "tokio-postgres"
-version = "0.7.6"
+version = "0.7.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "19c88a47a23c5d2dc9ecd28fb38fba5fc7e5ddc1fe64488ec145076b0c71c8ae"
+checksum = "29a12c1b3e0704ae7dfc25562629798b29c72e6b1d0a681b6f29ab4ae5e7f7bf"
dependencies = [
"async-trait",
"byteorder",
"bytes",
"fallible-iterator",
- "futures",
+ "futures-channel",
+ "futures-util",
"log",
"parking_lot",
"percent-encoding",
@@ -2013,9 +2156,9 @@ checksum =
"b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "tracing"
-version = "0.1.36"
+version = "0.1.37"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
dependencies = [
"cfg-if",
"pin-project-lite",
@@ -2024,9 +2167,9 @@ dependencies = [
[[package]]
name = "tracing-core"
-version = "0.1.29"
+version = "0.1.30"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
dependencies = [
"once_cell",
]
@@ -2039,15 +2182,15 @@ checksum =
"59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "typenum"
-version = "1.15.0"
+version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
[[package]]
name = "uint"
-version = "0.9.3"
+version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
dependencies = [
"byteorder",
"crunchy",
@@ -2063,19 +2206,25 @@ checksum =
"099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
[[package]]
name = "unicode-ident"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
[[package]]
name = "unicode-normalization"
-version = "0.1.21"
+version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
dependencies = [
"tinyvec",
]
+[[package]]
+name = "unicode-width"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
[[package]]
name = "untrusted"
version = "0.7.1"
@@ -2088,7 +2237,7 @@ version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f"
dependencies = [
- "base64",
+ "base64 0.13.1",
"chunked_transfer",
"flate2",
"log",
@@ -2129,9 +2278,9 @@ dependencies = [
[[package]]
name = "uuid"
-version = "1.1.2"
+version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f"
+checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
[[package]]
name = "version_check"
@@ -2242,9 +2391,9 @@ dependencies = [
[[package]]
name = "webpki-roots"
-version = "0.22.4"
+version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
dependencies = [
"webpki",
]
@@ -2282,53 +2431,67 @@ checksum =
"712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
-version = "0.36.1"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
+ "windows_aarch64_gnullvm",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
"windows_x86_64_msvc",
]
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+
[[package]]
name = "windows_aarch64_msvc"
-version = "0.36.1"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
[[package]]
name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
[[package]]
name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
[[package]]
name = "wire-gateway"
version = "0.1.0"
dependencies = [
"bitcoin",
- "clap",
+ "clap 4.0.29",
"common",
"deadpool-postgres",
"ethereum-types",
diff --git a/btc-wire/Cargo.toml b/btc-wire/Cargo.toml
index 4914eaf..7be17c0 100644
--- a/btc-wire/Cargo.toml
+++ b/btc-wire/Cargo.toml
@@ -3,7 +3,7 @@ name = "btc-wire"
version = "0.1.0"
edition = "2021"
license = "AGPL-3.0-or-later"
-rust-version = "1.57.0"
+rust-version = "1.63.0"
[features]
# Enable random failures
@@ -11,21 +11,21 @@ fail = []
[dependencies]
# Typed bitcoin rpc types
-bitcoin = { version = "0.29.1", features = [
+bitcoin = { version = "0.29.2", features = [
"std",
"serde",
], default-features = false }
# Cli args parser
-clap = { version = "3.2.21", features = ["derive"] }
+clap = { version = "4.0.29", features = ["derive"] }
# Bech32 encoding and decoding
bech32 = "0.9.1"
# Serialization library
-serde = { version = "1.0.144", features = ["derive"] }
-serde_json = "1.0.85"
+serde = { version = "1.0.149", features = ["derive"] }
+serde_json = "1.0.89"
serde_repr = "0.1.9"
# Error macros
-thiserror = "1.0.35"
-base64 = "0.13.0"
+thiserror = "1.0.37"
+base64 = "0.20.0"
# Common lib
common = { path = "../common" }
# Ini parser
diff --git a/btc-wire/src/bin/segwit-demo.rs b/btc-wire/src/bin/segwit-demo.rs
index d52a345..ff07ff3 100644
--- a/btc-wire/src/bin/segwit-demo.rs
+++ b/btc-wire/src/bin/segwit-demo.rs
@@ -31,7 +31,7 @@ pub fn main() {
.unwrap();
println!("Decode reserve public key: 0x{}", hex::encode(&decoded[..]));
let prefix: [u8; 4] = rand_slice();
- println!("Generate random prefix 0x{}", hex::encode(&prefix));
+ println!("Generate random prefix 0x{}", hex::encode(prefix));
println!(
"Split reserve public key in two:\n0x{}\n0x{}",
hex::encode(&decoded[..16]),
diff --git a/btc-wire/src/fail_point.rs b/btc-wire/src/fail_point.rs
index 2a482de..5975c9b 100644
--- a/btc-wire/src/fail_point.rs
+++ b/btc-wire/src/fail_point.rs
@@ -27,5 +27,5 @@ pub fn fail_point(msg: &'static str, prob: f32) -> Result<(),
Injected> {
Ok(())
};
- return Ok(());
+ Ok(())
}
diff --git a/btc-wire/src/loops/analysis.rs b/btc-wire/src/loops/analysis.rs
index 41bee1b..d2081d5 100644
--- a/btc-wire/src/loops/analysis.rs
+++ b/btc-wire/src/loops/analysis.rs
@@ -39,5 +39,5 @@ pub fn analysis(rpc: &mut Rpc, current: u32, max: u32) ->
LoopResult<u32> {
}
// TODO smarter analysis: suspicious transaction value, limit wire bitcoin
throughput
- return Ok(current);
+ Ok(current)
}
diff --git a/btc-wire/src/loops/worker.rs b/btc-wire/src/loops/worker.rs
index cce84fd..bda2c21 100644
--- a/btc-wire/src/loops/worker.rs
+++ b/btc-wire/src/loops/worker.rs
@@ -307,9 +307,9 @@ fn sync_chain_removed(
write!(&mut buf, "\n\tbounced {} in {}", id, bounced).unwrap();
}
error!("{}", buf);
- return Ok(false);
+ Ok(false)
} else {
- return Ok(true);
+ Ok(true)
}
}
diff --git a/btc-wire/src/main.rs b/btc-wire/src/main.rs
index 562ca55..7e7000e 100644
--- a/btc-wire/src/main.rs
+++ b/btc-wire/src/main.rs
@@ -20,7 +20,7 @@ use btc_wire::{
rpc::{self, auto_rpc_common, auto_rpc_wallet, ErrorCode, Rpc},
WireState,
};
-use clap::StructOpt;
+use clap::Parser;
use common::{
log::{log::info, OrFail},
named_spawn, password,
diff --git a/btc-wire/src/rpc.rs b/btc-wire/src/rpc.rs
index 0d80aee..9055233 100644
--- a/btc-wire/src/rpc.rs
+++ b/btc-wire/src/rpc.rs
@@ -212,7 +212,7 @@ impl Rpc {
// Read body
let amount = sock.read_until(b'\n', buf)?;
let response: RpcResponse<T> = serde_json::from_slice(&buf[..amount])?;
- let result = match response {
+ match response {
RpcResponse::RpcResponse { result, error, id } => {
assert_eq!(self.id, id);
self.id += 1;
@@ -229,8 +229,7 @@ impl Rpc {
}
}
RpcResponse::Error(msg) => Err(Error::Bitcoin(msg)),
- };
- return result;
+ }
}
/* ----- Wallet management ----- */
diff --git a/btc-wire/src/rpc_utils.rs b/btc-wire/src/rpc_utils.rs
index 21767d8..3548a5b 100644
--- a/btc-wire/src/rpc_utils.rs
+++ b/btc-wire/src/rpc_utils.rs
@@ -61,7 +61,7 @@ pub fn default_data_dir() -> PathBuf {
/// Minimum dust amount to perform a transaction to a segwit address
pub fn segwit_min_amount() -> Amount {
// https://github.com/bitcoin/bitcoin/blob/master/src/policy/policy.cpp
- return Amount::from_sat(294);
+ Amount::from_sat(294)
}
/// Get the first sender address from a raw transaction
diff --git a/btc-wire/src/taler_utils.rs b/btc-wire/src/taler_utils.rs
index 2658997..36bd233 100644
--- a/btc-wire/src/taler_utils.rs
+++ b/btc-wire/src/taler_utils.rs
@@ -35,18 +35,18 @@ pub fn btc_payto_addr(url: &Url) -> Result<Address, String>
{
));
}
let str = url.path().trim_start_matches('/');
- return Address::from_str(str).map_err(|e| e.to_string());
+ Address::from_str(str).map_err(|e| e.to_string())
}
/// Transform a btc amount into a taler amount
pub fn btc_to_taler(amount: &SignedAmount, currency: CurrencyBtc) -> Amount {
let unsigned = amount.abs().to_unsigned().unwrap();
let sat = unsigned.to_sat();
- return Amount::new(
+ Amount::new(
currency.to_str(),
sat / 100_000_000,
(sat % 100_000_000) as u32,
- );
+ )
}
/// Transform a taler amount into a btc amount
diff --git a/common/Cargo.toml b/common/Cargo.toml
index b64bf08..1386709 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -3,34 +3,30 @@ name = "common"
version = "0.1.0"
edition = "2021"
license = "AGPL-3.0-or-later"
-rust-version = "1.57.0"
+rust-version = "1.63.0"
# See more keys and their definitions at
https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
# Serialization framework
-serde = { version = "1.0.144", features = ["derive"] }
+serde = { version = "1.0.149", features = ["derive"] }
# Serialization helper
-serde_with = "1.14.0"
+serde_with = "2.1.0"
# JSON serialization
-serde_json = "1.0.85"
+serde_json = "1.0.89"
# Url format
url = { version = "2.3.1", features = ["serde"] }
# Crockford’s base32
base32 = "0.4.0"
# Error macros
-thiserror = "1.0.35"
+thiserror = "1.0.37"
# Ini files
rust-ini = "0.18.0"
# Logging
+flexi_logger = { version = "0.24.1", default-features = false }
log = "0.4.17"
-flexi_logger = { version = "=0.23.0", default-features = false, features = [
- "use_chrono_for_offset", # Temporary hack for multithreaded code
https://rustsec.org/advisories/RUSTSEC-2020-0159
-] }
-# Localized time
-time = { version = "=0.3.13", features = ["formatting", "macros"] }
# Postgres client
-postgres = "=0.19.3"
+postgres = "0.19.4"
# Secure random
rand = { version = "0.8.5", features = ["getrandom"] }
# Securely zero memory
diff --git a/common/src/log.rs b/common/src/log.rs
index 9c1c589..bb7c27e 100644
--- a/common/src/log.rs
+++ b/common/src/log.rs
@@ -17,11 +17,6 @@ use flexi_logger::{DeferredNow, LogSpecification, Record};
pub use log;
use log::error;
use std::{fmt::Display, process::exit};
-use time::{format_description::FormatItem, macros::format_description};
-
-const TIME_FORMAT: &[FormatItem<'static>] = format_description!(
- "[year]-[month]-[day]T[hour]:[minute]:[second].[subsecond
digits:6][offset_hour sign:mandatory][offset_minute]"
-);
fn custom_format(
w: &mut dyn std::io::Write,
@@ -31,7 +26,7 @@ fn custom_format(
write!(
w,
"{} {} {}",
- now.format(TIME_FORMAT),
+ now.format("[year]-[month]-[day]T[hour]:[minute]:[second].[subsecond
digits:6][offset_hour sign:mandatory][offset_minute]"),
record.level(),
&record.args()
)
diff --git a/common/src/metadata.rs b/common/src/metadata.rs
index 3b68978..011edce 100644
--- a/common/src/metadata.rs
+++ b/common/src/metadata.rs
@@ -65,7 +65,7 @@ impl OutMetadata {
buffer.extend_from_slice(bounced.as_ref());
}
}
- return Ok(buffer);
+ Ok(buffer)
}
pub fn decode(bytes: &[u8]) -> Result<Self, DecodeErr> {
@@ -117,7 +117,7 @@ impl InMetadata {
buffer.extend_from_slice(reserve_pub);
}
}
- return buffer;
+ buffer
}
pub fn decode(bytes: &[u8]) -> Result<Self, DecodeErr> {
diff --git a/eth-wire/Cargo.toml b/eth-wire/Cargo.toml
index d7fb6e1..8a8ef4d 100644
--- a/eth-wire/Cargo.toml
+++ b/eth-wire/Cargo.toml
@@ -3,7 +3,7 @@ name = "eth-wire"
version = "0.1.0"
edition = "2021"
license = "AGPL-3.0-or-later"
-rust-version = "1.57.0"
+rust-version = "1.63.0"
[features]
# Enable random failures
@@ -11,17 +11,17 @@ fail = []
[dependencies]
# Cli args
-clap = { version = "3.2.21", features = ["derive"] }
+clap = { version = "4.0.29", features = ["derive"] }
# Serialization library
-serde = { version = "1.0.144", features = ["derive"] }
-serde_json = "1.0.85"
+serde = { version = "1.0.149", features = ["derive"] }
+serde_json = "1.0.89"
serde_repr = "0.1.9"
hex = "0.4.3"
# Ethereum serializable types
-ethereum-types = { version = "0.13.1", default-features = false, features = [
+ethereum-types = { version = "0.14.1", default-features = false, features = [
"serialize",
] }
# Error macros
-thiserror = "1.0.35"
+thiserror = "1.0.37"
# Common lib
common = { path = "../common" }
diff --git a/eth-wire/src/fail_point.rs b/eth-wire/src/fail_point.rs
index 2a482de..5975c9b 100644
--- a/eth-wire/src/fail_point.rs
+++ b/eth-wire/src/fail_point.rs
@@ -27,5 +27,5 @@ pub fn fail_point(msg: &'static str, prob: f32) -> Result<(),
Injected> {
Ok(())
};
- return Ok(());
+ Ok(())
}
diff --git a/eth-wire/src/loops.rs b/eth-wire/src/loops.rs
index 6135b33..28a36e1 100644
--- a/eth-wire/src/loops.rs
+++ b/eth-wire/src/loops.rs
@@ -26,7 +26,7 @@ pub mod worker;
#[derive(Debug, thiserror::Error)]
pub enum LoopError {
#[error("RPC {0}")]
- RPC(#[from] rpc::Error),
+ Rpc(#[from] rpc::Error),
#[error("DB {0}")]
DB(#[from] postgres::Error),
#[error("Another eth-wire process is running concurrently")]
diff --git a/eth-wire/src/loops/analysis.rs b/eth-wire/src/loops/analysis.rs
index 546eb1e..1ad4169 100644
--- a/eth-wire/src/loops/analysis.rs
+++ b/eth-wire/src/loops/analysis.rs
@@ -30,5 +30,5 @@ pub fn analysis(fork: u32, current: u32, max: u32) ->
LoopResult<u32> {
);
return Ok(new_conf);
}
- return Ok(current);
+ Ok(current)
}
diff --git a/eth-wire/src/loops/worker.rs b/eth-wire/src/loops/worker.rs
index 379ea6f..81eb59c 100644
--- a/eth-wire/src/loops/worker.rs
+++ b/eth-wire/src/loops/worker.rs
@@ -125,7 +125,7 @@ pub fn worker(mut rpc: AutoRpcWallet, mut db:
AutoReconnectDb, mut state: WireSt
// approach is to wait for the next loop when an RPC error is
caught to prevent endless logged errors.
skip_notification = !matches!(
e,
- LoopError::RPC(rpc::Error::RPC { .. }) | LoopError::Concurrency
+ LoopError::Rpc(rpc::Error::RPC { .. }) | LoopError::Concurrency
);
} else {
skip_notification = false;
@@ -258,9 +258,9 @@ fn sync_chain_removed(
.unwrap();
}
error!("{}", buf);
- return Ok(false);
+ Ok(false)
} else {
- return Ok(true);
+ Ok(true)
}
}
@@ -505,7 +505,7 @@ fn bounce(db: &mut Client, rpc: &mut Rpc, fee: U256) ->
LoopResult<bool> {
"UPDATE bounce SET txid=$1, status=$2 WHERE id=$3",
&[&hash.as_ref(), &(BounceStatus::Sent as i16), &id],
)?;
- info!("|| {} in {}", hex::encode(&bounced),
hex::encode(&hash));
+ info!("|| {} in {}", hex::encode(bounced), hex::encode(hash));
}
None => {
db.execute(
diff --git a/eth-wire/src/main.rs b/eth-wire/src/main.rs
index 287cfd3..c3b0162 100644
--- a/eth-wire/src/main.rs
+++ b/eth-wire/src/main.rs
@@ -16,7 +16,7 @@
use std::path::PathBuf;
-use clap::StructOpt;
+use clap::Parser;
use common::{
log::{log::info, OrFail},
named_spawn, password,
diff --git a/eth-wire/src/rpc.rs b/eth-wire/src/rpc.rs
index ab9f5fd..6b670cb 100644
--- a/eth-wire/src/rpc.rs
+++ b/eth-wire/src/rpc.rs
@@ -195,7 +195,7 @@ impl Rpc {
fn handle_response<T>(&mut self, response: RpcResponse<T>) -> Result<T> {
assert_eq!(self.id, response.id);
self.id += 1;
- return if let Some(ok) = response.result {
+ if let Some(ok) = response.result {
Ok(ok)
} else {
Err(match response.error {
@@ -205,7 +205,7 @@ impl Rpc {
},
None => Error::Null,
})
- };
+ }
}
}
@@ -216,7 +216,7 @@ impl RpcClient for Rpc {
{
self.send(method, params)?;
let response = self.receive()?;
- return self.handle_response(response);
+ self.handle_response(response)
}
}
diff --git a/eth-wire/src/taler_util.rs b/eth-wire/src/taler_util.rs
index c4ff9aa..ac6456a 100644
--- a/eth-wire/src/taler_util.rs
+++ b/eth-wire/src/taler_util.rs
@@ -39,16 +39,16 @@ pub fn eth_payto_addr(url: &Url) -> Result<Address, String>
{
));
}
let str = url.path().trim_start_matches('/');
- return Address::from_str(str).map_err(|e| e.to_string());
+ Address::from_str(str).map_err(|e| e.to_string())
}
/// Transform a eth amount into a taler amount
pub fn eth_to_taler(amount: &U256, currency: CurrencyEth) -> Amount {
- return Amount::new(
+ Amount::new(
currency.to_str(),
(amount / WEI).as_u64(),
((amount % WEI) / TRUNC).as_u32(),
- );
+ )
}
/// Transform a eth amount into a btc amount
diff --git a/instrumentation/Cargo.toml b/instrumentation/Cargo.toml
index 5d6ac78..707c5f1 100644
--- a/instrumentation/Cargo.toml
+++ b/instrumentation/Cargo.toml
@@ -3,23 +3,23 @@ name = "instrumentation"
version = "0.1.0"
edition = "2021"
license = "AGPL-3.0-or-later"
-rust-version = "1.57.0"
+rust-version = "1.63.0"
[dependencies]
# Cli args parser
-clap = { version = "3.2.21", features = ["derive"] }
+clap = { version = "4.0.29", features = ["derive"] }
common = { path = "../common" }
# Bitcoin
btc-wire = { path = "../btc-wire" }
-bitcoin = { version = "0.29.1", default-features = false }
+bitcoin = { version = "0.29.2", default-features = false }
# Ethereum
eth-wire = { path = "../eth-wire" }
-ethereum-types = { version = "0.13.1", default-features = false }
+ethereum-types = { version = "0.14.1", default-features = false }
hex = "0.4.3"
# Wire Gateway
ureq = { version = "2.5.0", features = ["json"] }
# In memory deflate library
-libdeflater = "0.10.0"
+libdeflater = "0.11.0"
# Generate temporary files
tempfile = "3.3.0"
# RNG
@@ -31,4 +31,4 @@ color-backtrace = "0.5.1"
[build-dependencies]
-clap_mangen = "0.1"
+clap_mangen = "0.2.5"
diff --git a/instrumentation/src/eth.rs b/instrumentation/src/eth.rs
index b0a634d..265c43c 100644
--- a/instrumentation/src/eth.rs
+++ b/instrumentation/src/eth.rs
@@ -487,7 +487,7 @@ impl EthCtx {
}
pub fn amount(&self, amount: u32) -> U256 {
- return U256::from(amount) * TRUNC;
+ U256::from(amount) * TRUNC
}
/* ----- Transaction ------ */
diff --git a/instrumentation/src/main.rs b/instrumentation/src/main.rs
index f2e74c1..14a261f 100644
--- a/instrumentation/src/main.rs
+++ b/instrumentation/src/main.rs
@@ -16,7 +16,7 @@
use std::{path::PathBuf, time::Instant};
-use clap::StructOpt;
+use clap::Parser;
use common::{config::TalerConfig, currency::Currency};
use owo_colors::OwoColorize;
@@ -43,17 +43,17 @@ enum Cmd {
/// Perform offline tests on local private blockchain
Offline {
/// With tests to run
- #[clap(
- global = true,
- possible_values(TESTS_KIND),
- case_insensitive = true,
- default_value = "all"
- )]
- kind: String,
+ #[clap(value_enum, global = true, default_value = "all")]
+ kind: TestKind,
},
}
-
-const TESTS_KIND: &[&str] = &["all", "gateway", "bitcoin", "btc", "ethereum",
"eth"];
+#[derive(clap::ValueEnum, Clone, Debug, PartialEq, Eq)]
+enum TestKind {
+ All,
+ Gateway,
+ Btc,
+ Eth,
+}
pub fn main() {
common::log::init();
@@ -73,13 +73,13 @@ pub fn main() {
}
Cmd::Offline { kind } => {
let mut tests = Vec::new();
- if kind == "all" || kind == "gateway" {
+ if kind == TestKind::All || kind == TestKind::Gateway {
tests.extend_from_slice(gateway::TESTS);
}
- if kind == "all" || kind == "bitcoin" || kind == "btc" {
+ if kind == TestKind::All || kind == TestKind::Btc {
tests.extend_from_slice(btc::TESTS);
}
- if kind == "all" || kind == "ethereum" || kind == "eth" {
+ if kind == TestKind::All || kind == TestKind::Eth {
tests.extend_from_slice(eth::TESTS);
}
let start = Instant::now();
diff --git a/makefile b/makefile
index 80e3910..acacd8e 100644
--- a/makefile
+++ b/makefile
@@ -7,4 +7,7 @@ segwit_demo:
cargo run --release --bin segwit-demo
test:
- cargo run --bin instrumentation -- offline
\ No newline at end of file
+ cargo run --bin instrumentation -- offline
+
+msrv:
+ cargo msrv --min 1.63.0 --max 1.63.0 --linear
\ No newline at end of file
diff --git a/script/prepare.sh b/script/prepare.sh
index a76c946..5791065 100755
--- a/script/prepare.sh
+++ b/script/prepare.sh
@@ -36,6 +36,14 @@ mkdir -pv ~/geth
tar xvzf geth.tar.gz
mv -v geth-alltools-linux-amd64-1.10.24-972007a5/* ~/geth
-echo "Ⅳ - PATH"
+echo "Ⅳ - Install Core Lightning v22.11.1"
+cd $DIR
+curl -L
https://github.com/ElementsProject/lightning/releases/download/v22.11.1/clightning-v22.11.1-Ubuntu-22.04.tar.xz
-o clightning.tar.gz
+tar xvf clightning.tar.gz
+rm -rfv ~/clightning
+mkdir -pv ~/clightning
+mv -v usr/* ~/clightning
+
+echo "Ⅴ - PATH"
-echo "Add
PATH=\"\$HOME/geth:\$HOME/bitcoin/bin:/usr/lib/postgresql/$PG_VER/bin:\$PATH\"
to your bash profile"
\ No newline at end of file
+echo "Add
PATH=\"\$HOME/geth:\$HOME/bitcoin/bin:\$HOME/clightning/bin:/usr/lib/postgresql/$PG_VER/bin:\$PATH\"
to your bash profile"
\ No newline at end of file
diff --git a/uri-pack/Cargo.toml b/uri-pack/Cargo.toml
index 246abe3..42c1ef0 100644
--- a/uri-pack/Cargo.toml
+++ b/uri-pack/Cargo.toml
@@ -8,12 +8,12 @@ license = "AGPL-3.0-or-later"
[dependencies]
# Error macros
-thiserror = "1.0.35"
+thiserror = "1.0.37"
csv = "1.1.6"
[dev-dependencies]
# Json parser
-serde_json = "1.0.85"
+serde_json = "1.0.89"
# Url parser
url = "2.3.1"
# statistics-driven micro-benchmarks
diff --git a/uri-pack/src/lib.rs b/uri-pack/src/lib.rs
index 78919b5..d848215 100644
--- a/uri-pack/src/lib.rs
+++ b/uri-pack/src/lib.rs
@@ -144,7 +144,7 @@ pub fn pack_uri(uri: &str) -> Result<Vec<u8>, EncodeErr> {
vec.push(buff);
}
- return Ok(vec);
+ Ok(vec)
}
/// Unpack an uri string from its optimized binary format
@@ -175,7 +175,7 @@ pub fn unpack_uri(bytes: &[u8]) -> Result<String,
DecodeErr> {
buff_bits -= readable;
nb_bits -= readable;
}
- return Ok(nb);
+ Ok(nb)
};
loop {
@@ -187,7 +187,7 @@ pub fn unpack_uri(bytes: &[u8]) -> Result<String,
DecodeErr> {
buf.push(unpack_ascii(encoded) as char);
}
- return Ok(buf);
+ Ok(buf)
}
#[cfg(test)]
diff --git a/wire-gateway/Cargo.toml b/wire-gateway/Cargo.toml
index ea7f250..b5f500c 100644
--- a/wire-gateway/Cargo.toml
+++ b/wire-gateway/Cargo.toml
@@ -3,40 +3,40 @@ name = "wire-gateway"
version = "0.1.0"
edition = "2021"
license = "AGPL-3.0-or-later"
-rust-version = "1.57.0"
+rust-version = "1.63.0"
[dependencies]
# Http library
-hyper = { version = "0.14.20", features = ["http1", "server", "runtime"] }
+hyper = { version = "0.14.23", features = ["http1", "server", "runtime"] }
# Hyper compat lib for unix domain socket
hyperlocal = "0.8.0"
# Async runtime
-tokio = { version = "1.21.1", features = ["net", "macros", "rt-multi-thread"] }
+tokio = { version = "1.23.0", features = ["net", "macros", "rt-multi-thread"] }
# Serialization framework
-serde = { version = "1.0.144", features = ["derive"] }
+serde = { version = "1.0.149", features = ["derive"] }
# Serialization helper
-serde_with = "1.14.0"
+serde_with = "2.1.0"
# JSON serialization
-serde_json = "1.0.85"
+serde_json = "1.0.89"
# Url query serialization
serde_urlencoded = "0.7.1"
# Error macros
-thiserror = "1.0.35"
+thiserror = "1.0.37"
# Deflate compression
miniz_oxide = "0.6.2"
# Async postgres client
-tokio-postgres = { version = "=0.7.6" }
-deadpool-postgres = "0.10.2"
+tokio-postgres = { version = "0.7.7" }
+deadpool-postgres = "0.10.3"
# Socket activation
listenfd = "1.0.0"
# Common lib
common = { path = "../common" }
# Bitcoin types
-bitcoin = { version = "0.29.1" }
+bitcoin = { version = "0.29.2" }
# Ethereum types
-ethereum-types = { version = "0.13.1", default-features = false }
+ethereum-types = { version = "0.14.1", default-features = false }
# Cli args parser
-clap = { version = "3.2.21", features = ["derive"] }
+clap = { version = "4.0.29", features = ["derive"] }
[features]
# Enable test admin endpoint
diff --git a/wire-gateway/src/main.rs b/wire-gateway/src/main.rs
index 9849a7b..3cc5829 100644
--- a/wire-gateway/src/main.rs
+++ b/wire-gateway/src/main.rs
@@ -13,7 +13,7 @@
You should have received a copy of the GNU Affero General Public License
along with
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-use clap::StructOpt;
+use clap::Parser;
use common::{
api_common::{ShortHashCode, Timestamp},
api_wire::{
@@ -502,7 +502,7 @@ async fn router(
))
}
};
- return Ok(response);
+ Ok(response)
}
/// Listen to backend status change
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-depolymerization] branch master updated (4f43c37 -> a5767d9),
gnunet <=