[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-depolymerization] branch master updated (c840884 -> 83c8149)
|
From: |
gnunet |
|
Subject: |
[taler-depolymerization] branch master updated (c840884 -> 83c8149) |
|
Date: |
Thu, 15 Sep 2022 16:24:46 +0200 |
This is an automated email from the git hooks/post-receive script.
antoine pushed a change to branch master
in repository depolymerization.
from c840884 fix timestamp (protocol change)
new d92fd5c fix timestamp (protocol change)
new 23729eb Update dependencies
new 83c8149 Update geth (will need to test how well we support
Proof-of-Stake)
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 | 332 ++++++++++++++++++++--------------------
btc-wire/Cargo.toml | 18 +--
btc-wire/src/bin/segwit-demo.rs | 4 +-
btc-wire/src/lib.rs | 2 +-
btc-wire/src/rpc.rs | 2 +-
btc-wire/src/taler_utils.rs | 2 +-
common/Cargo.toml | 18 +--
common/src/api_common.rs | 18 +--
eth-wire/Cargo.toml | 10 +-
instrumentation/Cargo.toml | 8 +-
instrumentation/src/btc.rs | 2 +-
instrumentation/src/gateway.rs | 6 +-
makefile | 5 +-
script/prepare.sh | 6 +-
uri-pack/Cargo.toml | 10 +-
wire-gateway/Cargo.toml | 18 +--
wire-gateway/src/json.rs | 2 +-
17 files changed, 231 insertions(+), 232 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 2814689..831ac2c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -37,6 +37,21 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
[[package]]
name = "async-trait"
version = "0.1.56"
@@ -75,7 +90,7 @@ dependencies = [
"cc",
"cfg-if",
"libc",
- "miniz_oxide",
+ "miniz_oxide 0.5.3",
"object",
"rustc-demangle",
]
@@ -94,23 +109,17 @@ checksum =
"904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bech32"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b"
-
-[[package]]
-name = "bech32"
-version = "0.9.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c5738be7561b0eeb501ef1d5c5db3f24e01ceb55fededd9b00039aada34966ad"
+checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
[[package]]
name = "bitcoin"
-version = "0.28.1"
+version = "0.29.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "05bba324e6baf655b882df672453dbbc527bc938cadd27750ae510aaccc3a66a"
+checksum = "9cb36de3b18ad25f396f9168302e36fb7e1e8923298ab3127da252d288d5af9d"
dependencies = [
- "bech32 0.8.1",
+ "bech32",
"bitcoin_hashes",
"secp256k1",
"serde",
@@ -118,9 +127,9 @@ dependencies = [
[[package]]
name = "bitcoin_hashes"
-version = "0.10.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "006cc91e1a1d99819bc5b8214be3555c1f0611b169f527a1fdc54ed1f2b745b0"
+checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4"
dependencies = [
"serde",
]
@@ -157,9 +166,9 @@ name = "btc-wire"
version = "0.1.0"
dependencies = [
"base64",
- "bech32 0.9.0",
+ "bech32",
"bitcoin",
- "clap 3.2.16",
+ "clap",
"common",
"criterion",
"hex",
@@ -208,13 +217,14 @@ checksum =
"baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
-version = "0.4.19"
+version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
dependencies = [
- "libc",
+ "iana-time-zone",
"num-integer",
"num-traits",
+ "serde",
"winapi",
]
@@ -225,21 +235,37 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e"
[[package]]
-name = "clap"
-version = "2.34.0"
+name = "ciborium"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f"
dependencies = [
- "bitflags",
- "textwrap 0.11.0",
- "unicode-width",
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b"
+dependencies = [
+ "ciborium-io",
+ "half",
]
[[package]]
name = "clap"
-version = "3.2.16"
+version = "3.2.21"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9"
+checksum = "1ed5341b2301a26ab80be5cbdced622e80ed808483c52e45e3310a877d3b37d7"
dependencies = [
"atty",
"bitflags",
@@ -249,14 +275,14 @@ dependencies = [
"once_cell",
"strsim",
"termcolor",
- "textwrap 0.15.0",
+ "textwrap",
]
[[package]]
name = "clap_derive"
-version = "3.2.15"
+version = "3.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4"
+checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
dependencies = [
"heck",
"proc-macro-error",
@@ -280,7 +306,7 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "937efe4451c32be4ccb3e19549cbb1ea5cb85197f39b87a9662ca1d7b1765d1d"
dependencies = [
- "clap 3.2.16",
+ "clap",
"roff",
]
@@ -315,6 +341,12 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+
[[package]]
name = "cpufeatures"
version = "0.2.2"
@@ -335,15 +367,16 @@ dependencies = [
[[package]]
name = "criterion"
-version = "0.3.6"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
+checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
dependencies = [
+ "anes",
"atty",
"cast",
- "clap 2.34.0",
+ "ciborium",
+ "clap",
"criterion-plot",
- "csv",
"itertools",
"lazy_static",
"num-traits",
@@ -352,7 +385,6 @@ dependencies = [
"rayon",
"regex",
"serde",
- "serde_cbor",
"serde_derive",
"serde_json",
"tinytemplate",
@@ -361,9 +393,9 @@ dependencies = [
[[package]]
name = "criterion-plot"
-version = "0.4.5"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
dependencies = [
"cast",
"itertools",
@@ -454,9 +486,9 @@ dependencies = [
[[package]]
name = "darling"
-version = "0.13.4"
+version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
+checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02"
dependencies = [
"darling_core",
"darling_macro",
@@ -464,9 +496,9 @@ dependencies = [
[[package]]
name = "darling_core"
-version = "0.13.4"
+version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
+checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f"
dependencies = [
"fnv",
"ident_case",
@@ -478,9 +510,9 @@ dependencies = [
[[package]]
name = "darling_macro"
-version = "0.13.4"
+version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
+checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5"
dependencies = [
"darling_core",
"quote",
@@ -558,7 +590,7 @@ dependencies = [
name = "eth-wire"
version = "0.1.0"
dependencies = [
- "clap 3.2.16",
+ "clap",
"common",
"ethereum-types",
"hex",
@@ -626,14 +658,14 @@ source =
"registry+https://github.com/rust-lang/crates.io-index";
checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
dependencies = [
"crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.5.3",
]
[[package]]
name = "flexi_logger"
-version = "0.22.5"
+version = "0.23.3"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ee9a6796ff68a1014f6665dac55341820f26e63ec706e58bfaee468cf0ac174f"
+checksum = "f4a12e3b5a8775259ee83ac38aea8cdf9c3a1667c02178d207378c0837808fa9"
dependencies = [
"chrono",
"glob",
@@ -652,29 +684,13 @@ checksum =
"3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "form_urlencoded"
-version = "1.0.1"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
dependencies = [
- "matches",
"percent-encoding",
]
-[[package]]
-name = "futures"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
[[package]]
name = "futures-channel"
version = "0.3.21"
@@ -691,23 +707,6 @@ version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
-[[package]]
-name = "futures-executor"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
-
[[package]]
name = "futures-macro"
version = "0.3.21"
@@ -737,13 +736,10 @@ version = "0.3.21"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
dependencies = [
- "futures-channel",
"futures-core",
- "futures-io",
"futures-macro",
"futures-sink",
"futures-task",
- "memchr",
"pin-project-lite",
"pin-utils",
"slab",
@@ -897,6 +893,20 @@ dependencies = [
"tokio",
]
+[[package]]
+name = "iana-time-zone"
+version = "0.1.48"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "237a0714f28b1ee39ccec0770ccb544eb02c9ef2c82bb096230eefcffa6468b0"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "winapi",
+]
+
[[package]]
name = "ident_case"
version = "1.0.1"
@@ -905,11 +915,10 @@ checksum =
"b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
[[package]]
name = "idna"
-version = "0.2.3"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
dependencies = [
- "matches",
"unicode-bidi",
"unicode-normalization",
]
@@ -931,6 +940,7 @@ checksum =
"10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
dependencies = [
"autocfg",
"hashbrown",
+ "serde",
]
[[package]]
@@ -948,7 +958,7 @@ version = "0.1.0"
dependencies = [
"bitcoin",
"btc-wire",
- "clap 3.2.16",
+ "clap",
"clap_mangen",
"color-backtrace",
"common",
@@ -1052,12 +1062,6 @@ dependencies = [
"cfg-if",
]
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
[[package]]
name = "md-5"
version = "0.10.1"
@@ -1091,6 +1095,15 @@ dependencies = [
"adler",
]
+[[package]]
+name = "miniz_oxide"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+dependencies = [
+ "adler",
+]
+
[[package]]
name = "mio"
version = "0.8.4"
@@ -1152,9 +1165,9 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.13.0"
+version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
+checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
[[package]]
name = "oorandom"
@@ -1180,9 +1193,9 @@ checksum =
"648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4"
[[package]]
name = "owo-colors"
-version = "3.4.0"
+version = "3.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "decf7381921fea4dcb2549c5667eda59b3ec297ab7e2b5fc33eac69d2e7da87b"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
[[package]]
name = "parking_lot"
@@ -1209,24 +1222,24 @@ dependencies = [
[[package]]
name = "percent-encoding"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+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",
]
@@ -1293,13 +1306,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",
@@ -1325,9 +1338,9 @@ dependencies = [
[[package]]
name = "postgres-types"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "ebd6e8b7189a73169290e89bd24c771071f1012d8fe6f738f5226531f0b03d89"
+checksum = "73d946ec7d256b04dfadc4e6a3292324e6f417124750fc5c0950f981b703a0f1"
dependencies = [
"bytes",
"fallible-iterator",
@@ -1610,47 +1623,38 @@ dependencies = [
[[package]]
name = "secp256k1"
-version = "0.22.1"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "26947345339603ae8395f68e2f3d85a6b0a8ddfe6315818e80b8504415099db0"
+checksum = "b7649a0b3ffb32636e60c7ce0d70511eda9c52c658cd0634e194d5a19943aeff"
dependencies = [
+ "bitcoin_hashes",
"secp256k1-sys",
"serde",
]
[[package]]
name = "secp256k1-sys"
-version = "0.5.2"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "152e20a0fd0519390fc43ab404663af8a0b794273d2a91d60ad4a39f13ffe110"
+checksum = "7058dc8eaf3f2810d7828680320acda0b25a288f6d288e19278e249bbf74226b"
dependencies = [
"cc",
]
[[package]]
name = "serde"
-version = "1.0.140"
+version = "1.0.144"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03"
+checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860"
dependencies = [
"serde_derive",
]
-[[package]]
-name = "serde_cbor"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
-dependencies = [
- "half",
- "serde",
-]
-
[[package]]
name = "serde_derive"
-version = "1.0.140"
+version = "1.0.144"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da"
+checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00"
dependencies = [
"proc-macro2",
"quote",
@@ -1659,9 +1663,9 @@ dependencies = [
[[package]]
name = "serde_json"
-version = "1.0.82"
+version = "1.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
+checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44"
dependencies = [
"itoa 1.0.2",
"ryu",
@@ -1670,9 +1674,9 @@ dependencies = [
[[package]]
name = "serde_repr"
-version = "0.1.8"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a2ad84e47328a31223de7fed7a4f5087f2d6ddfe586cf3ca25b7a165bc0a5aed"
+checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca"
dependencies = [
"proc-macro2",
"quote",
@@ -1693,19 +1697,25 @@ dependencies = [
[[package]]
name = "serde_with"
-version = "1.14.0"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
+checksum = "368f2d60d049ea019a84dcd6687b0d1e0030fe663ae105039bdf967ed5e6a9a7"
dependencies = [
+ "base64",
+ "chrono",
+ "hex",
+ "indexmap",
"serde",
+ "serde_json",
"serde_with_macros",
+ "time",
]
[[package]]
name = "serde_with_macros"
-version = "1.5.2"
+version = "2.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
+checksum = "1ccadfacf6cf10faad22bbadf55986bdd0856edfb5d9210aa1dcf1f516e84e93"
dependencies = [
"darling",
"proc-macro2",
@@ -1823,15 +1833,6 @@ dependencies = [
"winapi-util",
]
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
[[package]]
name = "textwrap"
version = "0.15.0"
@@ -1840,18 +1841,18 @@ checksum =
"b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
[[package]]
name = "thiserror"
-version = "1.0.31"
+version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.31"
+version = "1.0.35"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783"
dependencies = [
"proc-macro2",
"quote",
@@ -1860,13 +1861,14 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.11"
+version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217"
+checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b"
dependencies = [
"itoa 1.0.2",
"libc",
"num_threads",
+ "serde",
"time-macros",
]
@@ -1912,9 +1914,9 @@ checksum =
"cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
-version = "1.20.1"
+version = "1.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
+checksum = "0020c875007ad96677dcc890298f4b942882c5d4eb7cc8f439fc3bf813dc9c95"
dependencies = [
"autocfg",
"bytes",
@@ -1942,15 +1944,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",
@@ -2048,12 +2051,6 @@ dependencies = [
"tinyvec",
]
-[[package]]
-name = "unicode-width"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
-
[[package]]
name = "untrusted"
version = "0.7.1"
@@ -2095,13 +2092,12 @@ dependencies = [
[[package]]
name = "url"
-version = "2.2.2"
+version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
dependencies = [
"form_urlencoded",
"idna",
- "matches",
"percent-encoding",
"serde",
]
@@ -2307,14 +2303,14 @@ name = "wire-gateway"
version = "0.1.0"
dependencies = [
"bitcoin",
- "clap 3.2.16",
+ "clap",
"common",
"deadpool-postgres",
"ethereum-types",
"hyper",
"hyperlocal",
"listenfd",
- "miniz_oxide",
+ "miniz_oxide 0.6.2",
"serde",
"serde_json",
"serde_urlencoded",
diff --git a/btc-wire/Cargo.toml b/btc-wire/Cargo.toml
index f7c4b22..4914eaf 100644
--- a/btc-wire/Cargo.toml
+++ b/btc-wire/Cargo.toml
@@ -11,20 +11,20 @@ fail = []
[dependencies]
# Typed bitcoin rpc types
-bitcoin = { version = "0.28.1", features = [
+bitcoin = { version = "0.29.1", features = [
"std",
- "use-serde",
+ "serde",
], default-features = false }
# Cli args parser
-clap = { version = "3.2.13", features = ["derive"] }
+clap = { version = "3.2.21", features = ["derive"] }
# Bech32 encoding and decoding
-bech32 = "0.9.0"
+bech32 = "0.9.1"
# Serialization library
-serde = { version = "1.0.140", features = ["derive"] }
-serde_json = "1.0.82"
-serde_repr = "0.1.8"
+serde = { version = "1.0.144", features = ["derive"] }
+serde_json = "1.0.85"
+serde_repr = "0.1.9"
# Error macros
-thiserror = "1.0.31"
+thiserror = "1.0.35"
base64 = "0.13.0"
# Common lib
common = { path = "../common" }
@@ -35,7 +35,7 @@ hex = "0.4.3"
[dev-dependencies]
# statistics-driven micro-benchmarks
-criterion = "0.3.6"
+criterion = "0.4.0"
[[bench]]
name = "metadata"
diff --git a/btc-wire/src/bin/segwit-demo.rs b/btc-wire/src/bin/segwit-demo.rs
index 7871b81..d52a345 100644
--- a/btc-wire/src/bin/segwit-demo.rs
+++ b/btc-wire/src/bin/segwit-demo.rs
@@ -12,7 +12,7 @@ pub fn main() {
let address =
Address::from_str("tb1qhxrhccqexg0dv4nltgkuw4fg2ce7muplmjsn0v").unwrap();
let amount = Amount::from_sat(5000000);
let reserve_pub = "54ZN9AMVN1R0YZ68ZPVHHQA4KZE1V037M05FNMYH4JQ596YAKJEG";
- let btc = amount.as_btc();
+ let btc = amount.to_btc();
println!("Ⅰ - Parse payto uri");
println!(
@@ -65,7 +65,7 @@ pub fn main() {
);
println!("\nⅢ - Send to many");
- let minimum = rpc_utils::segwit_min_amount().as_btc();
+ let minimum = rpc_utils::segwit_min_amount().to_btc();
println!("Send a single bitcoin transaction with the three addresses as
recipient as follow:");
println!("\nIn bitcoincore wallet use 'Add Recipient' button to add two
additional recipient and copy adresses and amounts");
let first = Address::from_str(&first).unwrap();
diff --git a/btc-wire/src/lib.rs b/btc-wire/src/lib.rs
index 8eaba29..04e3314 100644
--- a/btc-wire/src/lib.rs
+++ b/btc-wire/src/lib.rs
@@ -138,7 +138,7 @@ impl Rpc {
let amount = detail.amount.to_unsigned().unwrap();
let sender = sender_address(self, &full)?;
- let bounce_amount =
Amount::from_sat(amount.as_sat().saturating_sub(bounce_fee.as_sat()));
+ let bounce_amount =
Amount::from_sat(amount.to_sat().saturating_sub(bounce_fee.to_sat()));
// Send refund making recipient pay the transaction fees
self.send(&sender, &bounce_amount, metadata, true)
}
diff --git a/btc-wire/src/rpc.rs b/btc-wire/src/rpc.rs
index 73b612b..0d80aee 100644
--- a/btc-wire/src/rpc.rs
+++ b/btc-wire/src/rpc.rs
@@ -335,7 +335,7 @@ impl Rpc {
.collect();
let mut outputs: Vec<Value> = to
.into_iter()
- .map(|(addr, amount)| json!({&addr.to_string(): amount.as_btc()}))
+ .map(|(addr, amount)| json!({&addr.to_string(): amount.to_btc()}))
.collect();
let nb_outputs = outputs.len();
if let Some(data) = data {
diff --git a/btc-wire/src/taler_utils.rs b/btc-wire/src/taler_utils.rs
index e9cfecb..2658997 100644
--- a/btc-wire/src/taler_utils.rs
+++ b/btc-wire/src/taler_utils.rs
@@ -41,7 +41,7 @@ pub fn btc_payto_addr(url: &Url) -> Result<Address, 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.as_sat();
+ let sat = unsigned.to_sat();
return Amount::new(
currency.to_str(),
sat / 100_000_000,
diff --git a/common/Cargo.toml b/common/Cargo.toml
index e3c26e0..090e359 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -9,31 +9,31 @@ rust-version = "1.57.0"
[dependencies]
# Serialization framework
-serde = { version = "1.0.140", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
# Serialization helper
-serde_with = "1.14.0"
+serde_with = "2.0.1"
# JSON serialization
-serde_json = "1.0.82"
+serde_json = "1.0.85"
# Url format
-url = { version = "2.2.2", features = ["serde"] }
+url = { version = "2.3.1", features = ["serde"] }
# Crockford’s base32
base32 = "0.4.0"
# Error macros
-thiserror = "1.0.31"
+thiserror = "1.0.35"
# Ini files
rust-ini = "0.18.0"
# Logging
log = "0.4.17"
-flexi_logger = { version = "0.22.5", default-features = false, features = [
+flexi_logger = { version = "0.23.3", 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.11", features = ["formatting", "macros"] }
+time = { version = "0.3.14", 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
-zeroize = "1.5.6"
+zeroize = "1.5.7"
# Optimized uri binary format
uri-pack = { path = "../uri-pack" }
diff --git a/common/src/api_common.rs b/common/src/api_common.rs
index 31e6749..1010652 100644
--- a/common/src/api_common.rs
+++ b/common/src/api_common.rs
@@ -49,7 +49,7 @@ pub enum Timestamp {
#[derive(serde::Serialize, serde::Deserialize)]
struct TimestampImpl {
- t_ms: Value,
+ t_s: Value,
}
impl Timestamp {
@@ -64,18 +64,18 @@ impl<'de> Deserialize<'de> for Timestamp {
D: Deserializer<'de>,
{
let tmp = TimestampImpl::deserialize(deserializer)?;
- match tmp.t_ms {
- Value::Number(ms) => {
- if let Some(since_epoch_ms) = ms.as_u64() {
+ match tmp.t_s {
+ Value::Number(s) => {
+ if let Some(since_epoch_s) = s.as_u64() {
Ok(Self::Time(
- SystemTime::UNIX_EPOCH +
Duration::from_millis(since_epoch_ms),
+ SystemTime::UNIX_EPOCH +
Duration::from_secs(since_epoch_s),
))
} else {
- Err(Error::custom("Expected epoch time millis"))
+ Err(Error::custom("Expected epoch time"))
}
}
Value::String(str) if str == "never" => Ok(Self::Never),
- _ => Err(Error::custom("Expected epoch time millis or 'never'")),
+ _ => Err(Error::custom("Expected epoch time or 'never'")),
}
}
}
@@ -90,10 +90,10 @@ impl serde::Serialize for Timestamp {
Timestamp::Never => se_struct.serialize_field("t_s", "never")?,
Timestamp::Time(time) => se_struct.serialize_field(
"t_s",
- &(time
+ &time
.duration_since(SystemTime::UNIX_EPOCH)
.unwrap()
- .as_secs() as u128),
+ .as_secs(),
)?,
};
diff --git a/eth-wire/Cargo.toml b/eth-wire/Cargo.toml
index f5f7ed1..d7fb6e1 100644
--- a/eth-wire/Cargo.toml
+++ b/eth-wire/Cargo.toml
@@ -11,17 +11,17 @@ fail = []
[dependencies]
# Cli args
-clap = { version = "3.2.13", features = ["derive"] }
+clap = { version = "3.2.21", features = ["derive"] }
# Serialization library
-serde = { version = "1.0.140", features = ["derive"] }
-serde_json = "1.0.82"
-serde_repr = "0.1.8"
+serde = { version = "1.0.144", features = ["derive"] }
+serde_json = "1.0.85"
+serde_repr = "0.1.9"
hex = "0.4.3"
# Ethereum serializable types
ethereum-types = { version = "0.13.1", default-features = false, features = [
"serialize",
] }
# Error macros
-thiserror = "1.0.31"
+thiserror = "1.0.35"
# Common lib
common = { path = "../common" }
diff --git a/instrumentation/Cargo.toml b/instrumentation/Cargo.toml
index bdcd13d..5d6ac78 100644
--- a/instrumentation/Cargo.toml
+++ b/instrumentation/Cargo.toml
@@ -7,11 +7,11 @@ rust-version = "1.57.0"
[dependencies]
# Cli args parser
-clap = { version = "3.2.13", features = ["derive"] }
+clap = { version = "3.2.21", features = ["derive"] }
common = { path = "../common" }
# Bitcoin
btc-wire = { path = "../btc-wire" }
-bitcoin = { version = "0.28.1", default-features = false }
+bitcoin = { version = "0.29.1", default-features = false }
# Ethereum
eth-wire = { path = "../eth-wire" }
ethereum-types = { version = "0.13.1", default-features = false }
@@ -23,9 +23,9 @@ libdeflater = "0.10.0"
# Generate temporary files
tempfile = "3.3.0"
# RNG
-fastrand = "1.7.0"
+fastrand = "1.8.0"
# terminal color
-owo-colors = "3.4.0"
+owo-colors = "3.5.0"
# Better backtrace
color-backtrace = "0.5.1"
diff --git a/instrumentation/src/btc.rs b/instrumentation/src/btc.rs
index 8743507..a21fa42 100644
--- a/instrumentation/src/btc.rs
+++ b/instrumentation/src/btc.rs
@@ -97,7 +97,7 @@ pub fn online_test(config: Option<&Path>, base_url: &str) {
if client_rpc.get_balance().unwrap() < min_fund {
println!(
"Client need a minimum of {} BTC to run this test, send coins to
this address: {}",
- min_fund.as_btc(),
+ min_fund.to_btc(),
client_addr
);
print_now("Waiting for fund:");
diff --git a/instrumentation/src/gateway.rs b/instrumentation/src/gateway.rs
index 6a3f5c9..ad58a21 100644
--- a/instrumentation/src/gateway.rs
+++ b/instrumentation/src/gateway.rs
@@ -67,7 +67,7 @@ fn api() {
"-b",
&ctx.gateway_url,
"-D",
- &btc_payto_url(&ctx.client_addr).to_string(),
+ btc_payto_url(&ctx.client_addr).as_ref(),
"-a",
&amount,
],
@@ -90,7 +90,7 @@ fn api() {
let amount = format!("{}:0.0000{}",
ctx.taler_conf.currency.to_str(), n);
client_transfer(
&ctx.gateway_url,
- &btc_payto_url(&ctx.client_addr).to_string(),
+ btc_payto_url(&ctx.client_addr).as_ref(),
&amount,
);
amounts.push(amount);
@@ -234,7 +234,7 @@ fn auth() {
"-s",
"exchange-accountcredentials-admin",
"-C",
- &btc_payto_url(&ctx.client_addr).to_string(),
+ btc_payto_url(&ctx.client_addr).as_ref(),
"-a",
&format!("{}:0.00042", ctx.taler_conf.currency.to_str()),
],
diff --git a/makefile b/makefile
index ebf54d6..80e3910 100644
--- a/makefile
+++ b/makefile
@@ -4,4 +4,7 @@ install:
cargo install --path wire-gateway
segwit_demo:
- cargo run --release --bin segwit-demo
\ No newline at end of file
+ cargo run --release --bin segwit-demo
+
+test:
+ cargo run --bin instrumentation -- offline
\ No newline at end of file
diff --git a/script/prepare.sh b/script/prepare.sh
index 499370e..a76c946 100755
--- a/script/prepare.sh
+++ b/script/prepare.sh
@@ -28,13 +28,13 @@ mkdir -pv ~/bitcoin
tar xvzf btc.tar.gz
mv -v bitcoin-23.0/* ~/bitcoin
-echo "Ⅲ - Install Go Ethereum (Geth) v1.10.20"
+echo "Ⅲ - Install Go Ethereum (Geth) v1.10.24"
cd $DIR
-curl -L
https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.10.21-67109427.tar.gz
-o geth.tar.gz
+curl -L
https://gethstore.blob.core.windows.net/builds/geth-alltools-linux-amd64-1.10.24-972007a5.tar.gz
-o geth.tar.gz
rm -rfv ~/geth
mkdir -pv ~/geth
tar xvzf geth.tar.gz
-mv -v geth-linux-amd64-1.10.21-67109427/* ~/geth
+mv -v geth-alltools-linux-amd64-1.10.24-972007a5/* ~/geth
echo "Ⅳ - PATH"
diff --git a/uri-pack/Cargo.toml b/uri-pack/Cargo.toml
index b94ce68..246abe3 100644
--- a/uri-pack/Cargo.toml
+++ b/uri-pack/Cargo.toml
@@ -8,18 +8,18 @@ license = "AGPL-3.0-or-later"
[dependencies]
# Error macros
-thiserror = "1.0.31"
+thiserror = "1.0.35"
csv = "1.1.6"
[dev-dependencies]
# Json parser
-serde_json = "1.0.82"
+serde_json = "1.0.85"
# Url parser
-url = "2.2.2"
+url = "2.3.1"
# statistics-driven micro-benchmarks
-criterion = "0.3.6"
+criterion = "0.4.0"
# Fast insecure random
-fastrand = "1.7.0"
+fastrand = "1.8.0"
# Fuzzing test
quickcheck = "1.0.3"
quickcheck_macros = "1.0.0"
diff --git a/wire-gateway/Cargo.toml b/wire-gateway/Cargo.toml
index a812bb2..0fd2e00 100644
--- a/wire-gateway/Cargo.toml
+++ b/wire-gateway/Cargo.toml
@@ -11,32 +11,32 @@ hyper = { version = "0.14.20", features = ["http1",
"server", "runtime"] }
# Hyper compat lib for unix domain socket
hyperlocal = "0.8.0"
# Async runtime
-tokio = { version = "1.20.0", features = ["net", "macros", "rt-multi-thread"] }
+tokio = { version = "1.21.1", features = ["net", "macros", "rt-multi-thread"] }
# Serialization framework
-serde = { version = "1.0.140", features = ["derive"] }
+serde = { version = "1.0.144", features = ["derive"] }
# Serialization helper
-serde_with = "1.14.0"
+serde_with = "2.0.1"
# JSON serialization
-serde_json = "1.0.82"
+serde_json = "1.0.85"
# Url query serialization
serde_urlencoded = "0.7.1"
# Error macros
-thiserror = "1.0.31"
+thiserror = "1.0.35"
# Deflate compression
-miniz_oxide = "0.5.3"
+miniz_oxide = "0.6.2"
# Async postgres client
-tokio-postgres = { version = "0.7.6" }
+tokio-postgres = { version = "0.7.7" }
deadpool-postgres = "0.10.2"
# Socket activation
listenfd = "1.0.0"
# Common lib
common = { path = "../common" }
# Bitcoin types
-bitcoin = { version = "0.28.1" }
+bitcoin = { version = "0.29.1" }
# Ethereum types
ethereum-types = { version = "0.13.1", default-features = false }
# Cli args parser
-clap = { version = "3.2.13", features = ["derive"] }
+clap = { version = "3.2.21", features = ["derive"] }
[features]
# Enable test admin endpoint
diff --git a/wire-gateway/src/json.rs b/wire-gateway/src/json.rs
index 4e97c3f..da0c3c3 100644
--- a/wire-gateway/src/json.rs
+++ b/wire-gateway/src/json.rs
@@ -55,7 +55,7 @@ pub async fn parse_body<J: serde::de::DeserializeOwned>(
&bytes,
MAX_PAYLOAD_SIZE as usize,
)
- .map_err(|s| match s {
+ .map_err(|s| match s.status {
TINFLStatus::HasMoreOutput =>
ParseBodyError::SuspiciousCompression,
_ => ParseBodyError::Deflate,
})?;
--
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 (c840884 -> 83c8149),
gnunet <=