From c7f44bb8569cc19b603c9879cc239ede309ff26b Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 15 Sep 2023 12:05:47 -0700 Subject: [PATCH] multisigner broker --- broker/Cargo.lock | 42 ++++++++++++++++++++++++++---------------- broker/Cargo.toml | 12 ++++++------ broker/src/lss.rs | 2 +- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/broker/Cargo.lock b/broker/Cargo.lock index 435bdaa..272ae82 100644 --- a/broker/Cargo.lock +++ b/broker/Cargo.lock @@ -442,7 +442,7 @@ dependencies = [ [[package]] name = "bolt-derive" version = "0.2.0" -source = "git+https://gitlab.com/irriden/validating-lightning-signer.git?rev=ce04684b312c95fa7a62329ff198092a50e9a088#ce04684b312c95fa7a62329ff198092a50e9a088" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=66b77ac71363ac3ea4504d4fce3f4813a52acd84#66b77ac71363ac3ea4504d4fce3f4813a52acd84" dependencies = [ "proc-macro2", "quote", @@ -1058,8 +1058,8 @@ dependencies = [ [[package]] name = "fsdb" -version = "0.1.17" -source = "git+https://github.com/Evanfeenstra/fsdb.git?rev=634125776c14be45ab0618f2fa2b7f1aff4adb85#634125776c14be45ab0618f2fa2b7f1aff4adb85" +version = "0.1.18" +source = "git+https://github.com/Evanfeenstra/fsdb.git?rev=7d0db454133bf37b16d9cf5500111491e67c81e5#7d0db454133bf37b16d9cf5500111491e67c81e5" dependencies = [ "rmp-serde", "serde", @@ -1606,7 +1606,7 @@ dependencies = [ [[package]] name = "lightning-storage-server" version = "0.3.0" -source = "git+https://gitlab.com/irriden/validating-lightning-signer.git?rev=ce04684b312c95fa7a62329ff198092a50e9a088#ce04684b312c95fa7a62329ff198092a50e9a088" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=66b77ac71363ac3ea4504d4fce3f4813a52acd84#66b77ac71363ac3ea4504d4fce3f4813a52acd84" dependencies = [ "anyhow", "async-trait", @@ -1691,7 +1691,7 @@ dependencies = [ [[package]] name = "lss-connector" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=af50ee91e3600b7b4862e8f00772601c8a342110#af50ee91e3600b7b4862e8f00772601c8a342110" +source = "git+https://github.com/stakwork/sphinx-rs?rev=4f3485a687f6e518282c981d9ecf0adfca38e947#4f3485a687f6e518282c981d9ecf0adfca38e947" dependencies = [ "anyhow", "lightning-storage-server", @@ -2693,7 +2693,7 @@ dependencies = [ [[package]] name = "rmp-utils" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=af50ee91e3600b7b4862e8f00772601c8a342110#af50ee91e3600b7b4862e8f00772601c8a342110" +source = "git+https://github.com/stakwork/sphinx-rs?rev=4f3485a687f6e518282c981d9ecf0adfca38e947#4f3485a687f6e518282c981d9ecf0adfca38e947" dependencies = [ "anyhow", "log", @@ -3268,7 +3268,7 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs?rev=af50ee91e3600b7b4862e8f00772601c8a342110#af50ee91e3600b7b4862e8f00772601c8a342110" +source = "git+https://github.com/stakwork/sphinx-rs?rev=4f3485a687f6e518282c981d9ecf0adfca38e947#4f3485a687f6e518282c981d9ecf0adfca38e947" dependencies = [ "anyhow", "base64 0.21.2", @@ -3280,7 +3280,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs?rev=af50ee91e3600b7b4862e8f00772601c8a342110#af50ee91e3600b7b4862e8f00772601c8a342110" +source = "git+https://github.com/stakwork/sphinx-rs?rev=4f3485a687f6e518282c981d9ecf0adfca38e947#4f3485a687f6e518282c981d9ecf0adfca38e947" dependencies = [ "anyhow", "hex", @@ -3326,7 +3326,7 @@ dependencies = [ [[package]] name = "sphinx-signer" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=af50ee91e3600b7b4862e8f00772601c8a342110#af50ee91e3600b7b4862e8f00772601c8a342110" +source = "git+https://github.com/stakwork/sphinx-rs?rev=4f3485a687f6e518282c981d9ecf0adfca38e947#4f3485a687f6e518282c981d9ecf0adfca38e947" dependencies = [ "anyhow", "bip39", @@ -4006,6 +4006,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", +] + [[package]] name = "valuable" version = "0.1.0" @@ -4021,7 +4030,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vls-core" version = "0.10.0" -source = "git+https://gitlab.com/irriden/validating-lightning-signer.git?rev=ce04684b312c95fa7a62329ff198092a50e9a088#ce04684b312c95fa7a62329ff198092a50e9a088" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=66b77ac71363ac3ea4504d4fce3f4813a52acd84#66b77ac71363ac3ea4504d4fce3f4813a52acd84" dependencies = [ "anyhow", "backtrace", @@ -4047,7 +4056,7 @@ dependencies = [ [[package]] name = "vls-frontend" version = "0.10.0" -source = "git+https://gitlab.com/irriden/validating-lightning-signer.git?rev=ce04684b312c95fa7a62329ff198092a50e9a088#ce04684b312c95fa7a62329ff198092a50e9a088" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=66b77ac71363ac3ea4504d4fce3f4813a52acd84#66b77ac71363ac3ea4504d4fce3f4813a52acd84" dependencies = [ "async-trait", "lightning-storage-server", @@ -4061,7 +4070,7 @@ dependencies = [ [[package]] name = "vls-persist" version = "0.10.0" -source = "git+https://gitlab.com/irriden/validating-lightning-signer.git?rev=ce04684b312c95fa7a62329ff198092a50e9a088#ce04684b312c95fa7a62329ff198092a50e9a088" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=66b77ac71363ac3ea4504d4fce3f4813a52acd84#66b77ac71363ac3ea4504d4fce3f4813a52acd84" dependencies = [ "hex", "log", @@ -4069,13 +4078,14 @@ dependencies = [ "serde", "serde_json", "serde_with", + "uuid", "vls-core", ] [[package]] name = "vls-protocol" version = "0.10.0" -source = "git+https://gitlab.com/irriden/validating-lightning-signer.git?rev=ce04684b312c95fa7a62329ff198092a50e9a088#ce04684b312c95fa7a62329ff198092a50e9a088" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=66b77ac71363ac3ea4504d4fce3f4813a52acd84#66b77ac71363ac3ea4504d4fce3f4813a52acd84" dependencies = [ "as-any", "bitcoin-consensus-derive", @@ -4088,7 +4098,7 @@ dependencies = [ [[package]] name = "vls-protocol-client" version = "0.10.0" -source = "git+https://gitlab.com/irriden/validating-lightning-signer.git?rev=ce04684b312c95fa7a62329ff198092a50e9a088#ce04684b312c95fa7a62329ff198092a50e9a088" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=66b77ac71363ac3ea4504d4fce3f4813a52acd84#66b77ac71363ac3ea4504d4fce3f4813a52acd84" dependencies = [ "anyhow", "async-trait", @@ -4103,7 +4113,7 @@ dependencies = [ [[package]] name = "vls-protocol-signer" version = "0.10.0" -source = "git+https://gitlab.com/irriden/validating-lightning-signer.git?rev=ce04684b312c95fa7a62329ff198092a50e9a088#ce04684b312c95fa7a62329ff198092a50e9a088" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=66b77ac71363ac3ea4504d4fce3f4813a52acd84#66b77ac71363ac3ea4504d4fce3f4813a52acd84" dependencies = [ "bit-vec", "log", @@ -4114,7 +4124,7 @@ dependencies = [ [[package]] name = "vls-proxy" version = "0.10.0" -source = "git+https://gitlab.com/irriden/validating-lightning-signer.git?rev=ce04684b312c95fa7a62329ff198092a50e9a088#ce04684b312c95fa7a62329ff198092a50e9a088" +source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=66b77ac71363ac3ea4504d4fce3f4813a52acd84#66b77ac71363ac3ea4504d4fce3f4813a52acd84" dependencies = [ "anyhow", "as-any", diff --git a/broker/Cargo.toml b/broker/Cargo.toml index 7037456..6584fee 100644 --- a/broker/Cargo.toml +++ b/broker/Cargo.toml @@ -30,17 +30,17 @@ thiserror = "1.0.31" toml = "0.5.9" url = { version = "2.2" } -vls-frontend = { git = "https://gitlab.com/irriden/validating-lightning-signer.git", rev = "ce04684b312c95fa7a62329ff198092a50e9a088" } -vls-protocol = { git = "https://gitlab.com/irriden/validating-lightning-signer.git", rev = "ce04684b312c95fa7a62329ff198092a50e9a088" } -vls-protocol-client = { git = "https://gitlab.com/irriden/validating-lightning-signer.git", rev = "ce04684b312c95fa7a62329ff198092a50e9a088" } -vls-proxy = { git = "https://gitlab.com/irriden/validating-lightning-signer.git", rev = "ce04684b312c95fa7a62329ff198092a50e9a088" } +vls-frontend = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "66b77ac71363ac3ea4504d4fce3f4813a52acd84" } +vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "66b77ac71363ac3ea4504d4fce3f4813a52acd84" } +vls-protocol-client = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "66b77ac71363ac3ea4504d4fce3f4813a52acd84" } +vls-proxy = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "66b77ac71363ac3ea4504d4fce3f4813a52acd84" } # vls-frontend = { path = "../../vls/vls-frontend" } # vls-protocol = { path = "../../vls/vls-protocol" } # vls-protocol-client = { path = "../../vls/vls-protocol-client" } # vls-proxy = { path = "../../vls/vls-proxy" } -lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "af50ee91e3600b7b4862e8f00772601c8a342110" } -sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "af50ee91e3600b7b4862e8f00772601c8a342110" } +lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "4f3485a687f6e518282c981d9ecf0adfca38e947" } +sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "4f3485a687f6e518282c981d9ecf0adfca38e947" } # lss-connector = { path = "../../sphinx-rs/lss-connector" } # sphinx-signer = { path = "../../sphinx-rs/signer" } diff --git a/broker/src/lss.rs b/broker/src/lss.rs index 0ecbf69..b7ba210 100644 --- a/broker/src/lss.rs +++ b/broker/src/lss.rs @@ -112,7 +112,7 @@ async fn dance_step_2( ) -> Result<()> { let state_bytes = lss_conn.get_created_state_msg(ir).await?; let cr = send_created(cid, state_bytes, mqtt_tx).await?; - lss_conn.handle(Response::Created(cr)).await?; + lss_conn.handle(Response::Created(cr)).await; Ok(()) }