Update vls

This commit is contained in:
irriden
2023-08-22 18:05:02 +00:00
parent fd921955d3
commit a86640904e
7 changed files with 183 additions and 110 deletions

74
Cargo.lock generated
View File

@@ -210,6 +210,27 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "bitcoin-consensus-derive"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d56036c7fe1f5c0b097b7bb69da9bcc60cce90589cbf2cc907670a420033a55d"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "bitcoin-push-decoder"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d533f86c679e4388a80f0c11524ae690dc1850315007757dced23ecd53526bbe"
dependencies = [
"bitcoin",
"log",
]
[[package]] [[package]]
name = "bitcoin_hashes" name = "bitcoin_hashes"
version = "0.11.0" version = "0.11.0"
@@ -227,8 +248,8 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]] [[package]]
name = "bolt-derive" name = "bolt-derive"
version = "0.1.0" version = "0.2.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -798,8 +819,7 @@ dependencies = [
[[package]] [[package]]
name = "fsdb" name = "fsdb"
version = "0.1.11" version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/Evanfeenstra/fsdb.git?rev=78e174941ea0a373c2bb0ef518317b40ac80abf9#78e174941ea0a373c2bb0ef518317b40ac80abf9"
checksum = "5545f523480b87f7ef5ecff5da72c41235096b10956e4db3f4b0d961f836c768"
dependencies = [ dependencies = [
"rmp-serde", "rmp-serde",
"serde", "serde",
@@ -1199,7 +1219,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=150f592d67e25358367b921c52cd7b3bcccc40d3#150f592d67e25358367b921c52cd7b3bcccc40d3" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=967914cd2468f9bd5f5bae00a05c1239b9f32ffd#967914cd2468f9bd5f5bae00a05c1239b9f32ffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -1571,7 +1591,7 @@ dependencies = [
[[package]] [[package]]
name = "rmp-utils" name = "rmp-utils"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs.git?rev=150f592d67e25358367b921c52cd7b3bcccc40d3#150f592d67e25358367b921c52cd7b3bcccc40d3" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=967914cd2468f9bd5f5bae00a05c1239b9f32ffd#967914cd2468f9bd5f5bae00a05c1239b9f32ffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -1681,13 +1701,13 @@ dependencies = [
[[package]] [[package]]
name = "serde_bolt" name = "serde_bolt"
version = "0.2.4" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd5fb14792b8d139f641e6d0e1a19eb0e3c47ec8629a2dc4e75fcbd7d77f46a8" checksum = "ca3ddb862d94a73280b5b6faa3c9bc37db242f6a495d49f0ffb85f040dbb9bca"
dependencies = [ dependencies = [
"bitcoin",
"bitcoin-consensus-derive",
"hex", "hex",
"serde",
"serde_derive",
] ]
[[package]] [[package]]
@@ -1778,7 +1798,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=150f592d67e25358367b921c52cd7b3bcccc40d3#150f592d67e25358367b921c52cd7b3bcccc40d3" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=967914cd2468f9bd5f5bae00a05c1239b9f32ffd#967914cd2468f9bd5f5bae00a05c1239b9f32ffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.21.2", "base64 0.21.2",
@@ -1790,7 +1810,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=150f592d67e25358367b921c52cd7b3bcccc40d3#150f592d67e25358367b921c52cd7b3bcccc40d3" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=967914cd2468f9bd5f5bae00a05c1239b9f32ffd#967914cd2468f9bd5f5bae00a05c1239b9f32ffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chacha20poly1305", "chacha20poly1305",
@@ -1801,7 +1821,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=150f592d67e25358367b921c52cd7b3bcccc40d3#150f592d67e25358367b921c52cd7b3bcccc40d3" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=967914cd2468f9bd5f5bae00a05c1239b9f32ffd#967914cd2468f9bd5f5bae00a05c1239b9f32ffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"hex", "hex",
@@ -1852,7 +1872,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=150f592d67e25358367b921c52cd7b3bcccc40d3#150f592d67e25358367b921c52cd7b3bcccc40d3" source = "git+https://github.com/stakwork/sphinx-rs.git?rev=967914cd2468f9bd5f5bae00a05c1239b9f32ffd#967914cd2468f9bd5f5bae00a05c1239b9f32ffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bip39", "bip39",
@@ -2047,9 +2067,9 @@ dependencies = [
[[package]] [[package]]
name = "txoo" name = "txoo"
version = "0.4.4" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b08cb13c2c0c091a0a451ee42d80dae8a880f5d74961ba97eedfa847d800001a" checksum = "a193921f49c6f145d30e495f41db0bbfb11915ead7047068ede8edeaf3948c73"
dependencies = [ dependencies = [
"bitcoin", "bitcoin",
"log", "log",
@@ -2133,11 +2153,13 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]] [[package]]
name = "vls-core" name = "vls-core"
version = "0.9.1" version = "0.10.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bitcoin", "bitcoin",
"bitcoin-consensus-derive",
"bitcoin-push-decoder",
"bolt-derive", "bolt-derive",
"hashbrown 0.8.2", "hashbrown 0.8.2",
"hex", "hex",
@@ -2155,8 +2177,8 @@ dependencies = [
[[package]] [[package]]
name = "vls-persist" name = "vls-persist"
version = "0.9.1" version = "0.10.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"hex", "hex",
"log", "log",
@@ -2168,26 +2190,24 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol" name = "vls-protocol"
version = "0.9.1" version = "0.10.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"as-any", "as-any",
"bitcoin-consensus-derive",
"bolt-derive", "bolt-derive",
"hex", "hex",
"log", "log",
"serde",
"serde_bolt", "serde_bolt",
"serde_derive",
] ]
[[package]] [[package]]
name = "vls-protocol-signer" name = "vls-protocol-signer"
version = "0.9.1" version = "0.10.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"bit-vec", "bit-vec",
"log", "log",
"serde",
"vls-core", "vls-core",
"vls-protocol", "vls-protocol",
] ]

194
broker/Cargo.lock generated
View File

@@ -34,6 +34,17 @@ dependencies = [
"version_check", "version_check",
] ]
[[package]]
name = "ahash"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
dependencies = [
"cfg-if 1.0.0",
"once_cell",
"version_check",
]
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "1.0.2" version = "1.0.2"
@@ -43,6 +54,12 @@ dependencies = [
"memchr", "memchr",
] ]
[[package]]
name = "allocator-api2"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
[[package]] [[package]]
name = "android-tzdata" name = "android-tzdata"
version = "0.1.1" version = "0.1.1"
@@ -360,6 +377,27 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "bitcoin-consensus-derive"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d56036c7fe1f5c0b097b7bb69da9bcc60cce90589cbf2cc907670a420033a55d"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "bitcoin-push-decoder"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d533f86c679e4388a80f0c11524ae690dc1850315007757dced23ecd53526bbe"
dependencies = [
"bitcoin",
"log",
]
[[package]] [[package]]
name = "bitcoin_hashes" name = "bitcoin_hashes"
version = "0.11.0" version = "0.11.0"
@@ -404,8 +442,8 @@ dependencies = [
[[package]] [[package]]
name = "bolt-derive" name = "bolt-derive"
version = "0.1.0" version = "0.2.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -1041,8 +1079,7 @@ dependencies = [
[[package]] [[package]]
name = "fsdb" name = "fsdb"
version = "0.1.11" version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/Evanfeenstra/fsdb.git?rev=78e174941ea0a373c2bb0ef518317b40ac80abf9#78e174941ea0a373c2bb0ef518317b40ac80abf9"
checksum = "5545f523480b87f7ef5ecff5da72c41235096b10956e4db3f4b0d961f836c768"
dependencies = [ dependencies = [
"rmp-serde", "rmp-serde",
"serde", "serde",
@@ -1250,6 +1287,10 @@ name = "hashbrown"
version = "0.14.0" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
dependencies = [
"ahash 0.8.3",
"allocator-api2",
]
[[package]] [[package]]
name = "heck" name = "heck"
@@ -1360,21 +1401,6 @@ dependencies = [
"want", "want",
] ]
[[package]]
name = "hyper-rustls"
version = "0.23.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
dependencies = [
"http",
"hyper",
"log",
"rustls 0.20.8",
"rustls-native-certs",
"tokio",
"tokio-rustls 0.23.4",
]
[[package]] [[package]]
name = "hyper-rustls" name = "hyper-rustls"
version = "0.24.1" version = "0.24.1"
@@ -1384,7 +1410,9 @@ dependencies = [
"futures-util", "futures-util",
"http", "http",
"hyper", "hyper",
"log",
"rustls 0.21.3", "rustls 0.21.3",
"rustls-native-certs",
"tokio", "tokio",
"tokio-rustls 0.24.1", "tokio-rustls 0.24.1",
] ]
@@ -1618,7 +1646,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=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@@ -1697,10 +1725,19 @@ dependencies = [
"tracing-subscriber", "tracing-subscriber",
] ]
[[package]]
name = "lru"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5"
dependencies = [
"hashbrown 0.14.0",
]
[[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=150f592d67e25358367b921c52cd7b3bcccc40d3#150f592d67e25358367b921c52cd7b3bcccc40d3" source = "git+https://github.com/stakwork/sphinx-rs?rev=967914cd2468f9bd5f5bae00a05c1239b9f32ffd#967914cd2468f9bd5f5bae00a05c1239b9f32ffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"lightning-storage-server", "lightning-storage-server",
@@ -2434,6 +2471,16 @@ dependencies = [
"prost", "prost",
] ]
[[package]]
name = "pyo3-build-config"
version = "0.19.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5"
dependencies = [
"once_cell",
"target-lexicon",
]
[[package]] [[package]]
name = "quanta" name = "quanta"
version = "0.10.1" version = "0.10.1"
@@ -2516,6 +2563,16 @@ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
] ]
[[package]]
name = "redb"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97d37f4ea12036ad04bd2a02ce385bf28e56f97344223952dccaacbf8704823e"
dependencies = [
"libc",
"pyo3-build-config",
]
[[package]] [[package]]
name = "redox_syscall" name = "redox_syscall"
version = "0.2.16" version = "0.2.16"
@@ -2624,7 +2681,7 @@ dependencies = [
"http", "http",
"http-body", "http-body",
"hyper", "hyper",
"hyper-rustls 0.24.1", "hyper-rustls",
"ipnet", "ipnet",
"js-sys", "js-sys",
"log", "log",
@@ -2694,7 +2751,7 @@ dependencies = [
[[package]] [[package]]
name = "rmp-utils" name = "rmp-utils"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/stakwork/sphinx-rs?rev=150f592d67e25358367b921c52cd7b3bcccc40d3#150f592d67e25358367b921c52cd7b3bcccc40d3" source = "git+https://github.com/stakwork/sphinx-rs?rev=967914cd2468f9bd5f5bae00a05c1239b9f32ffd#967914cd2468f9bd5f5bae00a05c1239b9f32ffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"log", "log",
@@ -3081,13 +3138,13 @@ dependencies = [
[[package]] [[package]]
name = "serde_bolt" name = "serde_bolt"
version = "0.2.4" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd5fb14792b8d139f641e6d0e1a19eb0e3c47ec8629a2dc4e75fcbd7d77f46a8" checksum = "ca3ddb862d94a73280b5b6faa3c9bc37db242f6a495d49f0ffb85f040dbb9bca"
dependencies = [ dependencies = [
"bitcoin",
"bitcoin-consensus-derive",
"hex", "hex",
"serde",
"serde_derive",
] ]
[[package]] [[package]]
@@ -3308,7 +3365,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=150f592d67e25358367b921c52cd7b3bcccc40d3#150f592d67e25358367b921c52cd7b3bcccc40d3" source = "git+https://github.com/stakwork/sphinx-rs?rev=967914cd2468f9bd5f5bae00a05c1239b9f32ffd#967914cd2468f9bd5f5bae00a05c1239b9f32ffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64 0.21.2", "base64 0.21.2",
@@ -3320,7 +3377,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=150f592d67e25358367b921c52cd7b3bcccc40d3#150f592d67e25358367b921c52cd7b3bcccc40d3" source = "git+https://github.com/stakwork/sphinx-rs?rev=967914cd2468f9bd5f5bae00a05c1239b9f32ffd#967914cd2468f9bd5f5bae00a05c1239b9f32ffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"hex", "hex",
@@ -3366,7 +3423,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=150f592d67e25358367b921c52cd7b3bcccc40d3#150f592d67e25358367b921c52cd7b3bcccc40d3" source = "git+https://github.com/stakwork/sphinx-rs?rev=967914cd2468f9bd5f5bae00a05c1239b9f32ffd#967914cd2468f9bd5f5bae00a05c1239b9f32ffd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bip39", "bip39",
@@ -3478,6 +3535,12 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "target-lexicon"
version = "0.12.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
[[package]] [[package]]
name = "tempfile" name = "tempfile"
version = "3.6.0" version = "3.6.0"
@@ -3730,14 +3793,14 @@ dependencies = [
[[package]] [[package]]
name = "tonic" name = "tonic"
version = "0.8.3" version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
dependencies = [ dependencies = [
"async-stream", "async-stream",
"async-trait", "async-trait",
"axum", "axum",
"base64 0.13.1", "base64 0.21.2",
"bytes", "bytes",
"futures-core", "futures-core",
"futures-util", "futures-util",
@@ -3749,24 +3812,21 @@ dependencies = [
"percent-encoding", "percent-encoding",
"pin-project", "pin-project",
"prost", "prost",
"prost-derive",
"rustls-pemfile 1.0.3", "rustls-pemfile 1.0.3",
"tokio", "tokio",
"tokio-rustls 0.23.4", "tokio-rustls 0.24.1",
"tokio-stream", "tokio-stream",
"tokio-util",
"tower", "tower",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"tracing", "tracing",
"tracing-futures",
] ]
[[package]] [[package]]
name = "tonic-build" name = "tonic-build"
version = "0.8.4" version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07"
dependencies = [ dependencies = [
"prettyplease", "prettyplease",
"proc-macro2", "proc-macro2",
@@ -3841,16 +3901,6 @@ dependencies = [
"valuable", "valuable",
] ]
[[package]]
name = "tracing-futures"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
dependencies = [
"pin-project",
"tracing",
]
[[package]] [[package]]
name = "tracing-log" name = "tracing-log"
version = "0.1.3" version = "0.1.3"
@@ -3913,14 +3963,14 @@ dependencies = [
[[package]] [[package]]
name = "txoo" name = "txoo"
version = "0.4.4" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b08cb13c2c0c091a0a451ee42d80dae8a880f5d74961ba97eedfa847d800001a" checksum = "a193921f49c6f145d30e495f41db0bbfb11915ead7047068ede8edeaf3948c73"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bitcoin", "bitcoin",
"hyper", "hyper",
"hyper-rustls 0.23.2", "hyper-rustls",
"log", "log",
"serde", "serde",
"serde_yaml", "serde_yaml",
@@ -3929,9 +3979,9 @@ dependencies = [
[[package]] [[package]]
name = "txoo-bitcoind-client" name = "txoo-bitcoind-client"
version = "0.4.4" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2ff46bdd91604033f6db1234f6a3a4861650c8f9f06c600450f1b3a61a843d4" checksum = "e95742aa251a56fd290fe0a570dddea0d7186b06ee9ad8419462e00c6aceda77"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bitcoin", "bitcoin",
@@ -4052,12 +4102,14 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]] [[package]]
name = "vls-core" name = "vls-core"
version = "0.9.1" version = "0.10.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"backtrace", "backtrace",
"bitcoin", "bitcoin",
"bitcoin-consensus-derive",
"bitcoin-push-decoder",
"bolt-derive", "bolt-derive",
"env_logger 0.9.3", "env_logger 0.9.3",
"hashbrown 0.8.2", "hashbrown 0.8.2",
@@ -4076,8 +4128,8 @@ dependencies = [
[[package]] [[package]]
name = "vls-frontend" name = "vls-frontend"
version = "0.9.1" version = "0.10.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"lightning-storage-server", "lightning-storage-server",
@@ -4090,12 +4142,13 @@ dependencies = [
[[package]] [[package]]
name = "vls-persist" name = "vls-persist"
version = "0.9.1" version = "0.10.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"hex", "hex",
"kv", "kv",
"log", "log",
"redb",
"serde", "serde",
"serde_json", "serde_json",
"serde_with", "serde_with",
@@ -4104,22 +4157,21 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol" name = "vls-protocol"
version = "0.9.1" version = "0.10.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"as-any", "as-any",
"bitcoin-consensus-derive",
"bolt-derive", "bolt-derive",
"hex", "hex",
"log", "log",
"serde",
"serde_bolt", "serde_bolt",
"serde_derive",
] ]
[[package]] [[package]]
name = "vls-protocol-client" name = "vls-protocol-client"
version = "0.9.1" version = "0.10.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
@@ -4133,20 +4185,19 @@ dependencies = [
[[package]] [[package]]
name = "vls-protocol-signer" name = "vls-protocol-signer"
version = "0.9.1" version = "0.10.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"bit-vec", "bit-vec",
"log", "log",
"serde",
"vls-core", "vls-core",
"vls-protocol", "vls-protocol",
] ]
[[package]] [[package]]
name = "vls-proxy" name = "vls-proxy"
version = "0.9.1" version = "0.10.0"
source = "git+https://gitlab.com/lightning-signer/validating-lightning-signer.git?rev=de25fc60bce03e9be16a698ffd8e8bdc48ed975d#de25fc60bce03e9be16a698ffd8e8bdc48ed975d" source = "git+https://gitlab.com/evanfeenstra1/validating-lightning-signer.git?rev=0344fa9ee8d99edaece7020bd414b3b8c4dad7b3#0344fa9ee8d99edaece7020bd414b3b8c4dad7b3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"as-any", "as-any",
@@ -4162,6 +4213,7 @@ dependencies = [
"hyper", "hyper",
"lightning-storage-server", "lightning-storage-server",
"log", "log",
"lru",
"nix", "nix",
"prost", "prost",
"serde", "serde",

View File

@@ -30,17 +30,17 @@ 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 = "de25fc60bce03e9be16a698ffd8e8bdc48ed975d" } vls-frontend = { git = "https://gitlab.com/evanfeenstra1/validating-lightning-signer.git", rev = "0344fa9ee8d99edaece7020bd414b3b8c4dad7b3" }
vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "de25fc60bce03e9be16a698ffd8e8bdc48ed975d" } vls-protocol = { git = "https://gitlab.com/evanfeenstra1/validating-lightning-signer.git", rev = "0344fa9ee8d99edaece7020bd414b3b8c4dad7b3" }
vls-protocol-client = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "de25fc60bce03e9be16a698ffd8e8bdc48ed975d" } vls-protocol-client = { git = "https://gitlab.com/evanfeenstra1/validating-lightning-signer.git", rev = "0344fa9ee8d99edaece7020bd414b3b8c4dad7b3" }
vls-proxy = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer.git", rev = "de25fc60bce03e9be16a698ffd8e8bdc48ed975d" } vls-proxy = { git = "https://gitlab.com/evanfeenstra1/validating-lightning-signer.git", rev = "0344fa9ee8d99edaece7020bd414b3b8c4dad7b3" }
# vls-frontend = { path = "../../vls/vls-frontend" } # vls-frontend = { path = "../../vls/vls-frontend" }
# vls-protocol = { path = "../../vls/vls-protocol" } # vls-protocol = { path = "../../vls/vls-protocol" }
# vls-protocol-client = { path = "../../vls/vls-protocol-client" } # vls-protocol-client = { path = "../../vls/vls-protocol-client" }
# vls-proxy = { path = "../../vls/vls-proxy" } # vls-proxy = { path = "../../vls/vls-proxy" }
lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "150f592d67e25358367b921c52cd7b3bcccc40d3" } lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "967914cd2468f9bd5f5bae00a05c1239b9f32ffd" }
sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "150f592d67e25358367b921c52cd7b3bcccc40d3" } sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "967914cd2468f9bd5f5bae00a05c1239b9f32ffd" }
# 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" }

View File

@@ -127,7 +127,7 @@ impl<C: 'static + Client> SignerLoop<C> {
catch_init = true; catch_init = true;
if let Some(set) = settings { if let Some(set) = settings {
if ChainHash::using_genesis_block(set.network).as_bytes() if ChainHash::using_genesis_block(set.network).as_bytes()
!= &m.chain_params.0 != m.chain_params.as_ref()
{ {
panic!("The network settings of CLN and broker don't match!"); panic!("The network settings of CLN and broker don't match!");
} }

View File

@@ -18,11 +18,11 @@ 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 = "150f592d67e25358367b921c52cd7b3bcccc40d3" } lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "967914cd2468f9bd5f5bae00a05c1239b9f32ffd" }
# 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 = "150f592d67e25358367b921c52cd7b3bcccc40d3" } sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "967914cd2468f9bd5f5bae00a05c1239b9f32ffd" }
# sphinx-crypter = { path = "../../sphinx-rs/crypter" } # sphinx-crypter = { path = "../../sphinx-rs/crypter" }
sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "150f592d67e25358367b921c52cd7b3bcccc40d3" } sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "967914cd2468f9bd5f5bae00a05c1239b9f32ffd" }
# sphinx-signer = { path = "../../sphinx-rs/signer", optional = true } # sphinx-signer = { path = "../../sphinx-rs/signer", optional = true }
anyhow.workspace = true anyhow.workspace = true

View File

@@ -14,6 +14,7 @@ use sphinx_signer::lightning_signer::persist::{DummyPersister, Persist};
use sphinx_signer::persist::{BackupPersister, FsPersister, ThreadMemoPersister}; use sphinx_signer::persist::{BackupPersister, FsPersister, ThreadMemoPersister};
use sphinx_signer::root::VlsHandlerError; use sphinx_signer::root::VlsHandlerError;
use sphinx_signer::sphinx_glyph as glyph; use sphinx_signer::sphinx_glyph as glyph;
use sphinx_signer::vls_protocol::msgs::{GetHeartbeat, Message};
use sphinx_signer::{self, Handler, RootHandler}; use sphinx_signer::{self, Handler, RootHandler};
use std::sync::mpsc; use std::sync::mpsc;
use std::sync::Arc; use std::sync::Arc;
@@ -152,7 +153,7 @@ pub fn make_event_loop(
if let Some(seq) = expected_sequence { if let Some(seq) = expected_sequence {
if seq % 40 == 0 { if seq % 40 == 0 {
log::info!("get heartbeat!"); log::info!("get heartbeat!");
let _ = root_handler.node().get_heartbeat(); let _ = root_handler.handle(Message::GetHeartbeat(GetHeartbeat {}));
} }
} }
match event { match event {

View File

@@ -47,7 +47,7 @@ pub fn led_control_loop(
let transmit = Arc::new(Mutex::new( let transmit = Arc::new(Mutex::new(
TxRmtDriver::new(channel0, gpio0, &config).unwrap(), TxRmtDriver::new(channel0, gpio0, &config).unwrap(),
)); ));
let builder = thread::Builder::new().stack_size(1500); let builder = thread::Builder::new().stack_size(2500);
builder.spawn(move || { builder.spawn(move || {
let mut led = Led::new(0x000001, 100); let mut led = Led::new(0x000001, 100);
let states = states(); let states = states();