[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-depolymerization] branch master updated (a5767d9 -> 67c6821)
|
From: |
gnunet |
|
Subject: |
[taler-depolymerization] branch master updated (a5767d9 -> 67c6821) |
|
Date: |
Tue, 24 Jan 2023 15:40:51 +0100 |
This is an automated email from the git hooks/post-receive script.
antoine pushed a change to branch master
in repository depolymerization.
from a5767d9 Merge branch 'master' of
git+ssh://git.taler.net/depolymerization
new 065a0d5 Fix logging
new 4f2696c Improve postgres setup for tests
new 67c6821 Update dependencies
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 | 300 +++++++++++++--------------
btc-wire/Cargo.toml | 13 +-
btc-wire/src/rpc.rs | 3 +-
common/Cargo.toml | 10 +-
common/src/log.rs | 2 +-
eth-wire/Cargo.toml | 11 +-
instrumentation/Cargo.toml | 7 +-
instrumentation/conf/bitcoin.conf | 2 +-
instrumentation/conf/taler_btc_lifetime.conf | 2 +-
instrumentation/src/utils.rs | 94 ++++-----
script/prepare.sh | 18 +-
uri-pack/Cargo.toml | 4 +-
wire-gateway/Cargo.toml | 15 +-
13 files changed, 235 insertions(+), 246 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 81b15e3..6ee38be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
[[package]]
name = "addr2line"
-version = "0.17.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
dependencies = [
"gimli",
]
@@ -54,9 +54,9 @@ checksum =
"4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
[[package]]
name = "async-trait"
-version = "0.1.59"
+version = "0.1.63"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364"
+checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1"
dependencies = [
"proc-macro2",
"quote",
@@ -82,15 +82,15 @@ checksum =
"d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "backtrace"
-version = "0.3.66"
+version = "0.3.67"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
dependencies = [
"addr2line",
"cc",
"cfg-if",
"libc",
- "miniz_oxide 0.5.4",
+ "miniz_oxide",
"object",
"rustc-demangle",
]
@@ -109,9 +109,9 @@ checksum =
"9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
-version = "0.20.0"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
+checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
[[package]]
name = "bech32"
@@ -171,10 +171,11 @@ dependencies = [
name = "btc-wire"
version = "0.1.0"
dependencies = [
- "base64 0.20.0",
+ "base64 0.21.0",
"bech32",
"bitcoin",
- "clap 4.0.29",
+ "clap 4.0.32",
+ "clap_lex 0.3.0",
"common",
"criterion",
"hex",
@@ -187,9 +188,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.11.1"
+version = "3.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
[[package]]
name = "byteorder"
@@ -211,9 +212,9 @@ checksum =
"37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
-version = "1.0.77"
+version = "1.0.78"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
[[package]]
name = "cfg-if"
@@ -234,12 +235,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "chunked_transfer"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e"
-
[[package]]
name = "ciborium"
version = "0.2.0"
@@ -281,9 +276,9 @@ dependencies = [
[[package]]
name = "clap"
-version = "4.0.29"
+version = "4.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d"
+checksum = "a7db700bc935f9e43e88d00b0850dae18a63773cfbec6d8e070fccf7fef89a39"
dependencies = [
"bitflags",
"clap_derive",
@@ -327,11 +322,11 @@ dependencies = [
[[package]]
name = "clap_mangen"
-version = "0.2.5"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e503c3058af0a0854668ea01db55c622482a080092fede9dd2e00a00a9436504"
+checksum = "eb258c6232b4d728d13d6072656627924c16707aae6267cd5a1ea05abff9a25c"
dependencies = [
- "clap 4.0.29",
+ "clap 4.0.32",
"roff",
]
@@ -518,9 +513,9 @@ dependencies = [
[[package]]
name = "cxx"
-version = "1.0.83"
+version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf"
+checksum = "b61a7545f753a88bcbe0a70de1fcc0221e10bfc752f576754fa91e663db1622e"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -530,9 +525,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.83"
+version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39"
+checksum = "f464457d494b5ed6905c63b0c4704842aba319084a0a3561cdc1359536b53200"
dependencies = [
"cc",
"codespan-reporting",
@@ -545,15 +540,15 @@ dependencies = [
[[package]]
name = "cxxbridge-flags"
-version = "1.0.83"
+version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12"
+checksum = "43c7119ce3a3701ed81aca8410b9acf6fc399d2629d057b87e2efa4e63a3aaea"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.83"
+version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6"
+checksum = "65e07508b90551e610910fa648a1878991d367064997a596135b86df30daf07e"
dependencies = [
"proc-macro2",
"quote",
@@ -610,9 +605,9 @@ dependencies = [
[[package]]
name = "deadpool-postgres"
-version = "0.10.3"
+version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e866e414e9e12fc988f0bfb89a0b86228e7ed196ca509fbc4dcbc738c56e753c"
+checksum = "051c50d234dab03bd29a537859bb7f50cca718c90b05e5c5746b9ae2a73f7278"
dependencies = [
"deadpool",
"log",
@@ -687,7 +682,8 @@ dependencies = [
name = "eth-wire"
version = "0.1.0"
dependencies = [
- "clap 4.0.29",
+ "clap 4.0.32",
+ "clap_lex 0.3.0",
"common",
"ethereum-types",
"hex",
@@ -755,20 +751,19 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
dependencies = [
"crc32fast",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
]
[[package]]
name = "flexi_logger"
-version = "0.24.1"
+version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "99659bcfd52cfece972bd00acb9dba7028094d47e699ea8b193b9aaebd5c362b"
+checksum = "ade8e86c48285f138a4d6ca15a2912e39bd6c74d62db42da4f1985f651a0b057"
dependencies = [
"chrono",
"glob",
"lazy_static",
"log",
- "rustversion",
"thiserror",
]
@@ -864,15 +859,15 @@ dependencies = [
[[package]]
name = "gimli"
-version = "0.26.2"
+version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
+checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec"
[[package]]
name = "glob"
-version = "0.3.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "half"
@@ -936,7 +931,7 @@ checksum =
"75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
dependencies = [
"bytes",
"fnv",
- "itoa 1.0.4",
+ "itoa 1.0.5",
]
[[package]]
@@ -976,7 +971,7 @@ dependencies = [
"http-body",
"httparse",
"httpdate",
- "itoa 1.0.4",
+ "itoa 1.0.5",
"pin-project-lite",
"socket2",
"tokio",
@@ -1073,7 +1068,8 @@ version = "0.1.0"
dependencies = [
"bitcoin",
"btc-wire",
- "clap 4.0.29",
+ "clap 4.0.32",
+ "clap_lex 0.3.0",
"clap_mangen",
"color-backtrace",
"common",
@@ -1083,15 +1079,16 @@ dependencies = [
"hex",
"libdeflater",
"owo-colors",
+ "signal-child",
"tempfile",
"ureq",
]
[[package]]
name = "io-lifetimes"
-version = "1.0.3"
+version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
dependencies = [
"libc",
"windows-sys",
@@ -1099,9 +1096,9 @@ dependencies = [
[[package]]
name = "is-terminal"
-version = "0.4.1"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
dependencies = [
"hermit-abi 0.2.6",
"io-lifetimes",
@@ -1126,9 +1123,9 @@ checksum =
"b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
[[package]]
name = "itoa"
-version = "1.0.4"
+version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
[[package]]
name = "js-sys"
@@ -1147,42 +1144,42 @@ checksum =
"e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.138"
+version = "0.2.139"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]]
name = "libdeflate-sys"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cb6784b6b84b67d71b4307963d456a9c7c29f9b47c658f533e598de369e34277"
+checksum = "e1f7b0817f85e2ba608892f30fbf4c9d03f3ebf9db0c952d1b7c8f7387b54785"
dependencies = [
"cc",
]
[[package]]
name = "libdeflater"
-version = "0.11.0"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d8e285aa6a046fd338b2592c16bee148b2b00789138ed6b7bb56bb13d585050d"
+checksum = "671e63282f642c7bcc7d292b212d5a4739fef02a77fe98429a75d308f96e7931"
dependencies = [
"libdeflate-sys",
]
[[package]]
name = "link-cplusplus"
-version = "1.0.7"
+version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
dependencies = [
"cc",
]
[[package]]
name = "linux-raw-sys"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
[[package]]
name = "listenfd"
@@ -1238,15 +1235,6 @@ dependencies = [
"autocfg",
]
-[[package]]
-name = "miniz_oxide"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34"
-dependencies = [
- "adler",
-]
-
[[package]]
name = "miniz_oxide"
version = "0.6.2"
@@ -1289,28 +1277,28 @@ dependencies = [
[[package]]
name = "num_cpus"
-version = "1.14.0"
+version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
dependencies = [
- "hermit-abi 0.1.19",
+ "hermit-abi 0.2.6",
"libc",
]
[[package]]
name = "object"
-version = "0.29.0"
+version = "0.30.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
+checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
dependencies = [
"memchr",
]
[[package]]
name = "once_cell"
-version = "1.16.0"
+version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
[[package]]
name = "oorandom"
@@ -1352,9 +1340,9 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.5"
+version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
+checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
dependencies = [
"cfg-if",
"libc",
@@ -1533,9 +1521,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
dependencies = [
"unicode-ident",
]
@@ -1564,9 +1552,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.21"
+version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
dependencies = [
"proc-macro2",
]
@@ -1613,9 +1601,9 @@ dependencies = [
[[package]]
name = "rayon-core"
-version = "1.10.1"
+version = "1.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
+checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
@@ -1634,9 +1622,9 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.7.0"
+version = "1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
dependencies = [
"aho-corasick",
"memchr",
@@ -1715,9 +1703,9 @@ checksum =
"3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
[[package]]
name = "rustix"
-version = "0.36.5"
+version = "0.36.7"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
+checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
dependencies = [
"bitflags",
"errno",
@@ -1729,9 +1717,9 @@ dependencies = [
[[package]]
name = "rustls"
-version = "0.20.7"
+version = "0.20.8"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
+checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
dependencies = [
"log",
"ring",
@@ -1739,17 +1727,11 @@ dependencies = [
"webpki",
]
-[[package]]
-name = "rustversion"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
-
[[package]]
name = "ryu"
-version = "1.0.11"
+version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
[[package]]
name = "same-file"
@@ -1768,9 +1750,9 @@ checksum =
"d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "scratch"
-version = "1.0.2"
+version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
+checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
[[package]]
name = "sct"
@@ -1784,9 +1766,9 @@ dependencies = [
[[package]]
name = "secp256k1"
-version = "0.24.2"
+version = "0.24.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3"
+checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
dependencies = [
"bitcoin_hashes",
"secp256k1-sys",
@@ -1804,18 +1786,18 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.149"
+version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.149"
+version = "1.0.152"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
dependencies = [
"proc-macro2",
"quote",
@@ -1824,20 +1806,20 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.89"
+version = "1.0.91"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
dependencies = [
- "itoa 1.0.4",
+ "itoa 1.0.5",
"ryu",
"serde",
]
[[package]]
name = "serde_repr"
-version = "0.1.9"
+version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca"
+checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e"
dependencies = [
"proc-macro2",
"quote",
@@ -1851,16 +1833,16 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
dependencies = [
"form_urlencoded",
- "itoa 1.0.4",
+ "itoa 1.0.5",
"ryu",
"serde",
]
[[package]]
name = "serde_with"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef"
+checksum = "30d904179146de381af4c93d3af6ca4984b3152db687dacb9c3c35e86f39809c"
dependencies = [
"base64 0.13.1",
"chrono",
@@ -1874,9 +1856,9 @@ dependencies = [
[[package]]
name = "serde_with_macros"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa"
+checksum = "a1966009f3c05f095697c537312f5415d1e3ed31ce0a56942bac4c771c5c335e"
dependencies = [
"darling",
"proc-macro2",
@@ -1895,6 +1877,12 @@ dependencies = [
"digest",
]
+[[package]]
+name = "signal-child"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "b2a4eed4c5ae38438470ab8e0108bb751012f786f44ff585cfd837c9a5fe426f"
+
[[package]]
name = "siphasher"
version = "0.3.10"
@@ -1962,9 +1950,9 @@ checksum =
"6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]
name = "syn"
-version = "1.0.105"
+version = "1.0.107"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
dependencies = [
"proc-macro2",
"quote",
@@ -1987,9 +1975,9 @@ dependencies = [
[[package]]
name = "termcolor"
-version = "1.1.3"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
dependencies = [
"winapi-util",
]
@@ -2002,18 +1990,18 @@ checksum =
"222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
[[package]]
name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
dependencies = [
"proc-macro2",
"quote",
@@ -2026,7 +2014,7 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
dependencies = [
- "itoa 1.0.4",
+ "itoa 1.0.5",
"serde",
"time-core",
"time-macros",
@@ -2083,9 +2071,9 @@ checksum =
"cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.23.0"
+version = "1.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46"
+checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb"
dependencies = [
"autocfg",
"bytes",
@@ -2176,9 +2164,9 @@ dependencies = [
[[package]]
name = "try-lock"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]]
name = "typenum"
@@ -2200,15 +2188,15 @@ dependencies = [
[[package]]
name = "unicode-bidi"
-version = "0.3.8"
+version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
+checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
[[package]]
name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
[[package]]
name = "unicode-normalization"
@@ -2233,12 +2221,11 @@ checksum =
"a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
[[package]]
name = "ureq"
-version = "2.5.0"
+version = "2.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f"
+checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d"
dependencies = [
"base64 0.13.1",
- "chunked_transfer",
"flate2",
"log",
"once_cell",
@@ -2446,59 +2433,60 @@ dependencies = [
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
[[package]]
name = "windows_i686_gnu"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
[[package]]
name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
[[package]]
name = "wire-gateway"
version = "0.1.0"
dependencies = [
"bitcoin",
- "clap 4.0.29",
+ "clap 4.0.32",
+ "clap_lex 0.3.0",
"common",
"deadpool-postgres",
"ethereum-types",
"hyper",
"hyperlocal",
"listenfd",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
"serde",
"serde_json",
"serde_urlencoded",
diff --git a/btc-wire/Cargo.toml b/btc-wire/Cargo.toml
index 7be17c0..91d3722 100644
--- a/btc-wire/Cargo.toml
+++ b/btc-wire/Cargo.toml
@@ -16,16 +16,17 @@ bitcoin = { version = "0.29.2", features = [
"serde",
], default-features = false }
# Cli args parser
-clap = { version = "4.0.29", features = ["derive"] }
+clap = { version = "=4.0.32", features = ["derive"] }
+clap_lex = "=0.3.0"
# Bech32 encoding and decoding
bech32 = "0.9.1"
# Serialization library
-serde = { version = "1.0.149", features = ["derive"] }
-serde_json = "1.0.89"
-serde_repr = "0.1.9"
+serde = { version = "1.0.152", features = ["derive"] }
+serde_json = "1.0.91"
+serde_repr = "0.1.10"
# Error macros
-thiserror = "1.0.37"
-base64 = "0.20.0"
+thiserror = "1.0.38"
+base64 = "0.21.0"
# Common lib
common = { path = "../common" }
# Ini parser
diff --git a/btc-wire/src/rpc.rs b/btc-wire/src/rpc.rs
index 9055233..9cbe320 100644
--- a/btc-wire/src/rpc.rs
+++ b/btc-wire/src/rpc.rs
@@ -25,6 +25,7 @@
//!
//! bitcoincore RPC documentation: <https://bitcoincore.org/en/doc/23.0.0/>
+use base64::{prelude::BASE64_STANDARD, Engine};
use bitcoin::{hashes::hex::ToHex, Address, Amount, BlockHash, SignedAmount,
Txid};
use common::{log::log::error, password, reconnect::AutoReconnect};
use serde_json::{json, Value};
@@ -160,7 +161,7 @@ impl Rpc {
last_call: Instant::now(),
path,
id: 0,
- cookie: format!("Basic {}", base64::encode(token)),
+ cookie: format!("Basic {}", BASE64_STANDARD.encode(token)),
conn,
buf: Vec::new(),
})
diff --git a/common/Cargo.toml b/common/Cargo.toml
index 1386709..2582775 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -9,21 +9,21 @@ rust-version = "1.63.0"
[dependencies]
# Serialization framework
-serde = { version = "1.0.149", features = ["derive"] }
+serde = { version = "1.0.152", features = ["derive"] }
# Serialization helper
-serde_with = "2.1.0"
+serde_with = "2.2.0"
# JSON serialization
-serde_json = "1.0.89"
+serde_json = "1.0.91"
# Url format
url = { version = "2.3.1", features = ["serde"] }
# Crockford’s base32
base32 = "0.4.0"
# Error macros
-thiserror = "1.0.37"
+thiserror = "1.0.38"
# Ini files
rust-ini = "0.18.0"
# Logging
-flexi_logger = { version = "0.24.1", default-features = false }
+flexi_logger = { version = "0.24.2", default-features = false }
log = "0.4.17"
# Postgres client
postgres = "0.19.4"
diff --git a/common/src/log.rs b/common/src/log.rs
index bb7c27e..3923266 100644
--- a/common/src/log.rs
+++ b/common/src/log.rs
@@ -26,7 +26,7 @@ fn custom_format(
write!(
w,
"{} {} {}",
- now.format("[year]-[month]-[day]T[hour]:[minute]:[second].[subsecond
digits:6][offset_hour sign:mandatory][offset_minute]"),
+ now.format("%+"),
record.level(),
&record.args()
)
diff --git a/eth-wire/Cargo.toml b/eth-wire/Cargo.toml
index 8a8ef4d..c5981b5 100644
--- a/eth-wire/Cargo.toml
+++ b/eth-wire/Cargo.toml
@@ -11,17 +11,18 @@ fail = []
[dependencies]
# Cli args
-clap = { version = "4.0.29", features = ["derive"] }
+clap = { version = "=4.0.32", features = ["derive"] }
+clap_lex = "=0.3.0"
# Serialization library
-serde = { version = "1.0.149", features = ["derive"] }
-serde_json = "1.0.89"
-serde_repr = "0.1.9"
+serde = { version = "1.0.152", features = ["derive"] }
+serde_json = "1.0.91"
+serde_repr = "0.1.10"
hex = "0.4.3"
# Ethereum serializable types
ethereum-types = { version = "0.14.1", default-features = false, features = [
"serialize",
] }
# Error macros
-thiserror = "1.0.37"
+thiserror = "1.0.38"
# Common lib
common = { path = "../common" }
diff --git a/instrumentation/Cargo.toml b/instrumentation/Cargo.toml
index 707c5f1..2887084 100644
--- a/instrumentation/Cargo.toml
+++ b/instrumentation/Cargo.toml
@@ -7,7 +7,8 @@ rust-version = "1.63.0"
[dependencies]
# Cli args parser
-clap = { version = "4.0.29", features = ["derive"] }
+clap = { version = "=4.0.32", features = ["derive"] }
+clap_lex = "=0.3.0"
common = { path = "../common" }
# Bitcoin
btc-wire = { path = "../btc-wire" }
@@ -19,7 +20,7 @@ hex = "0.4.3"
# Wire Gateway
ureq = { version = "2.5.0", features = ["json"] }
# In memory deflate library
-libdeflater = "0.11.0"
+libdeflater = "0.12.0"
# Generate temporary files
tempfile = "3.3.0"
# RNG
@@ -28,6 +29,8 @@ fastrand = "1.8.0"
owo-colors = "3.5.0"
# Better backtrace
color-backtrace = "0.5.1"
+# Send signal to child processes
+signal-child = "1.0.5"
[build-dependencies]
diff --git a/instrumentation/conf/bitcoin.conf
b/instrumentation/conf/bitcoin.conf
index 74de105..12fd451 100755
--- a/instrumentation/conf/bitcoin.conf
+++ b/instrumentation/conf/bitcoin.conf
@@ -2,7 +2,7 @@ regtest=1
txindex=1
maxtxfee=0.01
fallbackfee=0.00000001
-rpcservertimeout=10
+rpcservertimeout=15
[regtest]
port=8345
diff --git a/instrumentation/conf/taler_btc_lifetime.conf
b/instrumentation/conf/taler_btc_lifetime.conf
index 9b3977e..91274c8 100755
--- a/instrumentation/conf/taler_btc_lifetime.conf
+++ b/instrumentation/conf/taler_btc_lifetime.conf
@@ -10,5 +10,5 @@ PORT = 8060
PAYTO = payto://bitcoin/bcrt1qgkgxkjj27g3f7s87mcvjjsghay7gh34cx39prj
CONFIRMATION = 3
HTTP_LIFETIME = 10
-WIRE_LIFETIME = 110
+WIRE_LIFETIME = 10
AUTH_METHOD = none
\ No newline at end of file
diff --git a/instrumentation/src/utils.rs b/instrumentation/src/utils.rs
index f847b4d..f35eefc 100644
--- a/instrumentation/src/utils.rs
+++ b/instrumentation/src/utils.rs
@@ -32,6 +32,7 @@ use common::{
rand_slice,
url::Url,
};
+use signal_child::{signal::Signal, Signalable};
use tempfile::TempDir;
pub fn print_now(disp: impl Display) {
@@ -227,6 +228,7 @@ pub struct CommonCtx {
gateway: ChildGuard,
pub gateway_url: String,
pub taler_conf: TalerConfig,
+ db: ChildGuard,
wire: ChildGuard,
_wire2: Option<ChildGuard>,
}
@@ -271,11 +273,11 @@ impl CommonCtx {
pub fn setup(dirs: Dirs, name: &str, stressed: bool, init_wallet: impl
FnOnce(&Dirs)) -> Self {
let taler_conf = TalerConfig::load(Some(&dirs.conf));
// Setup database
- {
+ let db = {
// Init databases files
cmd_redirect_ok(
- "pg_ctl",
- &["init", "-D", dirs.db_dir.to_string_lossy().as_ref()],
+ "initdb",
+ &[dirs.db_dir.to_string_lossy().as_ref()],
"log/postgres.log",
"init_db",
);
@@ -288,25 +290,36 @@ impl CommonCtx {
),
)
.unwrap();
- Self::_start_db(&dirs.db_dir);
-
- let mut psql = ChildGuard(
- Command::new("psql")
- .args(["-h", "localhost", "-p", "5454", "postgres"])
- .stderr(Stdio::null())
- .stdout(Stdio::null())
- .stdin(Stdio::piped())
- .spawn()
- .unwrap(),
- );
- psql.0
- .stdin
- .as_mut()
- .unwrap()
- .write_all("CREATE ROLE postgres LOGIN SUPERUSER PASSWORD
'password'".as_bytes())
- .unwrap();
- cmd_ok(psql, "psql setup");
- }
+ let db = Self::_start_db(&dirs.db_dir);
+ retry(|| {
+ let mut psql = ChildGuard(
+ Command::new("psql")
+ .args(["-h", "localhost", "-p", "5454", "postgres"])
+ .stderr(Stdio::null())
+ .stdout(
+ std::fs::File::options()
+ .append(true)
+ .create(true)
+ .open("log/postgres.log")
+ .unwrap(),
+ )
+ .stdin(Stdio::piped())
+ .spawn()
+ .unwrap(),
+ );
+ psql.0
+ .stdin
+ .as_mut()
+ .unwrap()
+ .write_all(
+ "CREATE ROLE postgres LOGIN SUPERUSER PASSWORD
'password'".as_bytes(),
+ )
+ .unwrap();
+ psql.0.wait().unwrap().success()
+ });
+
+ db
+ };
// Wire
let wire_path = format!("target/release/{}", name);
@@ -366,6 +379,7 @@ impl CommonCtx {
gateway_url,
taler_conf,
wire,
+ db,
_wire2: wire2,
}
}
@@ -384,32 +398,20 @@ impl CommonCtx {
/* ----- Database ----- */
- fn _start_db(path: &Path) {
- cmd_redirect_ok(
- "pg_ctl",
- &["start", "-D", path.to_string_lossy().as_ref()],
+ fn _start_db(path: &Path) -> ChildGuard {
+ cmd_redirect(
+ "postgres",
+ &["-D", path.to_string_lossy().as_ref()],
"log/postgres.log",
- "start db",
)
}
- fn _stop_db(path: &Path, log: &Path) -> std::io::Result<ChildGuard> {
- try_cmd_redirect(
- "pg_ctl",
- &["stop", "-D", path.to_string_lossy().as_ref()],
- log.to_string_lossy().as_ref(),
- )
+ pub fn resume_db(&mut self) {
+ self.db = Self::_start_db(&self.dirs.db_dir);
}
- pub fn resume_db(&self) {
- Self::_start_db(&self.dirs.db_dir)
- }
-
- pub fn stop_db(&self) {
- cmd_ok(
- Self::_stop_db(&self.dirs.db_dir,
"log/postgres.log".as_ref()).unwrap(),
- "stop db",
- )
+ pub fn stop_db(&mut self) {
+ self.db.0.signal(Signal::SIGQUIT).unwrap();
}
/* ----- Wire Gateway -----*/
@@ -434,11 +436,3 @@ impl CommonCtx {
retry(|| check_gateway_down(&self.gateway_url));
}
}
-
-impl Drop for CommonCtx {
- fn drop(&mut self) {
- Self::_stop_db(&self.dirs.db_dir, "/dev/null".as_ref())
- .and_then(|mut it| it.0.wait())
- .ok();
- }
-}
diff --git a/script/prepare.sh b/script/prepare.sh
index 5791065..137dff5 100755
--- a/script/prepare.sh
+++ b/script/prepare.sh
@@ -23,27 +23,27 @@ echo "Found version $PG_VER"
echo "Ⅱ - Install bitcoind version 0.23"
cd $DIR
curl -L
https://bitcoincore.org/bin/bitcoin-core-23.0/bitcoin-23.0-x86_64-linux-gnu.tar.gz
-o btc.tar.gz
+tar xvzf btc.tar.gz
rm -rfv ~/bitcoin
mkdir -pv ~/bitcoin
-tar xvzf btc.tar.gz
mv -v bitcoin-23.0/* ~/bitcoin
echo "Ⅲ - Install Go Ethereum (Geth) v1.10.24"
cd $DIR
curl -L
https://gethstore.blob.core.windows.net/builds/geth-alltools-linux-amd64-1.10.24-972007a5.tar.gz
-o geth.tar.gz
+tar xvzf geth.tar.gz
rm -rfv ~/geth
mkdir -pv ~/geth
-tar xvzf geth.tar.gz
mv -v geth-alltools-linux-amd64-1.10.24-972007a5/* ~/geth
-echo "Ⅳ - Install Core Lightning v22.11.1"
+echo "Ⅳ - Install Lightning Network Daemon v0.15.5-beta"
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
+curl -L
https://github.com/lightningnetwork/lnd/releases/download/v0.15.5-beta/lnd-linux-amd64-v0.15.5-beta.tar.gz
-o lnd.tar.gz
+tar xvzf lnd.tar.gz
+rm -rfv ~/lnd
+mkdir -pv ~/lnd
+mv -v lnd-linux-amd64-v0.15.5-beta/* ~/lnd
echo "Ⅴ - PATH"
-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
+echo "Add
PATH=\"\$HOME/geth:\$HOME/bitcoin/bin:\$HOME/lnd:/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 42c1ef0..3c5a690 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.37"
+thiserror = "1.0.38"
csv = "1.1.6"
[dev-dependencies]
# Json parser
-serde_json = "1.0.89"
+serde_json = "1.0.91"
# Url parser
url = "2.3.1"
# statistics-driven micro-benchmarks
diff --git a/wire-gateway/Cargo.toml b/wire-gateway/Cargo.toml
index b5f500c..7d6a46e 100644
--- a/wire-gateway/Cargo.toml
+++ b/wire-gateway/Cargo.toml
@@ -11,22 +11,22 @@ 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.23.0", features = ["net", "macros", "rt-multi-thread"] }
+tokio = { version = "1.24.2", features = ["net", "macros", "rt-multi-thread"] }
# Serialization framework
-serde = { version = "1.0.149", features = ["derive"] }
+serde = { version = "1.0.152", features = ["derive"] }
# Serialization helper
-serde_with = "2.1.0"
+serde_with = "2.2.0"
# JSON serialization
-serde_json = "1.0.89"
+serde_json = "1.0.91"
# Url query serialization
serde_urlencoded = "0.7.1"
# Error macros
-thiserror = "1.0.37"
+thiserror = "1.0.38"
# Deflate compression
miniz_oxide = "0.6.2"
# Async postgres client
tokio-postgres = { version = "0.7.7" }
-deadpool-postgres = "0.10.3"
+deadpool-postgres = "0.10.4"
# Socket activation
listenfd = "1.0.0"
# Common lib
@@ -36,7 +36,8 @@ bitcoin = { version = "0.29.2" }
# Ethereum types
ethereum-types = { version = "0.14.1", default-features = false }
# Cli args parser
-clap = { version = "4.0.29", features = ["derive"] }
+clap = { version = "=4.0.32", features = ["derive"] }
+clap_lex = "=0.3.0"
[features]
# Enable test admin endpoint
--
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 (a5767d9 -> 67c6821),
gnunet <=