diff --git a/Cargo.lock b/Cargo.lock index 2872a6a9551..9eec6ba9c83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,6 +80,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ + "winapi", +] + [[package]] name = "ansi_term" version = "0.12.1" @@ -113,8 +122,8 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5" dependencies = [ - "quote 1.0.18", - "syn 1.0.91", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -154,9 +163,9 @@ dependencies = [ [[package]] name = "async-global-executor" -version = "2.0.4" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c290043c9a95b05d45e952fb6383c67bcb61471f60cfa21e890dba6654234f43" +checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6" dependencies = [ "async-channel", "async-executor", @@ -171,16 +180,18 @@ dependencies = [ [[package]] name = "async-h1" -version = "2.3.3" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8101020758a4fc3a7c326cb42aa99e9fa77cbfb76987c128ad956406fe1f70a7" +checksum = "cc5142de15b549749cce62923a50714b0d7b77f5090ced141599e78899865451" dependencies = [ "async-channel", "async-dup", "async-std", + "byte-pool", "futures-core", "http-types", "httparse", + "lazy_static", "log", "pin-project", ] @@ -206,9 +217,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.5.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" +checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" dependencies = [ "event-listener", ] @@ -224,9 +235,9 @@ dependencies = [ [[package]] name = "async-process" -version = "1.3.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83137067e3a2a6a06d67168e49e68a0957d215410473a740cea95a2425c0b7c6" +checksum = "b21b63ab5a0db0369deb913540af2892750e42d949faacc7a61495ac418a1692" dependencies = [ "async-io", "blocking", @@ -276,9 +287,9 @@ dependencies = [ [[package]] name = "async-std" -version = "1.11.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52580991739c5cdb36cde8b2a516371c0a3b70dda36d916cc08b82372916808c" +checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952" dependencies = [ "async-attributes", "async-channel", @@ -297,7 +308,7 @@ dependencies = [ "memchr", "num_cpus", "once_cell", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.7", "pin-utils", "slab", "wasm-bindgen-futures", @@ -305,19 +316,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.2.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" +checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -339,24 +350,21 @@ dependencies = [ [[package]] name = "autocfg" -version = "0.1.8" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" -dependencies = [ - "autocfg 1.1.0", -] +checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.65" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" +checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" dependencies = [ "addr2line", "cc", @@ -369,9 +377,9 @@ dependencies = [ [[package]] name = "base-x" -version = "0.2.10" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc19a4937b4fbd3fe3379793130e42060d10627a360f2127802b10b87e7baf74" +checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" [[package]] name = "base64" @@ -414,18 +422,29 @@ name = "bitcoin" version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a41df6ad9642c5c15ae312dd3d074de38fd3eb7cc87ad4ce10f90292a83fe4d" +dependencies = [ + "bech32", + "bitcoin_hashes", + "secp256k1 0.20.3", +] + +[[package]] +name = "bitcoin" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05bba324e6baf655b882df672453dbbc527bc938cadd27750ae510aaccc3a66a" dependencies = [ "bech32", "bitcoin_hashes", "bitcoinconsensus", - "secp256k1", + "secp256k1 0.22.1", "serde", ] [[package]] name = "bitcoin_hashes" version = "0.10.0" -source = "git+https://github.com/fedimint/bitcoin_hashes?branch=minimint#fb2be02f95fac4d21cc8822f4bf63166c7aa8d47" +source = "git+https://github.com/rust-bitcoin/bitcoin_hashes?rev=b27002339186a836edb06a6cff8e5c133a2d5f5f#b27002339186a836edb06a6cff8e5c133a2d5f5f" dependencies = [ "serde", ] @@ -442,9 +461,9 @@ dependencies = [ [[package]] name = "bitcoincore-rpc" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b8d99d58466295cb2bf72c6959b784d59f8f0d6977458d2ba3eb75c834f36c3" +checksum = "dd0e67dbf7a9971e7f4276f6089e9e814ce0f624a03216b7d92d00351ae7fb3e" dependencies = [ "bitcoincore-rpc-json", "jsonrpc", @@ -455,11 +474,11 @@ dependencies = [ [[package]] name = "bitcoincore-rpc-json" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce91de73c61f5776cf938bfa88378c5b404a70e3369b761dacbe6024fea79dd" +checksum = "2e2ae16202721ba8c3409045681fac790a5ddc791f05731a2df22c0c6bffc0f1" dependencies = [ - "bitcoin", + "bitcoin 0.28.1", "serde", "serde_json", ] @@ -515,9 +534,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.2.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" +checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" dependencies = [ "async-channel", "async-task", @@ -542,9 +561,19 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.9.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" +checksum = "8f1e260c3a9040a7c19a12468758f4c16f31a81a1fe087482be9570ec864bb6c" + +[[package]] +name = "byte-pool" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8c7230ddbb427b1094d477d821a99f3f54d36333178eeb806e279bcdcecf0ca" +dependencies = [ + "crossbeam-queue", + "stable_deref_trait", +] [[package]] name = "byteorder" @@ -560,15 +589,15 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "cache-padded" -version = "1.2.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" +checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" [[package]] name = "cfg-if" @@ -592,7 +621,7 @@ dependencies = [ "num-integer", "num-traits", "serde", - "time 0.1.44", + "time 0.1.43", "winapi", ] @@ -607,11 +636,11 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "2.33.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ - "ansi_term", + "ansi_term 0.11.0", "atty", "bitflags", "strsim", @@ -635,7 +664,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "tokio-util 0.6.9", + "tokio-util", ] [[package]] @@ -658,9 +687,9 @@ dependencies = [ [[package]] name = "const_fn" -version = "0.4.9" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" +checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" [[package]] name = "constant_time_eq" @@ -679,7 +708,7 @@ dependencies = [ "hkdf", "hmac 0.10.1", "percent-encoding", - "rand 0.8.5", + "rand 0.8.4", "sha2", "time 0.2.27", "version_check", @@ -703,18 +732,18 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "counter" -version = "0.5.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7798e2993e65a31cccd4aea51cea5d768736df1e02b11a26b8935ab14819b176" +checksum = "698f7363cfc52779c375902ea6bc8b407f4b0b43be34e83cfdc8231a0e7545fe" dependencies = [ "num-traits", ] [[package]] name = "cpufeatures" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" +checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" dependencies = [ "libc", ] @@ -727,18 +756,18 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.5.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -757,11 +786,10 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.8" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" dependencies = [ - "autocfg 1.1.0", "cfg-if 1.0.0", "crossbeam-utils", "lazy_static", @@ -769,11 +797,21 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" dependencies = [ "cfg-if 1.0.0", "lazy_static", @@ -807,12 +845,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.22" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" +checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" dependencies = [ - "quote 1.0.18", - "syn 1.0.91", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -868,9 +906,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "a74ea89a0a1b98f6332de42c95baff457ada66d1cb4030f9ff151b2041a1c746" dependencies = [ "cfg-if 1.0.0", ] @@ -888,15 +926,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "erased-serde" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad132dd8d0d0b546348d7d86cb3191aad14b34e5f979781fc005c80d4ac67ffd" -dependencies = [ - "serde", -] - [[package]] name = "errno" version = "0.2.8" @@ -920,9 +949,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.2" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" +checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" [[package]] name = "failure" @@ -940,28 +969,28 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", "synstructure", ] [[package]] name = "fastrand" -version = "1.7.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +checksum = "b394ed3d285a429378d3b384b9eb1285267e7df4b166df24b7a6939a04dc392e" dependencies = [ "instant", ] [[package]] name = "femme" -version = "2.2.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2997b612abb06bc299486c807e68c5fd12e7618e69cf34c5958ca6b575674403" +checksum = "2af1a24f391a5a94d756db5092c6576aad494b88a71a5a36b20c67b63e0df034" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "js-sys", "log", "serde", @@ -1094,7 +1123,7 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.7", "waker-fn", ] @@ -1104,9 +1133,9 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -1134,7 +1163,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.7", "pin-utils", "slab", ] @@ -1150,9 +1179,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.5" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" dependencies = [ "typenum", "version_check", @@ -1171,13 +1200,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.6" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi 0.10.2+wasi-snapshot-preview1", ] [[package]] @@ -1198,14 +1227,15 @@ checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" [[package]] name = "gloo-timers" -version = "0.2.4" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" +checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" dependencies = [ "futures-channel", "futures-core", "js-sys", "wasm-bindgen", + "web-sys", ] [[package]] @@ -1222,9 +1252,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.13" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" +checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55" dependencies = [ "bytes", "fnv", @@ -1235,7 +1265,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.1", + "tokio-util", "tracing", ] @@ -1334,7 +1364,7 @@ checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ "bytes", "fnv", - "itoa", + "itoa 1.0.1", ] [[package]] @@ -1345,7 +1375,7 @@ checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ "bytes", "http", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.7", ] [[package]] @@ -1374,7 +1404,7 @@ dependencies = [ "cookie", "futures-lite", "infer", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.7", "rand 0.7.3", "serde", "serde_json", @@ -1385,15 +1415,15 @@ dependencies = [ [[package]] name = "httparse" -version = "1.7.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6330e8a36bd8c859f3fa6d9382911fbb7147ec39807f63b923933a247240b9ba" +checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" [[package]] name = "humantime" @@ -1406,9 +1436,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.18" +version = "0.14.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" +checksum = "2b91bb1f221b6ea1f1e4371216b70f40748774c2fb5971b450c07773fb92d26b" dependencies = [ "bytes", "futures-channel", @@ -1419,8 +1449,8 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa", - "pin-project-lite 0.2.8", + "itoa 0.4.8", + "pin-project-lite 0.2.7", "socket2", "tokio", "tower-service", @@ -1447,11 +1477,11 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "indexmap" -version = "1.8.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.0.1", "hashbrown", ] @@ -1478,19 +1508,25 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.5.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" [[package]] name = "itertools" -version = "0.10.3" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" dependencies = [ "either", ] +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + [[package]] name = "itoa" version = "1.0.1" @@ -1499,18 +1535,18 @@ checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" [[package]] name = "js-sys" -version = "0.3.57" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" +checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonrpc" -version = "0.12.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f8423b78fc94d12ef1a4a9d13c348c9a78766dda0cc18817adf0faf77e670c8" +checksum = "ad24d69a8a0698db8ffb9048e937e8ae3ee3bc45772a5d7b6979b1d2d5b6a9f7" dependencies = [ "base64-compat", "serde", @@ -1541,9 +1577,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.124" +version = "0.2.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50" +checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" [[package]] name = "libm" @@ -1557,8 +1593,8 @@ version = "0.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "580647f97f8e6d138ad724027c8ca9b890b1001b05374c270bbee4c10309b641" dependencies = [ - "bitcoin", - "secp256k1", + "bitcoin 0.27.1", + "secp256k1 0.20.3", ] [[package]] @@ -1571,7 +1607,7 @@ dependencies = [ "bitcoin_hashes", "lightning", "num-traits", - "secp256k1", + "secp256k1 0.20.3", ] [[package]] @@ -1588,7 +1624,7 @@ dependencies = [ "minimint-api", "mint-client", "rand 0.6.5", - "secp256k1", + "secp256k1 0.22.1", "serde", "serde_json", "sled", @@ -1602,22 +1638,20 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" dependencies = [ - "autocfg 1.1.0", "scopeguard", ] [[package]] name = "log" -version = "0.4.16" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ "cfg-if 1.0.0", - "serde", "value-bag", ] @@ -1650,11 +1684,11 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.0.1", ] [[package]] @@ -1681,7 +1715,7 @@ version = "0.1.0" dependencies = [ "async-trait", "bincode", - "bitcoin", + "bitcoin 0.28.1", "futures", "hbbft", "hex", @@ -1703,7 +1737,7 @@ dependencies = [ "thiserror", "tide", "tokio", - "tokio-util 0.6.9", + "tokio-util", "tracing", "tracing-subscriber", ] @@ -1713,7 +1747,7 @@ name = "minimint-api" version = "0.1.0" dependencies = [ "async-trait", - "bitcoin", + "bitcoin 0.28.1", "bitcoin_hashes", "hex", "http-types", @@ -1734,9 +1768,9 @@ name = "minimint-derive" version = "0.1.0" dependencies = [ "heck", - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -1751,7 +1785,7 @@ dependencies = [ "lightning", "lightning-invoice", "minimint-api", - "secp256k1", + "secp256k1 0.22.1", "serde", "thiserror", "threshold_crypto", @@ -1784,7 +1818,7 @@ name = "minimint-wallet" version = "0.1.0" dependencies = [ "async-trait", - "bitcoin", + "bitcoin 0.28.1", "bitcoincore-rpc", "hex", "itertools", @@ -1792,7 +1826,7 @@ dependencies = [ "minimint-derive", "miniscript", "rand 0.6.5", - "secp256k1", + "secp256k1 0.22.1", "serde", "thiserror", "tokio", @@ -1802,21 +1836,22 @@ dependencies = [ [[package]] name = "miniscript" -version = "6.1.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e292b58407dfbf1384e5aca8428d3b0f2eaa09d24cb17088f6db0b7ca31194a" +checksum = "da39fc7a8adea97a677337b0091779dd86349226b869053af496584a9b9e5847" dependencies = [ - "bitcoin", + "bitcoin 0.28.1", "serde", ] [[package]] name = "miniz_oxide" -version = "0.5.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ "adler", + "autocfg 1.0.1", ] [[package]] @@ -1826,7 +1861,7 @@ dependencies = [ "async-trait", "base64 0.13.0", "bincode", - "bitcoin", + "bitcoin 0.28.1", "bitcoin_hashes", "futures", "hex", @@ -1851,15 +1886,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.2" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", "miow", "ntapi", - "wasi 0.11.0+wasi-snapshot-preview1", "winapi", ] @@ -1892,9 +1926,9 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.3.7" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" dependencies = [ "winapi", ] @@ -1905,7 +1939,7 @@ version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.0.1", "num-traits", ] @@ -1915,14 +1949,14 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.0.1", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" dependencies = [ "hermit-abi", "libc", @@ -1930,18 +1964,18 @@ dependencies = [ [[package]] name = "object" -version = "0.28.3" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40bec70ba014595f99f7aa110b84331ffe1ee9aece7fe6f387cc7e3ecda4d456" +checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.10.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "opaque-debug" @@ -1951,18 +1985,30 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.38" +version = "0.10.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e" dependencies = [ "bitflags", "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", + "openssl-macros", "openssl-sys", ] +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", +] + [[package]] name = "openssl-probe" version = "0.1.5" @@ -1980,11 +2026,11 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.72" +version = "0.9.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" +checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.0.1", "cc", "libc", "openssl-src", @@ -2025,17 +2071,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", -] - -[[package]] -name = "parking_lot" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.2", + "parking_lot_core", ] [[package]] @@ -2052,19 +2088,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "parking_lot_core" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "smallvec", - "windows-sys", -] - [[package]] name = "percent-encoding" version = "2.1.0" @@ -2073,22 +2096,22 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pin-project" -version = "1.0.10" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.10" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" +checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -2099,9 +2122,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.8" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" [[package]] name = "pin-utils" @@ -2117,9 +2140,9 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "polling" -version = "2.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" +checksum = "92341d779fa34ea8437ef4d82d440d5e1ce3f3ff7f824aa64424cd481f9a1f25" dependencies = [ "cfg-if 1.0.0", "libc", @@ -2141,9 +2164,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "proc-macro-error" @@ -2152,9 +2175,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", "version_check", ] @@ -2164,8 +2187,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.18", + "proc-macro2 1.0.32", + "quote 1.0.10", "version_check", ] @@ -2186,9 +2209,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.37" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" +checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" dependencies = [ "unicode-xid 0.2.2", ] @@ -2216,11 +2239,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.18" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" dependencies = [ - "proc-macro2 1.0.37", + "proc-macro2 1.0.32", ] [[package]] @@ -2248,7 +2271,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" dependencies = [ - "autocfg 0.1.8", + "autocfg 0.1.7", "libc", "rand_chacha 0.1.1", "rand_core 0.4.2", @@ -2276,13 +2299,14 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.3", + "rand_hc 0.3.1", ] [[package]] @@ -2310,7 +2334,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" dependencies = [ - "autocfg 0.1.8", + "autocfg 0.1.7", "rand_core 0.3.1", ] @@ -2364,7 +2388,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.6", + "getrandom 0.2.3", ] [[package]] @@ -2395,6 +2419,15 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_hc" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +dependencies = [ + "rand_core 0.6.3", +] + [[package]] name = "rand_isaac" version = "0.1.1" @@ -2435,7 +2468,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" dependencies = [ - "autocfg 0.1.8", + "autocfg 0.1.7", "rand_core 0.4.2", ] @@ -2450,11 +2483,11 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.2" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" +checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.0.1", "crossbeam-deque", "either", "rayon-core", @@ -2462,13 +2495,14 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.2" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" +checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", + "lazy_static", "num_cpus", ] @@ -2483,9 +2517,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.13" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ "bitflags", ] @@ -2497,16 +2531,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7170bac0d8306941e101df0caaa6518b10bc4232dd36c34f1cb78b8a063024db" dependencies = [ "libm", - "parking_lot 0.11.2", + "parking_lot", "smallvec", "spin", ] [[package]] name = "regex" -version = "1.5.5" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", @@ -2539,16 +2573,15 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.10" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" +checksum = "66d2927ca2f685faf0fc620ac4834690d29e7abb153add10f5812eef20b5e280" dependencies = [ "base64 0.13.0", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2", "http", "http-body", "hyper", @@ -2558,7 +2591,7 @@ dependencies = [ "log", "mime", "percent-encoding", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.7", "serde", "serde_json", "serde_urlencoded", @@ -2593,9 +2626,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" [[package]] name = "schannel" @@ -2616,40 +2649,62 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "secp256k1" version = "0.20.3" -source = "git+https://github.com/fedimint/rust-secp256k1/?branch=minimint#37b9d77d98a497fddfb435df4f806b17276edb8d" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a" +dependencies = [ + "secp256k1-sys 0.4.0", +] + +[[package]] +name = "secp256k1" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26947345339603ae8395f68e2f3d85a6b0a8ddfe6315818e80b8504415099db0" dependencies = [ "bitcoin_hashes", "rand 0.6.5", - "secp256k1-sys", + "secp256k1-sys 0.5.1", "serde", ] [[package]] name = "secp256k1-sys" -version = "0.4.1" -source = "git+https://github.com/fedimint/rust-secp256k1/?branch=minimint#37b9d77d98a497fddfb435df4f806b17276edb8d" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67e4b6455ee49f5901c8985b88f98fb0a0e1d90a6661f5a03f4888bd987dad29" +dependencies = [ + "cc", +] + +[[package]] +name = "secp256k1-sys" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa6f71720acd498e888501dd485d54bb437735f02dd95eb717dac5aee6631894" dependencies = [ "cc", ] [[package]] name = "secp256k1-zkp" -version = "0.4.0" -source = "git+https://github.com/elsirion/rust-secp256k1-zkp?branch=minimint#1c4d6e843333947804df1be20d7fe9bd636a1555" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c724fda6aae465ed9a39320202bc6164e0adb3cdf9bc16d5af4be7eebaba75e5" dependencies = [ "rand 0.6.5", - "secp256k1", + "secp256k1 0.22.1", "secp256k1-zkp-sys", "serde", ] [[package]] name = "secp256k1-zkp-sys" -version = "0.4.0" -source = "git+https://github.com/elsirion/rust-secp256k1-zkp?branch=minimint#1c4d6e843333947804df1be20d7fe9bd636a1555" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6f880412a627e79d3ce17355150ea1e0e76570efb7f0f70df51504cbe2582e3" dependencies = [ "cc", - "secp256k1-sys", + "secp256k1-sys 0.5.1", ] [[package]] @@ -2692,31 +2747,22 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.136" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.136" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" -dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", -] - -[[package]] -name = "serde_fmt" -version = "1.0.1" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2963a69a2b3918c1dc75a45a18bd3fcd1120e31d3f59deb1b2f9b5d5ffb8baa4" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ - "serde", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -2725,7 +2771,7 @@ version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" dependencies = [ - "itoa", + "itoa 1.0.1", "ryu", "serde", ] @@ -2743,36 +2789,27 @@ dependencies = [ [[package]] name = "serde_urlencoded" -version = "0.7.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" dependencies = [ "form_urlencoded", - "itoa", + "itoa 0.4.8", "ryu", "serde", ] [[package]] name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" +checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" [[package]] name = "sha2" -version = "0.9.9" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" dependencies = [ "block-buffer", "cfg-if 1.0.0", @@ -2804,9 +2841,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.13" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" +checksum = "9c98891d737e271a2954825ef19e46bd16bdb98e2746f2eec4f7a4ef7946efd1" dependencies = [ "libc", "signal-hook-registry", @@ -2832,9 +2869,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "sled" @@ -2849,20 +2886,20 @@ dependencies = [ "fxhash", "libc", "log", - "parking_lot 0.11.2", + "parking_lot", ] [[package]] name = "smallvec" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" dependencies = [ "libc", "winapi", @@ -2870,9 +2907,15 @@ dependencies = [ [[package]] name = "spin" -version = "0.9.3" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d" +checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "standback" @@ -2903,11 +2946,11 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.18", + "proc-macro2 1.0.32", + "quote 1.0.10", "serde", "serde_derive", - "syn 1.0.91", + "syn 1.0.81", ] [[package]] @@ -2917,13 +2960,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" dependencies = [ "base-x", - "proc-macro2 1.0.37", - "quote 1.0.18", + "proc-macro2 1.0.32", + "quote 1.0.10", "serde", "serde_derive", "serde_json", "sha1", - "syn 1.0.91", + "syn 1.0.81", ] [[package]] @@ -2940,9 +2983,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "structopt" -version = "0.3.26" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +checksum = "40b9788f4202aa75c240ecc9c15c65185e6a39ccdeb0fd5d008b98825464c87c" dependencies = [ "clap", "lazy_static", @@ -2957,9 +3000,9 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck", "proc-macro-error", - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -2973,9 +3016,6 @@ name = "sval" version = "1.0.0-alpha.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" -dependencies = [ - "serde", -] [[package]] name = "syn" @@ -3001,12 +3041,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.91" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" +checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.18", + "proc-macro2 1.0.32", + "quote 1.0.10", "unicode-xid 0.2.2", ] @@ -3025,9 +3065,9 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", "unicode-xid 0.2.2", ] @@ -3046,7 +3086,7 @@ dependencies = [ "ff", "group", "hex", - "rand 0.8.5", + "rand 0.8.4", "rand_chacha 0.3.1", "serde", "sha3", @@ -3065,13 +3105,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if 1.0.0", - "fastrand", "libc", + "rand 0.8.4", "redox_syscall", "remove_dir_all", "winapi", @@ -3079,9 +3119,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" dependencies = [ "winapi-util", ] @@ -3110,16 +3150,16 @@ version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" dependencies = [ "once_cell", ] @@ -3161,7 +3201,7 @@ dependencies = [ "http-types", "kv-log-macro", "log", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.7", "route-recognizer", "serde", "serde_json", @@ -3169,12 +3209,11 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] @@ -3210,10 +3249,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.37", - "quote 1.0.18", + "proc-macro2 1.0.32", + "quote 1.0.10", "standback", - "syn 1.0.91", + "syn 1.0.81", ] [[package]] @@ -3227,9 +3266,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7" dependencies = [ "tinyvec_macros", ] @@ -3242,33 +3281,33 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.17.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" +checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144" dependencies = [ + "autocfg 1.0.1", "bytes", "libc", "memchr", "mio", "num_cpus", "once_cell", - "parking_lot 0.12.0", - "pin-project-lite 0.2.8", + "parking_lot", + "pin-project-lite 0.2.7", "signal-hook-registry", - "socket2", "tokio-macros", "winapi", ] [[package]] name = "tokio-macros" -version = "1.7.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] @@ -3282,24 +3321,10 @@ dependencies = [ "futures-io", "futures-sink", "log", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.7", "tokio", ] -[[package]] -name = "tokio-util" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite 0.2.8", - "tokio", - "tracing", -] - [[package]] name = "tower-service" version = "0.3.1" @@ -3308,42 +3333,41 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.34" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" +checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ "cfg-if 1.0.0", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.7", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.20" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" +checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", ] [[package]] name = "tracing-core" -version = "0.1.26" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" +checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" dependencies = [ "lazy_static", - "valuable", ] [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" dependencies = [ "lazy_static", "log", @@ -3352,11 +3376,11 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.11" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" +checksum = "245da694cc7fc4729f3f418b304cb57789f1bed2a78c575407ab8a23f53cb4d3" dependencies = [ - "ansi_term", + "ansi_term 0.12.1", "lazy_static", "matchers", "regex", @@ -3376,9 +3400,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "typenum" -version = "1.15.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" [[package]] name = "unicode-bidi" @@ -3397,9 +3421,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" @@ -3474,10 +3498,10 @@ dependencies = [ "if_chain", "lazy_static", "proc-macro-error", - "proc-macro2 1.0.37", - "quote 1.0.18", + "proc-macro2 1.0.32", + "quote 1.0.10", "regex", - "syn 1.0.91", + "syn 1.0.81", "validator_types", ] @@ -3487,12 +3511,6 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad9680608df133af2c1ddd5eaf1ddce91d60d61b6bc51494ef326458365a470a" -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - [[package]] name = "value-bag" version = "1.0.0-alpha.8" @@ -3500,9 +3518,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" dependencies = [ "ctor", - "erased-serde", - "serde", - "serde_fmt", "sval", "version_check", ] @@ -3521,9 +3536,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "waker-fn" @@ -3549,21 +3564,15 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.80" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" dependencies = [ "cfg-if 1.0.0", "serde", @@ -3573,24 +3582,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.80" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" dependencies = [ "bumpalo", "lazy_static", "log", - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.30" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" +checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3600,38 +3609,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.80" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" dependencies = [ - "quote 1.0.18", + "quote 1.0.10", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.80" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" dependencies = [ - "proc-macro2 1.0.37", - "quote 1.0.18", - "syn 1.0.91", + "proc-macro2 1.0.32", + "quote 1.0.10", + "syn 1.0.81", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.80" +version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" +checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" [[package]] name = "web-sys" -version = "0.3.57" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" +checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" dependencies = [ "js-sys", "wasm-bindgen", @@ -3677,54 +3686,11 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" -dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" - -[[package]] -name = "windows_i686_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" - -[[package]] -name = "windows_i686_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" - [[package]] name = "winreg" -version = "0.10.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" dependencies = [ "winapi", ] diff --git a/Cargo.toml b/Cargo.toml index 3fafb0f5485..dd8a728ca7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,5 +13,6 @@ members = [ ] [patch.crates-io] -bitcoin_hashes = { version = "0.10.0", git = 'https://github.com/fedimint/bitcoin_hashes', branch = 'minimint' } -secp256k1 = { git = "https://github.com/fedimint/rust-secp256k1/", branch = "minimint" } \ No newline at end of file +# bitcoin_hashes = { git = 'https://github.com/rust-bitcoin/bitcoin_hashes', branch = 'master' } +bitcoin_hashes = { version = "0.10.0", git = 'https://github.com/rust-bitcoin/bitcoin_hashes', rev = 'b27002339186a836edb06a6cff8e5c133a2d5f5f' } +# bitcoin_hashes = { path = '../../code/bitcoin_hashes' } \ No newline at end of file diff --git a/ln-gateway/Cargo.toml b/ln-gateway/Cargo.toml index e37dd5d90f5..cd110029523 100644 --- a/ln-gateway/Cargo.toml +++ b/ln-gateway/Cargo.toml @@ -16,7 +16,7 @@ minimint = { path = "../minimint" } minimint-api = { path = "../minimint-api" } mint-client = { path = "../mint-client" } rand = "0.6" -secp256k1 = "0.20" +secp256k1 = "0.22" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.61" sled = "0.34.6" diff --git a/minimint-api/Cargo.toml b/minimint-api/Cargo.toml index 89cd538f691..7628747cf8a 100644 --- a/minimint-api/Cargo.toml +++ b/minimint-api/Cargo.toml @@ -8,13 +8,13 @@ edition = "2018" [dependencies] async-trait = "0.1" -bitcoin = { version = "0.27.0", features = [ "rand", "serde" ] } +bitcoin = { version = "0.28.0", features = [ "rand", "serde" ] } bitcoin_hashes = { version = "0.10", features = ["serde"] } hex = "0.4.3" http-types = "2.12.0" minimint-derive = { path = "../minimint-derive" } rand = "0.6.0" -secp256k1-zkp = { git = "https://github.com/elsirion/rust-secp256k1-zkp", branch = "minimint", features = [ "use-serde", "bitcoin_hashes", "global-context" ] } +secp256k1-zkp = { version = "0.6", features = [ "use-serde", "bitcoin_hashes", "global-context" ] } serde = { version = "1.0.118", features = [ "derive" ] } serde_json = "1.0.79" sled = "0.34" diff --git a/minimint-api/src/encoding/secp256k1.rs b/minimint-api/src/encoding/secp256k1.rs index 0278ff12f14..f70229258ff 100644 --- a/minimint-api/src/encoding/secp256k1.rs +++ b/minimint-api/src/encoding/secp256k1.rs @@ -56,7 +56,7 @@ impl Decodable for secp256k1_zkp::schnorrsig::Signature { impl Encodable for secp256k1_zkp::schnorrsig::KeyPair { fn consensus_encode(&self, writer: W) -> Result { - self.serialize_secret().consensus_encode(writer) + self.secret_bytes().consensus_encode(writer) } } @@ -91,7 +91,7 @@ mod tests { let ctx = secp256k1_zkp::global::SECP256K1; let mut rng = rand::rngs::OsRng::new().unwrap(); let sec_key = secp256k1_zkp::schnorrsig::KeyPair::new(&ctx, &mut rng); - let pub_key = secp256k1_zkp::schnorrsig::PublicKey::from_keypair(&ctx, &sec_key); + let pub_key = secp256k1_zkp::schnorrsig::PublicKey::from_keypair(&sec_key); test_roundtrip(pub_key); let sig = ctx.schnorrsig_sign( diff --git a/minimint-api/src/lib.rs b/minimint-api/src/lib.rs index 0e3fafb484b..0434f9d80d9 100644 --- a/minimint-api/src/lib.rs +++ b/minimint-api/src/lib.rs @@ -2,7 +2,7 @@ extern crate self as minimint_api; use bitcoin_hashes::sha256::Hash as Sha256; pub use bitcoin_hashes::Hash as BitcoinHash; -use bitcoin_hashes::{borrow_slice_impl, hash_newtype, hex_fmt_impl, index_impl, serde_impl}; +use bitcoin_hashes::{borrow_slice_impl, hash_newtype, hex_fmt_impl, serde_impl}; pub use module::{FederationModule, InputMeta}; use serde::{Deserialize, Serialize}; use std::io::Error; diff --git a/minimint/Cargo.toml b/minimint/Cargo.toml index 45d56d8bed7..7a45ed60e0a 100644 --- a/minimint/Cargo.toml +++ b/minimint/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [dependencies] async-trait = "0.1.42" bincode = "1.3.1" -bitcoin = "0.27.0" +bitcoin = "0.28.0" futures = "0.3.9" hbbft = { git = "https://github.com/fedimint/hbbft", branch = "minimint" } hex = "0.4.2" @@ -21,7 +21,7 @@ minimint-mint = { path = "../modules/minimint-mint" } minimint-wallet = { path = "../modules/minimint-wallet" } rand = "0.6.5" rayon = "1.5.0" -secp256k1-zkp = { git = "https://github.com/elsirion/rust-secp256k1-zkp", branch = "minimint", features = [ "global-context", "bitcoin_hashes" ] } +secp256k1-zkp = { version = "0.6", features = [ "global-context", "bitcoin_hashes" ] } serde = { version = "1.0.118", features = [ "derive" ] } serde_json = "1.0.61" sha3 = "0.9.1" diff --git a/minimint/src/transaction.rs b/minimint/src/transaction.rs index 5f2c4a6d36d..9b4df4bdef2 100644 --- a/minimint/src/transaction.rs +++ b/minimint/src/transaction.rs @@ -206,7 +206,7 @@ where let msg = msg.into(); let pub_keys = keys .iter() - .map(|key| schnorrsig::PublicKey::from_keypair(ctx, key)) + .map(|key| schnorrsig::PublicKey::from_keypair(key)) .collect::>(); let pre_session = new_pre_session(&pub_keys, ctx); diff --git a/mint-client/Cargo.toml b/mint-client/Cargo.toml index d8e39431137..886365f70ec 100644 --- a/mint-client/Cargo.toml +++ b/mint-client/Cargo.toml @@ -10,18 +10,19 @@ edition = "2018" async-trait = "0.1.52" base64 = "0.13.0" bincode = "1.3.1" -bitcoin = "0.27.0" +bitcoin = "0.28.0" bitcoin_hashes = "0.10.0" futures = "0.3.9" hex = "0.4.3" lightning-invoice = "0.14.0" lightning = "0.0.106" -miniscript = "6.0.0" +miniscript = "7.0.0" minimint = { path = "../minimint" } minimint-api = { path = "../minimint-api" } rand = "0.6.5" reqwest = { version = "0.11.0", features = [ "json" ], default-features = false } -secp256k1-zkp = { git = "https://github.com/elsirion/rust-secp256k1-zkp", branch = "minimint", features = [ "serde", "bitcoin_hashes" ] } +# secp256k1-zkp = { git = "https://github.com/elsirion/rust-secp256k1-zkp", branch = "minimint", features = [ "serde", "bitcoin_hashes" ] } +secp256k1-zkp = { version = "0.6", features = [ "serde", "bitcoin_hashes" ] } serde = { version = "1.0.118", features = [ "derive" ] } sha3 = "0.9.1" sled = "0.34.6" diff --git a/mint-client/src/mint/mod.rs b/mint-client/src/mint/mod.rs index 2b78169bf9c..5b8c8977c9e 100644 --- a/mint-client/src/mint/mod.rs +++ b/mint-client/src/mint/mod.rs @@ -125,10 +125,7 @@ impl<'c> MintClient<'c> { // We check for coin validity in case we got it from an untrusted third party. We // don't want to needlessly create invalid tx and bother the federation with them. - let spend_pub_key = secp256k1_zkp::schnorrsig::PublicKey::from_keypair( - self.context.secp, - &spend_key, - ); + let spend_pub_key = secp256k1_zkp::schnorrsig::PublicKey::from_keypair(&spend_key); if &spend_pub_key == coin.coin.spend_key() { Ok((spend_key, (amt, coin.coin))) } else { @@ -334,13 +331,13 @@ impl CoinRequest { { let spend_key = secp256k1_zkp::schnorrsig::KeyPair::new(ctx, &mut rng); let nonce = CoinNonce(secp256k1_zkp::schnorrsig::PublicKey::from_keypair( - ctx, &spend_key, + &spend_key, )); let (blinding_key, blinded_nonce) = blind_message(nonce.to_message()); let cr = CoinRequest { - spend_key: spend_key.serialize_secret(), + spend_key: spend_key.serialize_bytes(), nonce, blinding_key, }; @@ -583,7 +580,7 @@ mod tests { meta.keys, spend_keys .into_iter() - .map(|key| secp256k1_zkp::schnorrsig::PublicKey::from_keypair(&ctx, &key)) + .map(|key| secp256k1_zkp::schnorrsig::PublicKey::from_keypair(&key)) .collect::>() ); @@ -611,7 +608,7 @@ mod tests { meta.keys, spend_keys .into_iter() - .map(|key| secp256k1_zkp::schnorrsig::PublicKey::from_keypair(&ctx, &key)) + .map(|key| secp256k1_zkp::schnorrsig::PublicKey::from_keypair(&key)) .collect::>() ); diff --git a/mint-client/src/wallet/mod.rs b/mint-client/src/wallet/mod.rs index ff36481dfbb..b71d77365ae 100644 --- a/mint-client/src/wallet/mod.rs +++ b/mint-client/src/wallet/mod.rs @@ -30,8 +30,7 @@ impl<'c> WalletClient<'c> { mut rng: R, ) -> Address { let peg_in_sec_key = secp256k1_zkp::schnorrsig::KeyPair::new(self.context.secp, &mut rng); - let peg_in_pub_key = - secp256k1_zkp::schnorrsig::PublicKey::from_keypair(self.context.secp, &peg_in_sec_key); + let peg_in_pub_key = secp256k1_zkp::schnorrsig::PublicKey::from_keypair(&peg_in_sec_key); // TODO: check at startup that no bare descriptor is used in config // TODO: check if there are other failure cases @@ -81,10 +80,8 @@ impl<'c> WalletClient<'c> { &secret_tweak_key_bytes, ) .expect("sec key was generated and saved by us"); - let public_tweak_key = secp256k1_zkp::schnorrsig::PublicKey::from_keypair( - self.context.secp, - &secret_tweak_key, - ); + let public_tweak_key = + secp256k1_zkp::schnorrsig::PublicKey::from_keypair(&secret_tweak_key); let peg_in_proof = PegInProof::new( txout_proof, diff --git a/modules/minimint-ln/Cargo.toml b/modules/minimint-ln/Cargo.toml index b7dbf333fa9..1346f41f24e 100644 --- a/modules/minimint-ln/Cargo.toml +++ b/modules/minimint-ln/Cargo.toml @@ -8,13 +8,13 @@ edition = "2018" [dependencies] async-trait = "0.1" bincode = "1" -bitcoin_hashes = "0.10" +bitcoin_hashes = "0.10.0" futures = "0.3.21" itertools = "0.10.1" lightning = "0.0.106" lightning-invoice = "0.14.0" minimint-api = { path = "../../minimint-api" } -secp256k1 = "0.20" +secp256k1 = { version = "0.22", features = ["rand"] } serde = {version = "1.0.130", features = [ "derive" ] } threshold_crypto = "0.3" thiserror = "1.0.23" diff --git a/modules/minimint-ln/src/contracts/incoming.rs b/modules/minimint-ln/src/contracts/incoming.rs index cfb42658fcc..e3224386938 100644 --- a/modules/minimint-ln/src/contracts/incoming.rs +++ b/modules/minimint-ln/src/contracts/incoming.rs @@ -1,7 +1,7 @@ use crate::contracts::{ContractId, IdentifyableContract}; use bitcoin_hashes::sha256::Hash as Sha256; use bitcoin_hashes::Hash as BitcoinHash; -use bitcoin_hashes::{borrow_slice_impl, hash_newtype, hex_fmt_impl, index_impl, serde_impl}; +use bitcoin_hashes::{borrow_slice_impl, hash_newtype, hex_fmt_impl, serde_impl}; use minimint_api::encoding::{Decodable, DecodeError, Encodable}; use minimint_api::OutPoint; use serde::{Deserialize, Serialize}; diff --git a/modules/minimint-ln/src/contracts/mod.rs b/modules/minimint-ln/src/contracts/mod.rs index 44b9d544c67..1b3e28e7bcf 100644 --- a/modules/minimint-ln/src/contracts/mod.rs +++ b/modules/minimint-ln/src/contracts/mod.rs @@ -5,7 +5,7 @@ pub mod outgoing; use crate::contracts::incoming::{DecryptedPreimage, FundedIncomingContract}; use bitcoin_hashes::sha256::Hash as Sha256; use bitcoin_hashes::Hash as BitcoinHash; -use bitcoin_hashes::{borrow_slice_impl, hash_newtype, hex_fmt_impl, index_impl, serde_impl}; +use bitcoin_hashes::{borrow_slice_impl, hash_newtype, hex_fmt_impl, serde_impl}; use minimint_api::encoding::{Decodable, DecodeError, Encodable}; use minimint_api::OutPoint; use serde::{Deserialize, Serialize}; diff --git a/modules/minimint-mint/Cargo.toml b/modules/minimint-mint/Cargo.toml index 88eed13b704..dc85ad7a402 100644 --- a/modules/minimint-mint/Cargo.toml +++ b/modules/minimint-mint/Cargo.toml @@ -15,7 +15,8 @@ minimint-api = { path = "../../minimint-api" } minimint-derive = { path = "../../minimint-derive" } rand = "0.6" rayon = "1.5.0" -secp256k1-zkp = { git = "https://github.com/elsirion/rust-secp256k1-zkp", branch = "minimint", features = [ ] } +# secp256k1-zkp = { git = "https://github.com/elsirion/rust-secp256k1-zkp", branch = "minimint", features = [ ] } +secp256k1-zkp = { version = "0.6" , features = [ ] } serde = { version = "1.0.118", features = [ "derive" ] } tbs = { path = "../../crypto/tbs" } thiserror = "1.0.23" diff --git a/modules/minimint-mint/src/lib.rs b/modules/minimint-mint/src/lib.rs index 35ef963c8fe..0a9c3711129 100644 --- a/modules/minimint-mint/src/lib.rs +++ b/modules/minimint-mint/src/lib.rs @@ -414,9 +414,9 @@ impl Mint { .iter() .map(|(idx, _)| *idx) .collect::>(); - if let Some((peer, count)) = peer_contrib_counts.into_iter().find(|(_, cnt)| *cnt > 1) { + if let Some((peer, count)) = peer_contrib_counts.into_iter().find(|(_, cnt)| **cnt > 1) { return ( - Err(CombineError::MultiplePeerContributions(peer, count)), + Err(CombineError::MultiplePeerContributions(*peer, *count)), MintShareErrors(vec![]), ); } diff --git a/modules/minimint-wallet/Cargo.toml b/modules/minimint-wallet/Cargo.toml index 62645068bff..2ecd2437727 100644 --- a/modules/minimint-wallet/Cargo.toml +++ b/modules/minimint-wallet/Cargo.toml @@ -8,15 +8,15 @@ edition = "2018" [dependencies] async-trait = "0.1" -bitcoin = { version = "0.27.0", features = [ "rand", "serde", "bitcoinconsensus" ] } -bitcoincore-rpc = "0.14.0" +bitcoin = { version = "0.28.0", features = [ "rand", "serde", "bitcoinconsensus" ] } +bitcoincore-rpc = "0.15.0" hex = "0.4.3" itertools = "0.10.0" minimint-api = { path = "../../minimint-api" } minimint-derive = { path = "../../minimint-derive" } -miniscript = { version = "6.0.0", features = [ "compiler", "use-serde" ] } +miniscript = { version = "7.0.0", features = [ "compiler", "use-serde" ] } rand = "0.6.0" -secp256k1 = { version = "0.20", features = [ "serde" ] } +secp256k1 = { version = "0.22", features = [ "serde" ] } serde = { version = "1.0.118", features = [ "derive" ] } thiserror = "1.0.23" tokio = { version = "1.0.1", features = ["full"] } diff --git a/modules/minimint-wallet/src/keys.rs b/modules/minimint-wallet/src/keys.rs index beb55f594ab..6022589e654 100644 --- a/modules/minimint-wallet/src/keys.rs +++ b/modules/minimint-wallet/src/keys.rs @@ -28,16 +28,18 @@ impl MiniscriptKey for CompressedPublicKey { (*self).clone() } - fn serialized_len(&self) -> usize { - secp256k1::constants::PUBLIC_KEY_SIZE - } + // TODO: is this x-only??? + + // fn serialized_len(&self) -> usize { + // secp256k1::constants::PUBLIC_KEY_SIZE + // } } impl ToPublicKey for CompressedPublicKey { fn to_public_key(&self) -> PublicKey { PublicKey { compressed: true, - key: self.key, + inner: self.key, } } @@ -74,7 +76,7 @@ impl From for bitcoin::PublicKey { fn from(key: CompressedPublicKey) -> Self { bitcoin::PublicKey { compressed: true, - key: key.key, + inner: key.key, } } } diff --git a/modules/minimint-wallet/src/lib.rs b/modules/minimint-wallet/src/lib.rs index c6c390cf8e5..1a45d7354c9 100644 --- a/modules/minimint-wallet/src/lib.rs +++ b/modules/minimint-wallet/src/lib.rs @@ -18,9 +18,10 @@ use bitcoin::hashes::{sha256, Hash as BitcoinHash, HashEngine, Hmac, HmacEngine} use bitcoin::secp256k1::{All, Secp256k1}; use bitcoin::util::bip143::SigHashCache; use bitcoin::util::psbt::raw::ProprietaryKey; -use bitcoin::util::psbt::{Global, Input, PartiallySignedTransaction}; +use bitcoin::util::psbt::{Input, PartiallySignedTransaction}; use bitcoin::{ - Address, AddressType, BlockHash, Network, Script, SigHashType, Transaction, TxIn, TxOut, Txid, + Address, AddressType, BlockHash, EcdsaSig, Network, Script, SigHashType, Transaction, TxIn, + TxOut, Txid, }; use bitcoincore_rpc::Auth; use itertools::Itertools; @@ -32,6 +33,7 @@ use minimint_api::module::interconnect::ModuleInterconect; use minimint_api::module::ApiEndpoint; use minimint_api::{FederationModule, InputMeta, OutPoint, PeerId}; use minimint_derive::UnzipConsensus; +use miniscript::psbt::PsbtExt; use miniscript::{Descriptor, DescriptorTrait, TranslatePk2}; use rand::{CryptoRng, Rng, RngCore}; use secp256k1::Message; @@ -372,7 +374,7 @@ impl FederationModule for Wallet { let mut psbt = self .create_peg_out_tx(pending_peg_outs, round_consensus) .await; - let txid = psbt.global.unsigned_tx.txid(); + let txid = psbt.unsigned_tx.txid(); info!( "Signing peg out tx {} containing {} peg outs", @@ -397,17 +399,17 @@ impl FederationModule for Wallet { .next() .expect("asserted previously"); + // FIXME: can I drop this? // We drop SIGHASH_ALL, because we always use that and it is only present in the // PSBT for compatibility with other tools. - secp256k1::Signature::from_der(&sig[..sig.len() - 1]) - .expect("we serialized it ourselves that way") + // secp256k1::Signature::from_der(&sig[..sig.len() - 1]) + // .expect("we serialized it ourselves that way") }) .collect::>(); // Delete used UTXOs batch.append_from_iter( - psbt.global - .unsigned_tx + psbt.unsigned_tx .input .iter() .map(|input| BatchItem::delete(UTXOKey(input.previous_output))), @@ -420,7 +422,7 @@ impl FederationModule for Wallet { .map(|peg_out| BatchItem::delete(PendingPegOutKey(peg_out))), ); - batch.append_insert_new(UnsignedTransactionKey(psbt.global.unsigned_tx.txid()), psbt); + batch.append_insert_new(UnsignedTransactionKey(psbt.unsigned_tx.txid()), psbt); batch.append_insert_new(PegOutTxSignatureCI(txid), sigs); } batch.commit(); @@ -531,7 +533,7 @@ impl Wallet { )); } - let mut tx_hasher = SigHashCache::new(&psbt.global.unsigned_tx); + let mut tx_hasher = SigHashCache::new(&psbt.unsigned_tx); for (idx, (input, signature)) in psbt .inputs .iter_mut() @@ -562,12 +564,7 @@ impl Wallet { ) .map_err(|_| ProcessPegOutSigError::InvalidSignature)?; - let psbt_sig = signature - .serialize_der() - .iter() - .copied() - .chain(std::iter::once(SigHashType::All.as_u32() as u8)) - .collect(); + let psbt_sig = EcdsaSig::sighash_all(*signature); if input .partial_sigs @@ -603,7 +600,7 @@ impl Wallet { } } - let tx = match miniscript::psbt::extract(&psbt, &self.secp) { + let tx = match psbt.extract(&self.secp) { Ok(tx) => tx, Err(e) => { // FIXME: this should never happen AFAIK, but I'd like to avoid DOS bugs for now @@ -924,7 +921,7 @@ impl<'a> StatelessWallet<'a> { previous_output: utxo_key.0, script_sig: Default::default(), sequence: 0xFFFFFFFF, - witness: vec![], + witness: Default::default(), }) .collect(), output: outputs @@ -940,13 +937,11 @@ impl<'a> StatelessWallet<'a> { // FIXME: use custom data structure that guarantees more invariants and only convert to PSBT for finalization let psbt = PartiallySignedTransaction { - global: Global { - unsigned_tx: transaction, - version: 0, - xpub: Default::default(), - proprietary: Default::default(), - unknown: Default::default(), - }, + unsigned_tx: transaction, + version: 0, + xpub: Default::default(), + proprietary: Default::default(), + unknown: Default::default(), inputs: selected_utxos .into_iter() .map(|(_utxo_key, utxo)| { @@ -964,7 +959,10 @@ impl<'a> StatelessWallet<'a> { sighash_type: None, redeem_script: None, witness_script: Some( - self.descriptor.tweak(&utxo.tweak, self.secp).script_code(), + self.descriptor + .tweak(&utxo.tweak, self.secp) + .script_code() + .expect("Could not get script code"), ), bip32_derivation: Default::default(), final_script_sig: None, @@ -977,6 +975,7 @@ impl<'a> StatelessWallet<'a> { .into_iter() .collect(), unknown: Default::default(), + ..Default::default() } }) .collect(), @@ -996,12 +995,12 @@ impl<'a> StatelessWallet<'a> { } fn sign_psbt(&self, psbt: &mut PartiallySignedTransaction) { - let mut tx_hasher = SigHashCache::new(&psbt.global.unsigned_tx); + let mut tx_hasher = SigHashCache::new(&psbt.unsigned_tx); for (idx, (psbt_input, _tx_input)) in psbt .inputs .iter_mut() - .zip(psbt.global.unsigned_tx.input.iter()) + .zip(psbt.unsigned_tx.input.iter()) .enumerate() { let tweaked_secret = { @@ -1039,19 +1038,16 @@ impl<'a> StatelessWallet<'a> { SigHashType::All, ); - let mut signature = self + let signature = self .secp - .sign(&Message::from_slice(&tx_hash[..]).unwrap(), &tweaked_secret) - .serialize_der() - .to_vec(); - signature.push(SigHashType::All.as_u32() as u8); + .sign(&Message::from_slice(&tx_hash[..]).unwrap(), &tweaked_secret); psbt_input.partial_sigs.insert( bitcoin::PublicKey { compressed: true, - key: secp256k1::PublicKey::from_secret_key(self.secp, &tweaked_secret), + inner: secp256k1::PublicKey::from_secret_key(self.secp, &tweaked_secret), }, - signature, + EcdsaSig::sighash_all(signature), ); } } @@ -1202,6 +1198,7 @@ mod tests { use bitcoin::{Address, Amount, OutPoint, TxOut}; use miniscript::descriptor::Wsh; use miniscript::policy::Concrete; + use miniscript::psbt::PsbtExt; use miniscript::{Descriptor, DescriptorTrait, Segwitv0}; use crate::db::UTXOKey; @@ -1263,7 +1260,7 @@ mod tests { ); wallet.sign_psbt(&mut psbt); miniscript::psbt::finalize(&mut psbt, &ctx).unwrap(); - let tx = miniscript::psbt::extract(&psbt, &ctx).unwrap(); + let tx = psbt.extract(&ctx).unwrap(); tx.verify(|_| { Some(TxOut { diff --git a/modules/minimint-wallet/src/txoproof.rs b/modules/minimint-wallet/src/txoproof.rs index 7ecb6b3d03c..70faeb1097f 100644 --- a/modules/minimint-wallet/src/txoproof.rs +++ b/modules/minimint-wallet/src/txoproof.rs @@ -23,7 +23,7 @@ pub struct PegInProof { transaction: Transaction, // Check that the idx is in range output_idx: u32, - tweak_contract_key: secp256k1::schnorrsig::PublicKey, + tweak_contract_key: secp256k1::XOnlyPublicKey, } #[derive(Clone, Debug)]