From 71093a1113af537745c5d338ec8ccc164c7547cc Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Sat, 3 Jun 2023 15:41:49 -0700 Subject: [PATCH] try to update ... bitcoinconsensus breaks hardware build --- sphinx-key/Cargo.lock | 79 ++++++++++++++++------------------- sphinx-key/src/core/events.rs | 40 ++++++++++-------- 2 files changed, 59 insertions(+), 60 deletions(-) diff --git a/sphinx-key/Cargo.lock b/sphinx-key/Cargo.lock index 5022981..9822b7c 100644 --- a/sphinx-key/Cargo.lock +++ b/sphinx-key/Cargo.lock @@ -181,8 +181,7 @@ checksum = "0694ea59225b0c5f3cb405ff3f670e4828358ed26aec49dc352f730f0cb1a8a3" dependencies = [ "bech32", "bitcoin_hashes", - "core2", - "hashbrown 0.8.2", + "bitcoinconsensus", "secp256k1", "serde", ] @@ -193,10 +192,19 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" dependencies = [ - "core2", "serde", ] +[[package]] +name = "bitcoinconsensus" +version = "0.20.2-0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54505558b77e0aa21b2491a7b39cbae9db22ac8b1bc543ef4600edb762306f9c" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -206,7 +214,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bolt-derive" version = "0.1.0" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e13c8cd994b310f598c0b2902741d89ad5472382#e13c8cd994b310f598c0b2902741d89ad5472382" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=0c8c4474af62c4a13e2a32d34b569e8092ed414a#0c8c4474af62c4a13e2a32d34b569e8092ed414a" dependencies = [ "proc-macro2", "quote", @@ -418,15 +426,6 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" -[[package]] -name = "core2" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239fa3ae9b63c2dc74bd3fa852d4792b8b305ae64eeede946265b6af62f1fff3" -dependencies = [ - "memchr", -] - [[package]] name = "cpufeatures" version = "0.2.6" @@ -1267,17 +1266,20 @@ dependencies = [ [[package]] name = "lightning" -version = "0.0.114" -source = "git+https://github.com/lightningdevkit/rust-lightning.git?rev=a7600dcd584db0c46fdcd99d71d5b271f3052892#a7600dcd584db0c46fdcd99d71d5b271f3052892" +version = "0.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e009e1c0c21f66378b491bb40f548682138c63e09db6f3a05af59f8804bb9f4a" dependencies = [ "bitcoin", - "musig2", + "hex", + "regex", ] [[package]] name = "lightning-invoice" -version = "0.22.0" -source = "git+https://github.com/lightningdevkit/rust-lightning.git?rev=a7600dcd584db0c46fdcd99d71d5b271f3052892#a7600dcd584db0c46fdcd99d71d5b271f3052892" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4e44b0e2822c8811470137d2339fdfe67a699b3248bb1606d1d02eb6a1e9f0a" dependencies = [ "bech32", "bitcoin", @@ -1324,7 +1326,7 @@ dependencies = [ [[package]] name = "lss-connector" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git#56d64d2341880063c3668d616548bc8f4abc0b74" +source = "git+https://github.com/stakwork/sphinx-rs.git#e128e6cc4a7d8b2ac8bab60f7d5c76adfd6d2db1" dependencies = [ "anyhow", "log", @@ -1332,6 +1334,7 @@ dependencies = [ "secp256k1", "serde", "serde-big-array", + "sphinx-glyph", "vls-protocol-signer", ] @@ -1368,14 +1371,6 @@ dependencies = [ "adler", ] -[[package]] -name = "musig2" -version = "0.1.0" -source = "git+https://github.com/arik-so/rust-musig2?rev=27797d7#27797d78cf64e8974e38d7f31ebb11e455015a9e" -dependencies = [ - "bitcoin", -] - [[package]] name = "nb" version = "0.1.3" @@ -1983,7 +1978,7 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs.git#56d64d2341880063c3668d616548bc8f4abc0b74" +source = "git+https://github.com/stakwork/sphinx-rs.git#e128e6cc4a7d8b2ac8bab60f7d5c76adfd6d2db1" dependencies = [ "anyhow", "base64", @@ -1995,7 +1990,7 @@ dependencies = [ [[package]] name = "sphinx-crypter" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git#56d64d2341880063c3668d616548bc8f4abc0b74" +source = "git+https://github.com/stakwork/sphinx-rs.git#e128e6cc4a7d8b2ac8bab60f7d5c76adfd6d2db1" dependencies = [ "anyhow", "chacha20poly1305", @@ -2006,7 +2001,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs.git#56d64d2341880063c3668d616548bc8f4abc0b74" +source = "git+https://github.com/stakwork/sphinx-rs.git#e128e6cc4a7d8b2ac8bab60f7d5c76adfd6d2db1" dependencies = [ "anyhow", "hex", @@ -2043,7 +2038,7 @@ dependencies = [ [[package]] name = "sphinx-signer" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git#56d64d2341880063c3668d616548bc8f4abc0b74" +source = "git+https://github.com/stakwork/sphinx-rs.git#e128e6cc4a7d8b2ac8bab60f7d5c76adfd6d2db1" dependencies = [ "anyhow", "bip39", @@ -2288,12 +2283,11 @@ dependencies = [ [[package]] name = "txoo" -version = "0.3.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04d0beccb482c6106605c4eaf4d4bc4ece62b431f148a3f7c0d53a28c0aed6e7" +checksum = "0d8d7e67ea44d2f4df67df6c91e4c2d4e199b4f4950074ccc5cb141a3be60e01" dependencies = [ "bitcoin", - "core2", "log", "serde", ] @@ -2403,10 +2397,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vls-core" -version = "0.2.1" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e13c8cd994b310f598c0b2902741d89ad5472382#e13c8cd994b310f598c0b2902741d89ad5472382" +version = "0.9.0" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=0c8c4474af62c4a13e2a32d34b569e8092ed414a#0c8c4474af62c4a13e2a32d34b569e8092ed414a" dependencies = [ "anyhow", + "backtrace", "bitcoin", "bolt-derive", "hashbrown 0.8.2", @@ -2425,8 +2420,8 @@ dependencies = [ [[package]] name = "vls-persist" -version = "0.2.0" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e13c8cd994b310f598c0b2902741d89ad5472382#e13c8cd994b310f598c0b2902741d89ad5472382" +version = "0.9.0" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=0c8c4474af62c4a13e2a32d34b569e8092ed414a#0c8c4474af62c4a13e2a32d34b569e8092ed414a" dependencies = [ "hex", "log", @@ -2438,8 +2433,8 @@ dependencies = [ [[package]] name = "vls-protocol" -version = "0.2.0" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e13c8cd994b310f598c0b2902741d89ad5472382#e13c8cd994b310f598c0b2902741d89ad5472382" +version = "0.9.0" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=0c8c4474af62c4a13e2a32d34b569e8092ed414a#0c8c4474af62c4a13e2a32d34b569e8092ed414a" dependencies = [ "as-any", "bolt-derive", @@ -2452,8 +2447,8 @@ dependencies = [ [[package]] name = "vls-protocol-signer" -version = "0.2.0" -source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e13c8cd994b310f598c0b2902741d89ad5472382#e13c8cd994b310f598c0b2902741d89ad5472382" +version = "0.9.0" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=0c8c4474af62c4a13e2a32d34b569e8092ed414a#0c8c4474af62c4a13e2a32d34b569e8092ed414a" dependencies = [ "bit-vec", "log", diff --git a/sphinx-key/src/core/events.rs b/sphinx-key/src/core/events.rs index 695b89a..21e99a1 100644 --- a/sphinx-key/src/core/events.rs +++ b/sphinx-key/src/core/events.rs @@ -95,11 +95,11 @@ pub fn make_event_loop( let persister: Arc = Arc::new(FsPersister::new(&ROOT_STORE, Some(8))); // initialize the RootHandler - let hb = sphinx_signer::root::builder(seed, network, policy, persister) + let rhb = sphinx_signer::root::builder(seed, network, policy, persister) .expect("failed to init signer"); // FIXME it right to restart here? - let (root_handler, lss_signer) = match lss::init_lss(client_id, &rx, hb, &mut mqtt) { + let (root_handler, lss_signer) = match lss::init_lss(client_id, &rx, rhb, &mut mqtt) { Ok(rl) => rl, Err(e) => { log::error!("failed to init lss {:?}", e); @@ -125,22 +125,26 @@ pub fn make_event_loop( } Event::VlsMessage(ref msg_bytes) => { led_tx.send(Status::Signing).unwrap(); - let _ret = - match sphinx_signer::root::handle(&root_handler, msg_bytes.clone(), do_log) { - Ok(b) => { - let vls_return_topic = format!("{}/{}", client_id, topics::VLS_RETURN); - mqtt.publish(&vls_return_topic, QOS, false, &b) - .expect("could not publish VLS response"); - } - Err(e) => { - let err_msg = GlyphError::new(1, &e.to_string()); - log::error!("HANDLE FAILED {:?}", e); - let error_topic = format!("{}/{}", client_id, topics::ERROR); - mqtt.publish(&error_topic, QOS, false, &err_msg.to_vec()[..]) - .expect("could not publish VLS error"); - // panic!("HANDLE FAILED {:?}", e); - } - }; + let _ret = match sphinx_signer::root::handle_with_lss( + &root_handler, + &lss_signer, + msg_bytes.clone(), + do_log, + ) { + Ok((b, _)) => { + let vls_return_topic = format!("{}/{}", client_id, topics::VLS_RETURN); + mqtt.publish(&vls_return_topic, QOS, false, &b) + .expect("could not publish VLS response"); + } + Err(e) => { + let err_msg = GlyphError::new(1, &e.to_string()); + log::error!("HANDLE FAILED {:?}", e); + let error_topic = format!("{}/{}", client_id, topics::ERROR); + mqtt.publish(&error_topic, QOS, false, &err_msg.to_vec()[..]) + .expect("could not publish VLS error"); + // panic!("HANDLE FAILED {:?}", e); + } + }; } Event::LssMessage(ref msg_bytes) => { //