aljaz/sphinx-key
1
1
Fork 0
mirror of https://github.com/stakwork/sphinx-key.git synced 2025-12-19 00:04:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

update sphinx-rs, send HELLO, drop alerts API in broker and use hello topic instead

Browse Source
This commit is contained in:
Evan Feenstra
2023-07-07 11:53:44 -07:00
parent 18e6b7af4e
commit 6d1c1424c2
10 changed files with 250 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Cargo.lock generated
View File

@@ -224,7 +224,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]] [[package]]
name = "bolt-derive" name = "bolt-derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -1189,7 +1189,7 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
[[package]] [[package]]
name = "lss-connector" name = "lss-connector"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7#9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=78d8c989bed15f63e5cc7df42e19ee7117c33807#78d8c989bed15f63e5cc7df42e19ee7117c33807"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -1757,7 +1757,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-auther" name = "sphinx-auther"
version = "0.1.12" version = "0.1.12"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7#9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=78d8c989bed15f63e5cc7df42e19ee7117c33807#78d8c989bed15f63e5cc7df42e19ee7117c33807"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",
@@ -1769,7 +1769,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-crypter" name = "sphinx-crypter"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7#9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=78d8c989bed15f63e5cc7df42e19ee7117c33807#78d8c989bed15f63e5cc7df42e19ee7117c33807"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chacha20poly1305", "chacha20poly1305",
@@ -1780,7 +1780,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-glyph" name = "sphinx-glyph"
version = "0.1.2" version = "0.1.2"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7#9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=78d8c989bed15f63e5cc7df42e19ee7117c33807#78d8c989bed15f63e5cc7df42e19ee7117c33807"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"hex", "hex",
@@ -1832,7 +1832,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-signer" name = "sphinx-signer"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7#9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=78d8c989bed15f63e5cc7df42e19ee7117c33807#78d8c989bed15f63e5cc7df42e19ee7117c33807"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bip39", "bip39",
@@ -2113,7 +2113,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]] [[package]]
name = "vls-core" name = "vls-core"
version = "0.9.1" version = "0.9.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bitcoin", "bitcoin",
@@ -2135,7 +2135,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-persist" name = "vls-persist"
version = "0.9.1" version = "0.9.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"hex", "hex",
"log", "log",
@@ -2148,7 +2148,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol" name = "vls-protocol"
version = "0.9.1" version = "0.9.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"as-any", "as-any",
"bolt-derive", "bolt-derive",
@@ -2162,7 +2162,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol-signer" name = "vls-protocol-signer"
version = "0.9.1" version = "0.9.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"bit-vec", "bit-vec",
"log", "log",

144
broker/Cargo.lock generated
View File

@@ -172,6 +172,32 @@ dependencies = [
"syn 2.0.22", "syn 2.0.22",
] ]
[[package]]
name = "async-tungstenite"
version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce01ac37fdc85f10a43c43bc582cbd566720357011578a935761075f898baf58"
dependencies = [
"futures-io",
"futures-util",
"log",
"pin-project-lite",
"tokio",
"tungstenite",
]
[[package]]
name = "async_io_stream"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c"
dependencies = [
"futures",
"pharos",
"rustc_version",
"tokio",
]
[[package]] [[package]]
name = "atomic" name = "atomic"
version = "0.5.3" version = "0.5.3"
@@ -381,7 +407,7 @@ dependencies = [
[[package]] [[package]]
name = "bolt-derive" name = "bolt-derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -1604,7 +1630,7 @@ dependencies = [
[[package]] [[package]]
name = "lightning-storage-server" name = "lightning-storage-server"
version = "0.3.0" version = "0.3.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@@ -1680,7 +1706,7 @@ dependencies = [
[[package]] [[package]]
name = "lss-connector" name = "lss-connector"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs?rev=9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7#9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" source = "git+https://github.com/stakwork/sphinx-rs?rev=78d8c989bed15f63e5cc7df42e19ee7117c33807#78d8c989bed15f63e5cc7df42e19ee7117c33807"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"lightning-storage-server", "lightning-storage-server",
@@ -2180,6 +2206,16 @@ dependencies = [
"indexmap 1.9.3", "indexmap 1.9.3",
] ]
[[package]]
name = "pharos"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414"
dependencies = [
"futures",
"rustc_version",
]
[[package]] [[package]]
name = "phf" name = "phf"
version = "0.11.2" version = "0.11.2"
@@ -2763,27 +2799,32 @@ dependencies = [
[[package]] [[package]]
name = "rumqttd" name = "rumqttd"
version = "0.12.6" version = "0.15.0"
source = "git+https://github.com/Evanfeenstra/rumqtt?branch=sphinx-2#03d1044df6e2f7cddda5d33970ae1cc4b16601e6" source = "git+https://github.com/Evanfeenstra/rumqtt?branch=sphinx-3#5626e514e14e7a821113f8bb760f0477115fc91c"
dependencies = [ dependencies = [
"async-tungstenite",
"axum", "axum",
"bytes", "bytes",
"clap 4.3.8", "clap 4.3.8",
"config", "config",
"flume", "flume",
"futures-util",
"metrics", "metrics",
"metrics-exporter-prometheus", "metrics-exporter-prometheus",
"oneshot", "oneshot",
"parking_lot 0.11.2", "parking_lot 0.11.2",
"rustls-pemfile 1.0.2", "rustls-pemfile 1.0.2",
"rustls-webpki",
"serde", "serde",
"serde_json", "serde_json",
"slab", "slab",
"thiserror", "thiserror",
"tokio", "tokio",
"tokio-rustls 0.23.4", "tokio-rustls 0.24.1",
"tokio-util",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"ws_stream_tungstenite",
"x509-parser", "x509-parser",
] ]
@@ -2803,6 +2844,15 @@ version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]]
name = "rustc_version"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
"semver",
]
[[package]] [[package]]
name = "rusticata-macros" name = "rusticata-macros"
version = "3.2.0" version = "3.2.0"
@@ -2977,6 +3027,12 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "semver"
version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.164" version = "1.0.164"
@@ -3108,6 +3164,17 @@ dependencies = [
"unsafe-libyaml", "unsafe-libyaml",
] ]
[[package]]
name = "sha1"
version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
dependencies = [
"cfg-if 1.0.0",
"cpufeatures",
"digest",
]
[[package]] [[package]]
name = "sha2" name = "sha2"
version = "0.10.7" version = "0.10.7"
@@ -3212,7 +3279,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-auther" name = "sphinx-auther"
version = "0.1.12" version = "0.1.12"
source = "git+https://github.com/stakwork/sphinx-rs?rev=9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7#9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" source = "git+https://github.com/stakwork/sphinx-rs?rev=78d8c989bed15f63e5cc7df42e19ee7117c33807#78d8c989bed15f63e5cc7df42e19ee7117c33807"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.13.1", "base64 0.13.1",
@@ -3224,7 +3291,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-glyph" name = "sphinx-glyph"
version = "0.1.2" version = "0.1.2"
source = "git+https://github.com/stakwork/sphinx-rs?rev=9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7#9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" source = "git+https://github.com/stakwork/sphinx-rs?rev=78d8c989bed15f63e5cc7df42e19ee7117c33807#78d8c989bed15f63e5cc7df42e19ee7117c33807"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"hex", "hex",
@@ -3270,7 +3337,7 @@ dependencies = [
[[package]] [[package]]
name = "sphinx-signer" name = "sphinx-signer"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs?rev=9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7#9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" source = "git+https://github.com/stakwork/sphinx-rs?rev=78d8c989bed15f63e5cc7df42e19ee7117c33807#78d8c989bed15f63e5cc7df42e19ee7117c33807"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bip39", "bip39",
@@ -3794,6 +3861,25 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
[[package]]
name = "tungstenite"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67"
dependencies = [
"byteorder",
"bytes",
"data-encoding",
"http",
"httparse",
"log",
"rand",
"sha1",
"thiserror",
"url",
"utf-8",
]
[[package]] [[package]]
name = "txoo" name = "txoo"
version = "0.4.4" version = "0.4.4"
@@ -3909,6 +3995,12 @@ dependencies = [
"percent-encoding", "percent-encoding",
] ]
[[package]]
name = "utf-8"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]] [[package]]
name = "utf8parse" name = "utf8parse"
version = "0.2.1" version = "0.2.1"
@@ -3930,7 +4022,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]] [[package]]
name = "vls-core" name = "vls-core"
version = "0.9.1" version = "0.9.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"backtrace", "backtrace",
@@ -3954,7 +4046,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-frontend" name = "vls-frontend"
version = "0.9.1" version = "0.9.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"lightning-storage-server", "lightning-storage-server",
@@ -3968,7 +4060,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-persist" name = "vls-persist"
version = "0.9.1" version = "0.9.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"hex", "hex",
"kv", "kv",
@@ -3982,7 +4074,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol" name = "vls-protocol"
version = "0.9.1" version = "0.9.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"as-any", "as-any",
"bolt-derive", "bolt-derive",
@@ -3996,7 +4088,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol-client" name = "vls-protocol-client"
version = "0.9.1" version = "0.9.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@@ -4011,7 +4103,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol-signer" name = "vls-protocol-signer"
version = "0.9.1" version = "0.9.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"bit-vec", "bit-vec",
"log", "log",
@@ -4023,7 +4115,7 @@ dependencies = [
[[package]] [[package]]
name = "vls-proxy" name = "vls-proxy"
version = "0.9.1" version = "0.9.1"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=95a152dce73ea7d9d10dc4ba50f43c3a0af05df8#95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=e199c70cbacd3404e7cecf95bb75ca02afd4cffd#e199c70cbacd3404e7cecf95bb75ca02afd4cffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"as-any", "as-any",
@@ -4368,6 +4460,26 @@ dependencies = [
"winapi", "winapi",
] ]
[[package]]
name = "ws_stream_tungstenite"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b6e7a5ba9436eb3868b052be83377dc685fad6d2f4cddaa2a2251b673472071"
dependencies = [
"async-tungstenite",
"async_io_stream",
"bitflags 2.3.2",
"futures-core",
"futures-io",
"futures-sink",
"futures-util",
"log",
"pharos",
"rustc_version",
"tokio",
"tungstenite",
]
[[package]] [[package]]
name = "wyz" name = "wyz"
version = "0.2.0" version = "0.2.0"

14
broker/Cargo.toml
View File

@@ -22,7 +22,7 @@ once_cell = "1.12.0"
pretty_env_logger = "0.4.0" pretty_env_logger = "0.4.0"
rocket = { version = "0.5.0-rc.2", features = ["json"] } rocket = { version = "0.5.0-rc.2", features = ["json"] }
rumqttc = "0.12.0" rumqttc = "0.12.0"
rumqttd = { git = "https://github.com/Evanfeenstra/rumqtt", branch = "sphinx-2" } rumqttd = { git = "https://github.com/Evanfeenstra/rumqtt", branch = "sphinx-3", features = ["websocket"] }
secp256k1 = { version = "0.24.0", features = ["rand-std", "bitcoin_hashes"] } secp256k1 = { version = "0.24.0", features = ["rand-std", "bitcoin_hashes"] }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0" serde_json = "1.0"
@@ -30,13 +30,13 @@ thiserror = "1.0.31"
toml = "0.5.9" toml = "0.5.9"
url = { version = "2.2" } url = { version = "2.2" }
vls-frontend = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" } vls-frontend = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "e199c70cbacd3404e7cecf95bb75ca02afd4cffd" }
vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" } vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "e199c70cbacd3404e7cecf95bb75ca02afd4cffd" }
vls-protocol-client = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" } vls-protocol-client = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "e199c70cbacd3404e7cecf95bb75ca02afd4cffd" }
vls-proxy = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "95a152dce73ea7d9d10dc4ba50f43c3a0af05df8" } vls-proxy = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "e199c70cbacd3404e7cecf95bb75ca02afd4cffd" }
lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" } lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "78d8c989bed15f63e5cc7df42e19ee7117c33807" }
sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" } sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "78d8c989bed15f63e5cc7df42e19ee7117c33807" }
# lss-connector = { path = "../../sphinx-rs/lss-connector" } # lss-connector = { path = "../../sphinx-rs/lss-connector" }
# sphinx-signer = { path = "../../sphinx-rs/signer" } # sphinx-signer = { path = "../../sphinx-rs/signer" }

4
broker/src/chain_tracker.rs
View File

@@ -46,8 +46,8 @@ impl MqttSignerPort {
// send LSS instead // send LSS instead
let lss_reply = self.send_lss(res).await?; let lss_reply = self.send_lss(res).await?;
let (res_topic2, res2) = self.send_request_wait(topics::LSS_MSG, lss_reply).await?; let (res_topic2, res2) = self.send_request_wait(topics::LSS_MSG, lss_reply).await?;
if res_topic2 != topics::VLS_RETURN { if res_topic2 != topics::VLS_RES {
log::warn!("ChainTracker got a topic NOT on {}", topics::VLS_RETURN); log::warn!("ChainTracker got a topic NOT on {}", topics::VLS_RES);
} }
the_res = res2; the_res = res2;
} }

4
broker/src/looper.rs
View File

@@ -172,8 +172,8 @@ impl<C: 'static + Client> SignerLoop<C> {
log::info!("SEND ON {}", topics::LSS_MSG); log::info!("SEND ON {}", topics::LSS_MSG);
let (res_topic2, res2) = self.send_request_wait(topics::LSS_MSG, lss_reply)?; let (res_topic2, res2) = self.send_request_wait(topics::LSS_MSG, lss_reply)?;
log::info!("GOT ON {}, send to CLN", res_topic2); log::info!("GOT ON {}, send to CLN", res_topic2);
if res_topic2 != topics::VLS_RETURN { if res_topic2 != topics::VLS_RES {
log::warn!("got a topic NOT on {}", topics::VLS_RETURN); log::warn!("got a topic NOT on {}", topics::VLS_RES);
} }
the_res = res2; the_res = res2;
} }

2
broker/src/lss.rs
View File

@@ -90,8 +90,6 @@ async fn reconnect_dance(
lss_conn: &LssBroker, lss_conn: &LssBroker,
mqtt_tx: &mpsc::Sender<ChannelRequest>, mqtt_tx: &mpsc::Sender<ChannelRequest>,
) -> Result<()> { ) -> Result<()> {
// sleep 3 seconds to make sure ESP32 subscription is active
sleep(3).await;
let ir = loop { let ir = loop {
if let Ok(ir) = dance_step_1(cid, lss_conn, mqtt_tx).await { if let Ok(ir) = dance_step_1(cid, lss_conn, mqtt_tx).await {
break ir; break ir;

150
broker/src/mqtt.rs
View File

@@ -2,7 +2,7 @@ use crate::conn::Connections;
use crate::conn::{ChannelReply, ChannelRequest}; use crate::conn::{ChannelReply, ChannelRequest};
use crate::util::Settings; use crate::util::Settings;
use rocket::tokio::{sync::broadcast, sync::mpsc}; use rocket::tokio::{sync::broadcast, sync::mpsc};
use rumqttd::{local::LinkTx, Alert, AlertEvent, AuthMsg, Broker, Config, Notification}; use rumqttd::{local::LinkTx, AuthMsg, Broker, Config, Notification};
use sphinx_signer::sphinx_glyph::sphinx_auther::token::Token; use sphinx_signer::sphinx_glyph::sphinx_auther::token::Token;
use sphinx_signer::sphinx_glyph::topics; use sphinx_signer::sphinx_glyph::topics;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
@@ -21,16 +21,15 @@ pub fn start_broker(
connections: Arc<Mutex<Connections>>, connections: Arc<Mutex<Connections>>,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let conf = config(settings); let conf = config(settings);
// println!("CONF {:?}", conf);
// let client_id = expected_client_id.to_string(); // let client_id = expected_client_id.to_string();
let mut broker = Broker::new(conf); let mut broker = Broker::new(conf);
let mut alerts = broker.alerts(vec![
// "/alerts/error/+".to_string(),
"/alerts/event/connect/+".to_string(),
"/alerts/event/disconnect/+".to_string(),
])?;
let (mut link_tx, mut link_rx) = broker.link("localclient")?; let (mut link_tx, mut link_rx) = broker.link("localclient")?;
link_tx.subscribe("#").unwrap();
let auth_sender_ = auth_sender.clone(); let auth_sender_ = auth_sender.clone();
std::thread::spawn(move || { std::thread::spawn(move || {
broker broker
@@ -39,33 +38,13 @@ pub fn start_broker(
}); });
// connected/disconnected status alerts // connected/disconnected status alerts
let (internal_status_tx, internal_status_rx) = std::sync::mpsc::channel(); let (internal_status_tx, internal_status_rx) = std::sync::mpsc::channel::<(bool, String)>();
let _alerts_handle = std::thread::spawn(move || loop {
let alert = alerts.poll();
log::info!("Alert: {:?}", alert);
match alert.1 {
Alert::Event(cid, event) => {
// dont alert for local connections
let locals = vec!["console", "localclient"];
if !locals.contains(&cid.as_str()) {
if let Some(status) = match event {
AlertEvent::Connect => Some(true),
AlertEvent::Disconnect => Some(false),
_ => None,
} {
let _ = internal_status_tx.send((cid, status));
}
}
}
_ => (),
}
});
// track connections // track connections
let status_sender_ = status_sender.clone(); let status_sender_ = status_sender.clone();
let link_tx_ = link_tx.clone(); let link_tx_ = link_tx.clone();
let _conns_task = std::thread::spawn(move || { let _conns_task = std::thread::spawn(move || {
while let Ok((cid, is)) = internal_status_rx.recv() { while let Ok((is, cid)) = internal_status_rx.recv() {
if is { if is {
subs(&cid, link_tx_.clone()); subs(&cid, link_tx_.clone());
} else { } else {
@@ -101,38 +80,48 @@ pub fn start_broker(
// receive replies back from glyph // receive replies back from glyph
let _sub_task = std::thread::spawn(move || { let _sub_task = std::thread::spawn(move || {
while let Ok(message) = link_rx.recv() { while let Ok(message) = link_rx.recv() {
if let Some(n) = message { if let None = message {
match n { continue;
Notification::Forward(f) => { }
let topic_res = std::str::from_utf8(&f.publish.topic); match message.unwrap() {
if let Err(_) = topic_res { Notification::Forward(f) => {
continue; let topic_res = std::str::from_utf8(&f.publish.topic);
} if let Err(_) = topic_res {
let topic = topic_res.unwrap(); continue;
if topic.ends_with(topics::ERROR) { }
let _ = error_sender.send(f.publish.payload.to_vec());
} else { let topic = topic_res.unwrap();
// VLS, CONTROL, LSS if topic.ends_with(topics::ERROR) {
let ts: Vec<&str> = topic.split("/").collect(); let _ = error_sender.send(f.publish.payload.to_vec());
if ts.len() != 2 { continue;
continue; }
let ts: Vec<&str> = topic.split("/").collect();
if ts.len() != 2 {
continue;
}
let cid = ts[0].to_string();
let topic_end = ts[1].to_string();
if topic.ends_with(topics::HELLO) {
let _ = internal_status_tx.send((true, cid));
} else if topic.ends_with(topics::BYE) {
let _ = internal_status_tx.send((false, cid));
} else {
// VLS, CONTROL, LSS
let pld = f.publish.payload.to_vec();
if topic_end == topics::INIT_RES {
if let Err(e) = init_tx.send((cid, topic_end, pld)) {
log::error!("failed to pub to init_tx! {:?}", e);
} }
let cid = ts[0].to_string(); } else {
let topic_end = ts[1].to_string(); if let Err(e) = msg_tx.send((cid, topic_end, pld)) {
let pld = f.publish.payload.to_vec(); log::error!("failed to pub to msg_tx! {:?}", e);
if topic_end == topics::INIT_RES {
if let Err(e) = init_tx.send((cid, topic_end, pld)) {
log::error!("failed to pub to init_tx! {:?}", e);
}
} else {
if let Err(e) = msg_tx.send((cid, topic_end, pld)) {
log::error!("failed to pub to msg_tx! {:?}", e);
}
} }
} }
} }
_ => (), }
}; _ => continue,
} }
} }
}); });
@@ -228,9 +217,9 @@ fn pub_timeout(
} }
fn subs(cid: &str, mut ltx: LinkTx) { fn subs(cid: &str, mut ltx: LinkTx) {
ltx.subscribe(format!("{}/{}", cid, topics::VLS_RETURN)) ltx.subscribe(format!("{}/{}", cid, topics::VLS_RES))
.unwrap(); .unwrap();
ltx.subscribe(format!("{}/{}", cid, topics::CONTROL_RETURN)) ltx.subscribe(format!("{}/{}", cid, topics::CONTROL_RES))
.unwrap(); .unwrap();
ltx.subscribe(format!("{}/{}", cid, topics::ERROR)).unwrap(); ltx.subscribe(format!("{}/{}", cid, topics::ERROR)).unwrap();
ltx.subscribe(format!("{}/{}", cid, topics::LSS_RES)) ltx.subscribe(format!("{}/{}", cid, topics::LSS_RES))
@@ -284,28 +273,45 @@ fn config(settings: Settings) -> Config {
max_read_len: 10240, max_read_len: 10240,
..Default::default() ..Default::default()
}; };
let mut servers = HashMap::new(); let conns = ConnectionSettings {
servers.insert( connection_timeout_ms: 5000,
"sphinx-broker".to_string(), throttle_delay_ms: 0,
max_payload_size: 262144,
max_inflight_count: 256,
max_inflight_size: 1024,
auth: None,
dynamic_filters: true,
};
let mut v4_servers = HashMap::new();
v4_servers.insert(
"v4".to_string(),
ServerSettings { ServerSettings {
name: "sphinx-broker".to_string(), name: "v4".to_string(),
listen: SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), settings.mqtt_port).into(), listen: SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), settings.mqtt_port).into(),
next_connection_delay_ms: 1, next_connection_delay_ms: 1,
connections: ConnectionSettings { connections: conns.clone(),
connection_timeout_ms: 5000,
throttle_delay_ms: 0,
max_payload_size: 262144,
max_inflight_count: 256,
max_inflight_size: 1024,
auth: None,
dynamic_filters: true,
},
tls: None, tls: None,
}, },
); );
let mut ws_servers = None;
if let Some(wsp) = settings.websocket_port {
let mut ws = HashMap::new();
ws.insert(
"ws".to_string(),
ServerSettings {
name: "ws".to_string(),
listen: SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), wsp).into(),
next_connection_delay_ms: 1,
connections: conns,
tls: None,
},
);
ws_servers = Some(ws);
}
Config { Config {
id: 0, id: 0,
v4: servers, v4: v4_servers,
ws: ws_servers,
router, router,
console: ConsoleSettings::new("0.0.0.0:3030"), console: ConsoleSettings::new("0.0.0.0:3030"),
cluster: None, cluster: None,

2
broker/src/util.rs
View File

@@ -10,6 +10,7 @@ pub struct Settings {
pub http_port: u16, pub http_port: u16,
pub mqtt_port: u16, pub mqtt_port: u16,
pub network: Network, pub network: Network,
pub websocket_port: Option<u16>,
} }
impl Default for Settings { impl Default for Settings {
@@ -18,6 +19,7 @@ impl Default for Settings {
http_port: 8000, http_port: 8000,
mqtt_port: 1883, mqtt_port: 1883,
network: Network::Regtest, network: Network::Regtest,
websocket_port: Some(8083),
} }
} }
} }

6
sphinx-key/Cargo.toml
View File

@@ -19,10 +19,10 @@ serde_json = { version = "1.0.81", default-features = false }
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"
url = "2" url = "2"
lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" } lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "78d8c989bed15f63e5cc7df42e19ee7117c33807" }
# lss-connector = { path = "../../sphinx-rs/lss-connector", default-features = false } # lss-connector = { path = "../../sphinx-rs/lss-connector", default-features = false }
sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" } sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "78d8c989bed15f63e5cc7df42e19ee7117c33807" }
sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "9c8dc1f8dd61fa908f5546524a9c1d21f1b34dd7" } sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "78d8c989bed15f63e5cc7df42e19ee7117c33807" }
# sphinx-signer = { path = "../../sphinx-rs/signer", optional = true } # sphinx-signer = { path = "../../sphinx-rs/signer", optional = true }
anyhow.workspace = true anyhow.workspace = true

30
sphinx-key/src/core/events.rs
View File

@@ -124,6 +124,10 @@ pub fn make_event_loop(
) )
.expect("failed to init signer"); .expect("failed to init signer");
thread::sleep(std::time::Duration::from_secs(1));
// send the initial HELLO
mqtt_pub(&mut mqtt, client_id, topics::HELLO, &[]);
// FIXME it right to restart here? // FIXME it right to restart here?
let (root_handler, lss_signer) = match lss::init_lss(client_id, &rx, rhb, &mut mqtt) { let (root_handler, lss_signer) = match lss::init_lss(client_id, &rx, rhb, &mut mqtt) {
Ok(rl) => rl, Ok(rl) => rl,
@@ -165,7 +169,7 @@ pub fn make_event_loop(
Ok((vls_b, lss_b)) => { Ok((vls_b, lss_b)) => {
if lss_b.len() == 0 { if lss_b.len() == 0 {
// no muts, respond directly back! // no muts, respond directly back!
mqtt_pub(&mut mqtt, client_id, topics::VLS_RETURN, &vls_b); mqtt_pub(&mut mqtt, client_id, topics::VLS_RES, &vls_b);
restart_esp_if_memory_low(); restart_esp_if_memory_low();
} else { } else {
// muts! send LSS first! // muts! send LSS first!
@@ -195,7 +199,7 @@ pub fn make_event_loop(
// set msgs back to None // set msgs back to None
msgs = None; msgs = None;
mqtt_pub(&mut mqtt, client_id, &ret_topic, &bytes); mqtt_pub(&mut mqtt, client_id, &ret_topic, &bytes);
if ret_topic == topics::VLS_RETURN { if ret_topic == topics::VLS_RES {
restart_esp_if_memory_low(); restart_esp_if_memory_low();
} }
} }
@@ -213,7 +217,7 @@ pub fn make_event_loop(
{ {
let res_data = let res_data =
rmp_serde::to_vec_named(&res).expect("could not publish control response"); rmp_serde::to_vec_named(&res).expect("could not publish control response");
mqtt_pub(&mut mqtt, client_id, topics::CONTROL_RETURN, &res_data); mqtt_pub(&mut mqtt, client_id, topics::CONTROL_RES, &res_data);
} }
} }
} }
@@ -277,15 +281,17 @@ fn handle_control_response(
} else { } else {
// A 10kB size stack was consistently overflowing when doing a factory reset // A 10kB size stack was consistently overflowing when doing a factory reset
let builder = thread::Builder::new().stack_size(15000usize); let builder = thread::Builder::new().stack_size(15000usize);
builder.spawn(move || { builder
led_tx.send(Status::Ota).unwrap(); .spawn(move || {
if let Err(e) = update_sphinx_key(params, led_tx) { led_tx.send(Status::Ota).unwrap();
log::error!("OTA update failed {:?}", e.to_string()); if let Err(e) = update_sphinx_key(params, led_tx) {
} else { log::error!("OTA update failed {:?}", e.to_string());
log::info!("OTA flow complete, restarting esp..."); } else {
unsafe { esp_idf_sys::esp_restart() }; log::info!("OTA flow complete, restarting esp...");
} unsafe { esp_idf_sys::esp_restart() };
}).unwrap(); }
})
.unwrap();
log::info!("OTA update launched..."); log::info!("OTA update launched...");
} }
} }