summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine A <>2022-12-11 17:59:44 +0100
committerAntoine A <>2022-12-11 17:59:44 +0100
commit6676e056f5fee77e183fc58bc4a0e94a94b0f370 (patch)
treedff2f35b44950a10c092a8b7f8c732c0f115f524
parent4785103ded2189b3efdc0a0fb713bd869dfb9455 (diff)
downloaddepolymerization-6676e056f5fee77e183fc58bc4a0e94a94b0f370.tar.gz
depolymerization-6676e056f5fee77e183fc58bc4a0e94a94b0f370.tar.bz2
depolymerization-6676e056f5fee77e183fc58bc4a0e94a94b0f370.zip
Bump msrv to 1.63.0 to follow debian package
-rw-r--r--Cargo.lock263
-rw-r--r--btc-wire/Cargo.toml4
-rw-r--r--common/Cargo.toml12
-rw-r--r--common/src/log.rs7
-rw-r--r--eth-wire/Cargo.toml10
-rw-r--r--instrumentation/Cargo.toml8
-rw-r--r--makefile5
-rwxr-xr-xscript/prepare.sh12
-rw-r--r--wire-gateway/Cargo.toml10
9 files changed, 198 insertions, 133 deletions
diff --git a/Cargo.lock b/Cargo.lock
index aa6496c..81b15e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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",
]
@@ -174,7 +174,7 @@ dependencies = [
"base64 0.20.0",
"bech32",
"bitcoin",
- "clap",
+ "clap 4.0.29",
"common",
"criterion",
"hex",
@@ -230,6 +230,7 @@ dependencies = [
"iana-time-zone",
"num-integer",
"num-traits",
+ "serde",
"winapi",
]
@@ -272,22 +273,32 @@ version = "3.2.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
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",
@@ -306,12 +317,21 @@ dependencies = [
]
[[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",
]
@@ -350,7 +370,6 @@ dependencies = [
"serde_json",
"serde_with",
"thiserror",
- "time",
"uri-pack",
"url",
"zeroize",
@@ -390,7 +409,7 @@ dependencies = [
"atty",
"cast",
"ciborium",
- "clap",
+ "clap 3.2.23",
"criterion-plot",
"itertools",
"lazy_static",
@@ -543,9 +562,9 @@ dependencies = [
[[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",
@@ -553,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",
@@ -567,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",
@@ -644,10 +663,31 @@ dependencies = [
]
[[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",
@@ -659,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",
@@ -671,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",
@@ -699,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",
@@ -720,9 +760,9 @@ dependencies = [
[[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",
@@ -730,7 +770,6 @@ dependencies = [
"log",
"rustversion",
"thiserror",
- "time",
]
[[package]]
@@ -749,21 +788,6 @@ dependencies = [
]
[[package]]
-name = "futures"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
name = "futures-channel"
version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -780,23 +804,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
[[package]]
-name = "futures-executor"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
-
-[[package]]
name = "futures-macro"
version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -825,13 +832,10 @@ version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
dependencies = [
- "futures-channel",
"futures-core",
- "futures-io",
"futures-macro",
"futures-sink",
"futures-task",
- "memchr",
"pin-project-lite",
"pin-utils",
"slab",
@@ -901,6 +905,15 @@ dependencies = [
]
[[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"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1027,9 +1040,9 @@ 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",
]
@@ -1042,6 +1055,7 @@ checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
dependencies = [
"autocfg",
"hashbrown",
+ "serde",
]
[[package]]
@@ -1059,7 +1073,7 @@ version = "0.1.0"
dependencies = [
"bitcoin",
"btc-wire",
- "clap",
+ "clap 4.0.29",
"clap_mangen",
"color-backtrace",
"common",
@@ -1074,6 +1088,28 @@ dependencies = [
]
[[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.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1143,6 +1179,12 @@ dependencies = [
]
[[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"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1251,16 +1293,7 @@ version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
-dependencies = [
+ "hermit-abi 0.1.19",
"libc",
]
@@ -1338,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",
]
@@ -1416,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",
@@ -1465,9 +1498,9 @@ 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",
@@ -1681,6 +1714,20 @@ 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.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1811,19 +1858,25 @@ dependencies = [
[[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",
@@ -1969,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.4",
- "libc",
- "num_threads",
+ "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"
@@ -2050,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",
@@ -2428,7 +2491,7 @@ 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 99da036..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
@@ -16,7 +16,7 @@ bitcoin = { version = "0.29.2", features = [
"serde",
], default-features = false }
# Cli args parser
-clap = { version = "3.2.23", features = ["derive"] }
+clap = { version = "4.0.29", features = ["derive"] }
# Bech32 encoding and decoding
bech32 = "0.9.1"
# Serialization library
diff --git a/common/Cargo.toml b/common/Cargo.toml
index 90c1409..1386709 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -3,7 +3,7 @@ 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
@@ -11,7 +11,7 @@ rust-version = "1.57.0"
# Serialization framework
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.89"
# Url format
@@ -23,14 +23,10 @@ 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/eth-wire/Cargo.toml b/eth-wire/Cargo.toml
index 7d002f3..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,14 +11,14 @@ fail = []
[dependencies]
# Cli args
-clap = { version = "3.2.23", features = ["derive"] }
+clap = { version = "4.0.29", features = ["derive"] }
# Serialization library
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = "1.0.88"
+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
diff --git a/instrumentation/Cargo.toml b/instrumentation/Cargo.toml
index 207e36a..707c5f1 100644
--- a/instrumentation/Cargo.toml
+++ b/instrumentation/Cargo.toml
@@ -3,18 +3,18 @@ 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.23", features = ["derive"] }
+clap = { version = "4.0.29", features = ["derive"] }
common = { path = "../common" }
# Bitcoin
btc-wire = { path = "../btc-wire" }
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"] }
@@ -31,4 +31,4 @@ color-backtrace = "0.5.1"
[build-dependencies]
-clap_mangen = "0.1.11"
+clap_mangen = "0.2.5"
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/wire-gateway/Cargo.toml b/wire-gateway/Cargo.toml
index 8ab5e61..b5f500c 100644
--- a/wire-gateway/Cargo.toml
+++ b/wire-gateway/Cargo.toml
@@ -3,7 +3,7 @@ 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
@@ -15,7 +15,7 @@ tokio = { version = "1.23.0", features = ["net", "macros", "rt-multi-thread"] }
# Serialization framework
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.89"
# Url query serialization
@@ -25,7 +25,7 @@ thiserror = "1.0.37"
# Deflate compression
miniz_oxide = "0.6.2"
# Async postgres client
-tokio-postgres = { version = "=0.7.6" }
+tokio-postgres = { version = "0.7.7" }
deadpool-postgres = "0.10.3"
# Socket activation
listenfd = "1.0.0"
@@ -34,9 +34,9 @@ common = { path = "../common" }
# Bitcoin types
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.23", features = ["derive"] }
+clap = { version = "4.0.29", features = ["derive"] }
[features]
# Enable test admin endpoint