From 758d240fe298f1a9ee5f68e0fb97cda53bea7c69 Mon Sep 17 00:00:00 2001 From: ok300 <106775972+ok300@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:22:38 +0200 Subject: [PATCH] Bump Greenlight dependency --- libs/Cargo.lock | 104 ++++++++++++++++++++++++++++----------- libs/sdk-core/Cargo.toml | 2 +- tools/sdk-cli/Cargo.lock | 102 ++++++++++++++++++++++++++++---------- 3 files changed, 152 insertions(+), 56 deletions(-) diff --git a/libs/Cargo.lock b/libs/Cargo.lock index d2d1f7035..79ab47731 100644 --- a/libs/Cargo.lock +++ b/libs/Cargo.lock @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" dependencies = [ "backtrace", ] @@ -374,7 +374,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1998475af29ccfb7c761bb624a16e501fc321510366012bc9cce267bc134aedc" dependencies = [ - "bitcoin", + "bitcoin 0.29.2", "percent-encoding-rfc3986", ] @@ -391,12 +391,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0694ea59225b0c5f3cb405ff3f670e4828358ed26aec49dc352f730f0cb1a8a3" dependencies = [ "bech32", - "bitcoin_hashes", + "bitcoin_hashes 0.11.0", "bitcoinconsensus", "secp256k1 0.24.3", "serde", ] +[[package]] +name = "bitcoin" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e99ff7289b20a7385f66a0feda78af2fc119d28fb56aea8886a9cd0a4abdd75" +dependencies = [ + "bech32", + "bitcoin-private", + "bitcoin_hashes 0.12.0", + "hex_lit", + "secp256k1 0.27.0", + "serde", +] + [[package]] name = "bitcoin-consensus-derive" version = "0.1.0" @@ -408,13 +422,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "bitcoin-private" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57" + [[package]] name = "bitcoin-push-decoder" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d533f86c679e4388a80f0c11524ae690dc1850315007757dced23ecd53526bbe" dependencies = [ - "bitcoin", + "bitcoin 0.29.2", "log", ] @@ -427,6 +447,16 @@ dependencies = [ "serde", ] +[[package]] +name = "bitcoin_hashes" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501" +dependencies = [ + "bitcoin-private", + "serde", +] + [[package]] name = "bitcoinconsensus" version = "0.20.2-0.5.0" @@ -494,7 +524,7 @@ dependencies = [ "anyhow", "base64 0.13.1", "bip21", - "bitcoin", + "bitcoin 0.29.2", "cbc", "chrono", "const_format", @@ -542,7 +572,7 @@ dependencies = [ "breez-sdk-core", "camino", "flutter_rust_bridge", - "lightning-invoice 0.23.0", + "lightning-invoice 0.24.0", "log", "once_cell", "thiserror", @@ -725,11 +755,12 @@ dependencies = [ [[package]] name = "cln-grpc" -version = "0.1.4" -source = "git+https://github.com/ElementsProject/lightning.git?branch=master#e3b1549b6472af88ff0e2b6598203dbd24580759" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57af6eff15ee3fd7a0e09d0baeab8d33c892a73d97b87248e5f94f4749eacfe1" dependencies = [ "anyhow", - "bitcoin", + "bitcoin 0.30.1", "hex", "log", "prost", @@ -1269,13 +1300,13 @@ checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "gl-client" version = "0.1.9" -source = "git+https://github.com/Blockstream/greenlight.git?rev=0178ab2b848ac8998865ee1d75a5974858a1bc69#0178ab2b848ac8998865ee1d75a5974858a1bc69" +source = "git+https://github.com/Blockstream/greenlight.git?rev=f91390734fc8a3044812f05ff8d0e102660189bb#f91390734fc8a3044812f05ff8d0e102660189bb" dependencies = [ "anyhow", "async-trait", "base64 0.21.2", "bech32", - "bitcoin", + "bitcoin 0.29.2", "bytes", "chacha20poly1305", "cln-grpc", @@ -1421,6 +1452,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hex_lit" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" + [[package]] name = "hkdf" version = "0.12.3" @@ -1791,7 +1828,7 @@ version = "0.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e009e1c0c21f66378b491bb40f548682138c63e09db6f3a05af59f8804bb9f4a" dependencies = [ - "bitcoin", + "bitcoin 0.29.2", "hex", "regex", ] @@ -1802,7 +1839,7 @@ version = "0.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90a0f2155316f1570446a0447c993480673f840748c8ed25bbc59dfc442ac770" dependencies = [ - "bitcoin", + "bitcoin 0.29.2", ] [[package]] @@ -1812,8 +1849,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4e44b0e2822c8811470137d2339fdfe67a699b3248bb1606d1d02eb6a1e9f0a" dependencies = [ "bech32", - "bitcoin", - "bitcoin_hashes", + "bitcoin 0.29.2", + "bitcoin_hashes 0.11.0", "lightning 0.0.115", "num-traits", "secp256k1 0.24.3", @@ -1826,8 +1863,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788c0158526ec27a502043c2911ea6ea58fdc656bdf8749484942c07b790d23" dependencies = [ "bech32", - "bitcoin", - "bitcoin_hashes", + "bitcoin 0.29.2", + "bitcoin_hashes 0.11.0", "lightning 0.0.116", "num-traits", "secp256k1 0.24.3", @@ -2211,18 +2248,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", @@ -2670,9 +2707,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ "base64 0.21.2", ] @@ -2750,7 +2787,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" dependencies = [ - "bitcoin_hashes", + "bitcoin_hashes 0.11.0", "rand", "secp256k1-sys 0.6.1", "serde", @@ -2765,6 +2802,17 @@ dependencies = [ "secp256k1-sys 0.8.1", ] +[[package]] +name = "secp256k1" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" +dependencies = [ + "bitcoin_hashes 0.12.0", + "secp256k1-sys 0.8.1", + "serde", +] + [[package]] name = "secp256k1-sys" version = "0.6.1" @@ -2841,7 +2889,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3ddb862d94a73280b5b6faa3c9bc37db242f6a495d49f0ffb85f040dbb9bca" dependencies = [ - "bitcoin", + "bitcoin 0.29.2", "bitcoin-consensus-derive", "hex", ] @@ -3480,7 +3528,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b35482e5bf458fa43996535afbca884b2562ab6419e20686340bb19f5305b30" dependencies = [ - "bitcoin", + "bitcoin 0.29.2", "log", "serde", ] @@ -3718,7 +3766,7 @@ source = "git+https://gitlab.com/cdecker/vls?tag=snapshot-20230920#b8d42d68bb3a5 dependencies = [ "anyhow", "backtrace", - "bitcoin", + "bitcoin 0.29.2", "bitcoin-consensus-derive", "bitcoin-push-decoder", "bolt-derive", diff --git a/libs/sdk-core/Cargo.toml b/libs/sdk-core/Cargo.toml index b1c8e3c75..657a512af 100644 --- a/libs/sdk-core/Cargo.toml +++ b/libs/sdk-core/Cargo.toml @@ -18,7 +18,7 @@ bip21 = "0.2" bitcoin = "0.29.2" gl-client = { git = "https://github.com/Blockstream/greenlight.git", features = [ "permissive", -], rev = "0178ab2b848ac8998865ee1d75a5974858a1bc69" } +], rev = "f91390734fc8a3044812f05ff8d0e102660189bb" } zbase32 = "0.1.2" base64 = "0.13.0" chrono = "0.4" diff --git a/tools/sdk-cli/Cargo.lock b/tools/sdk-cli/Cargo.lock index ad19802b2..ed7060d31 100644 --- a/tools/sdk-cli/Cargo.lock +++ b/tools/sdk-cli/Cargo.lock @@ -154,9 +154,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" dependencies = [ "backtrace", ] @@ -352,7 +352,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1998475af29ccfb7c761bb624a16e501fc321510366012bc9cce267bc134aedc" dependencies = [ - "bitcoin", + "bitcoin 0.29.2", "percent-encoding-rfc3986", ] @@ -369,12 +369,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0694ea59225b0c5f3cb405ff3f670e4828358ed26aec49dc352f730f0cb1a8a3" dependencies = [ "bech32", - "bitcoin_hashes", + "bitcoin_hashes 0.11.0", "bitcoinconsensus", "secp256k1 0.24.3", "serde", ] +[[package]] +name = "bitcoin" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e99ff7289b20a7385f66a0feda78af2fc119d28fb56aea8886a9cd0a4abdd75" +dependencies = [ + "bech32", + "bitcoin-private", + "bitcoin_hashes 0.12.0", + "hex_lit", + "secp256k1 0.27.0", + "serde", +] + [[package]] name = "bitcoin-consensus-derive" version = "0.1.0" @@ -386,13 +400,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "bitcoin-private" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57" + [[package]] name = "bitcoin-push-decoder" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d533f86c679e4388a80f0c11524ae690dc1850315007757dced23ecd53526bbe" dependencies = [ - "bitcoin", + "bitcoin 0.29.2", "log", ] @@ -405,6 +425,16 @@ dependencies = [ "serde", ] +[[package]] +name = "bitcoin_hashes" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501" +dependencies = [ + "bitcoin-private", + "serde", +] + [[package]] name = "bitcoinconsensus" version = "0.20.2-0.5.0" @@ -489,7 +519,7 @@ dependencies = [ "anyhow", "base64 0.13.1", "bip21", - "bitcoin", + "bitcoin 0.29.2", "cbc", "chrono", "const_format", @@ -677,11 +707,12 @@ dependencies = [ [[package]] name = "cln-grpc" -version = "0.1.4" -source = "git+https://github.com/ElementsProject/lightning.git?branch=master#a1e8c1c10295d2bba907cb4e9d4bd07cc71149ca" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57af6eff15ee3fd7a0e09d0baeab8d33c892a73d97b87248e5f94f4749eacfe1" dependencies = [ "anyhow", - "bitcoin", + "bitcoin 0.30.1", "hex", "log", "prost", @@ -1237,13 +1268,13 @@ checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "gl-client" version = "0.1.9" -source = "git+https://github.com/Blockstream/greenlight.git?rev=0178ab2b848ac8998865ee1d75a5974858a1bc69#0178ab2b848ac8998865ee1d75a5974858a1bc69" +source = "git+https://github.com/Blockstream/greenlight.git?rev=f91390734fc8a3044812f05ff8d0e102660189bb#f91390734fc8a3044812f05ff8d0e102660189bb" dependencies = [ "anyhow", "async-trait", "base64 0.21.2", "bech32", - "bitcoin", + "bitcoin 0.29.2", "bytes", "chacha20poly1305", "cln-grpc", @@ -1377,6 +1408,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hex_lit" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" + [[package]] name = "hkdf" version = "0.12.3" @@ -1738,7 +1775,7 @@ version = "0.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e009e1c0c21f66378b491bb40f548682138c63e09db6f3a05af59f8804bb9f4a" dependencies = [ - "bitcoin", + "bitcoin 0.29.2", "hex", "regex", ] @@ -1749,7 +1786,7 @@ version = "0.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90a0f2155316f1570446a0447c993480673f840748c8ed25bbc59dfc442ac770" dependencies = [ - "bitcoin", + "bitcoin 0.29.2", ] [[package]] @@ -1759,8 +1796,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4e44b0e2822c8811470137d2339fdfe67a699b3248bb1606d1d02eb6a1e9f0a" dependencies = [ "bech32", - "bitcoin", - "bitcoin_hashes", + "bitcoin 0.29.2", + "bitcoin_hashes 0.11.0", "lightning 0.0.115", "num-traits", "secp256k1 0.24.3", @@ -1773,8 +1810,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788c0158526ec27a502043c2911ea6ea58fdc656bdf8749484942c07b790d23" dependencies = [ "bech32", - "bitcoin", - "bitcoin_hashes", + "bitcoin 0.29.2", + "bitcoin_hashes 0.11.0", "lightning 0.0.116", "num-traits", "secp256k1 0.24.3", @@ -2131,18 +2168,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", @@ -2572,9 +2609,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ "base64 0.21.2", ] @@ -2667,7 +2704,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" dependencies = [ - "bitcoin_hashes", + "bitcoin_hashes 0.11.0", "rand", "secp256k1-sys 0.6.1", "serde", @@ -2682,6 +2719,17 @@ dependencies = [ "secp256k1-sys 0.8.1", ] +[[package]] +name = "secp256k1" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" +dependencies = [ + "bitcoin_hashes 0.12.0", + "secp256k1-sys 0.8.1", + "serde", +] + [[package]] name = "secp256k1-sys" version = "0.6.1" @@ -2749,7 +2797,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3ddb862d94a73280b5b6faa3c9bc37db242f6a495d49f0ffb85f040dbb9bca" dependencies = [ - "bitcoin", + "bitcoin 0.29.2", "bitcoin-consensus-derive", "hex", ] @@ -3360,7 +3408,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b35482e5bf458fa43996535afbca884b2562ab6419e20686340bb19f5305b30" dependencies = [ - "bitcoin", + "bitcoin 0.29.2", "log", "serde", ] @@ -3471,7 +3519,7 @@ source = "git+https://gitlab.com/cdecker/vls?tag=snapshot-20230920#b8d42d68bb3a5 dependencies = [ "anyhow", "backtrace", - "bitcoin", + "bitcoin 0.29.2", "bitcoin-consensus-derive", "bitcoin-push-decoder", "bolt-derive",