diff --git a/Cargo.lock b/Cargo.lock index ae53aa4..6c3bc4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -251,7 +251,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -468,7 +468,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -479,7 +479,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -502,7 +502,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -645,7 +645,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -1195,7 +1195,7 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lss-connector" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=38d7fa25e860b61a813ca8c3fad17f699daf2f08#38d7fa25e860b61a813ca8c3fad17f699daf2f08" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" dependencies = [ "anyhow", "log", @@ -1660,9 +1660,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.167" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] @@ -1689,13 +1689,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.167" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -1745,7 +1745,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -1775,7 +1775,7 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=38d7fa25e860b61a813ca8c3fad17f699daf2f08#38d7fa25e860b61a813ca8c3fad17f699daf2f08" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" dependencies = [ "anyhow", "base64", @@ -1787,7 +1787,7 @@ dependencies = [ [[package]] name = "sphinx-crypter" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=38d7fa25e860b61a813ca8c3fad17f699daf2f08#38d7fa25e860b61a813ca8c3fad17f699daf2f08" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" dependencies = [ "anyhow", "chacha20poly1305", @@ -1798,7 +1798,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=38d7fa25e860b61a813ca8c3fad17f699daf2f08#38d7fa25e860b61a813ca8c3fad17f699daf2f08" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" dependencies = [ "anyhow", "hex", @@ -1850,7 +1850,7 @@ dependencies = [ [[package]] name = "sphinx-signer" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs.git?rev=38d7fa25e860b61a813ca8c3fad17f699daf2f08#38d7fa25e860b61a813ca8c3fad17f699daf2f08" +source = "git+https://github.com/stakwork/sphinx-rs.git?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" dependencies = [ "anyhow", "bip39", @@ -1956,9 +1956,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" dependencies = [ "proc-macro2", "quote", @@ -1996,7 +1996,7 @@ checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", ] [[package]] @@ -2238,7 +2238,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", "wasm-bindgen-shared", ] @@ -2260,7 +2260,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.25", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/broker/Cargo.lock b/broker/Cargo.lock index d6fdfea..86995cb 100644 --- a/broker/Cargo.lock +++ b/broker/Cargo.lock @@ -1702,7 +1702,7 @@ dependencies = [ [[package]] name = "lss-connector" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=38d7fa25e860b61a813ca8c3fad17f699daf2f08#38d7fa25e860b61a813ca8c3fad17f699daf2f08" +source = "git+https://github.com/stakwork/sphinx-rs?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" dependencies = [ "anyhow", "lightning-storage-server", @@ -3066,9 +3066,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.167" +version = "1.0.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" +checksum = "d614f89548720367ded108b3c843be93f3a341e22d5674ca0dd5cd57f34926af" dependencies = [ "serde_derive", ] @@ -3105,9 +3105,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.167" +version = "1.0.168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" +checksum = "d4fe589678c688e44177da4f27152ee2d190757271dc7f1d5b6b9f68d869d641" dependencies = [ "proc-macro2", "quote", @@ -3311,7 +3311,7 @@ dependencies = [ [[package]] name = "sphinx-auther" version = "0.1.12" -source = "git+https://github.com/stakwork/sphinx-rs?rev=38d7fa25e860b61a813ca8c3fad17f699daf2f08#38d7fa25e860b61a813ca8c3fad17f699daf2f08" +source = "git+https://github.com/stakwork/sphinx-rs?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" dependencies = [ "anyhow", "base64 0.13.1", @@ -3323,7 +3323,7 @@ dependencies = [ [[package]] name = "sphinx-glyph" version = "0.1.2" -source = "git+https://github.com/stakwork/sphinx-rs?rev=38d7fa25e860b61a813ca8c3fad17f699daf2f08#38d7fa25e860b61a813ca8c3fad17f699daf2f08" +source = "git+https://github.com/stakwork/sphinx-rs?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" dependencies = [ "anyhow", "hex", @@ -3369,7 +3369,7 @@ dependencies = [ [[package]] name = "sphinx-signer" version = "0.1.0" -source = "git+https://github.com/stakwork/sphinx-rs?rev=38d7fa25e860b61a813ca8c3fad17f699daf2f08#38d7fa25e860b61a813ca8c3fad17f699daf2f08" +source = "git+https://github.com/stakwork/sphinx-rs?rev=be14ee70477f8e99f70f17d7cee6b30741a2ffca#be14ee70477f8e99f70f17d7cee6b30741a2ffca" dependencies = [ "anyhow", "bip39", diff --git a/broker/Cargo.toml b/broker/Cargo.toml index 571ac32..4a7a91e 100644 --- a/broker/Cargo.toml +++ b/broker/Cargo.toml @@ -35,8 +35,8 @@ vls-protocol = { git = "https://gitlab.com/lightning-signer/validating-li 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 = "e199c70cbacd3404e7cecf95bb75ca02afd4cffd" } -lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "38d7fa25e860b61a813ca8c3fad17f699daf2f08" } -sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "38d7fa25e860b61a813ca8c3fad17f699daf2f08" } +lss-connector = { git = "https://github.com/stakwork/sphinx-rs", rev = "be14ee70477f8e99f70f17d7cee6b30741a2ffca" } +sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs", rev = "be14ee70477f8e99f70f17d7cee6b30741a2ffca" } # 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 a86c0c0..e43f0d2 100644 --- a/broker/src/lss.rs +++ b/broker/src/lss.rs @@ -36,7 +36,7 @@ async fn send_init( mqtt_tx: &mpsc::Sender, ) -> Result { let reply = ChannelRequest::send(topics::INIT_1_MSG, msg_bytes, &mqtt_tx).await?; - let ir = Response::from_slice(&reply)?.as_init()?; + let ir = Response::from_slice(&reply)?.into_init()?; Ok(ir) } @@ -45,7 +45,7 @@ async fn send_created( mqtt_tx: &mpsc::Sender, ) -> Result { let reply2 = ChannelRequest::send(topics::INIT_2_MSG, msg_bytes, &mqtt_tx).await?; - let cr = Response::from_slice(&reply2)?.as_created()?; + let cr = Response::from_slice(&reply2)?.into_created()?; Ok(cr) } @@ -112,7 +112,7 @@ async fn dance_step_1( ) -> Result { let init_bytes = lss_conn.make_init_msg().await?; let reply = ChannelRequest::send_for(cid, topics::INIT_1_MSG, init_bytes, mqtt_tx).await?; - let ir = Response::from_slice(&reply)?.as_init()?; + let ir = Response::from_slice(&reply)?.into_init()?; Ok(ir) } @@ -124,7 +124,7 @@ async fn dance_step_2( ) -> Result<()> { let state_bytes = lss_conn.get_created_state_msg(ir).await?; let reply2 = ChannelRequest::send_for(cid, topics::INIT_2_MSG, state_bytes, mqtt_tx).await?; - let cr = Response::from_slice(&reply2)?.as_created()?; + let cr = Response::from_slice(&reply2)?.into_created()?; lss_conn.handle(Response::Created(cr)).await?; Ok(()) } diff --git a/sphinx-key/Cargo.toml b/sphinx-key/Cargo.toml index d76d71b..12e1194 100644 --- a/sphinx-key/Cargo.toml +++ b/sphinx-key/Cargo.toml @@ -19,10 +19,10 @@ serde_json = { version = "1.0.81", default-features = false } serde_urlencoded = "0.7.1" url = "2" -lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "38d7fa25e860b61a813ca8c3fad17f699daf2f08" } +lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false, rev = "be14ee70477f8e99f70f17d7cee6b30741a2ffca" } # lss-connector = { path = "../../sphinx-rs/lss-connector", default-features = false } -sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "38d7fa25e860b61a813ca8c3fad17f699daf2f08" } -sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "38d7fa25e860b61a813ca8c3fad17f699daf2f08" } +sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git", rev = "be14ee70477f8e99f70f17d7cee6b30741a2ffca" } +sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = true, rev = "be14ee70477f8e99f70f17d7cee6b30741a2ffca" } # sphinx-signer = { path = "../../sphinx-rs/signer", optional = true } anyhow.workspace = true diff --git a/sphinx-key/src/core/events.rs b/sphinx-key/src/core/events.rs index cee98db..504e0f0 100644 --- a/sphinx-key/src/core/events.rs +++ b/sphinx-key/src/core/events.rs @@ -235,7 +235,7 @@ fn restart_esp_if_memory_low() { unsafe { let size = esp_idf_sys::heap_caps_get_free_size(4); let block = esp_idf_sys::heap_caps_get_largest_free_block(4); - let threshold = 35000; + let threshold = 25000; log::info!( "Available DRAM: {}, Max block: {}, Restart Threshold: {}", size, diff --git a/sphinx-key/src/core/lss.rs b/sphinx-key/src/core/lss.rs index fd82129..7563d38 100644 --- a/sphinx-key/src/core/lss.rs +++ b/sphinx-key/src/core/lss.rs @@ -50,7 +50,7 @@ pub fn init_lss( fn server_pubkey_from_event(event: Event) -> anyhow::Result { match event { Event::LssMessage(b) => { - let init = LssMsg::from_slice(&b)?.as_init()?; + let init = LssMsg::from_slice(&b)?.into_init()?; let server_pubkey = PublicKey::from_slice(&init.server_pubkey)?; Ok(server_pubkey) } @@ -59,7 +59,7 @@ fn server_pubkey_from_event(event: Event) -> anyhow::Result { } fn created_from_event(event: Event) -> anyhow::Result { match event { - Event::LssMessage(b) => Ok(LssMsg::from_slice(&b)?.as_created()?), + Event::LssMessage(b) => Ok(LssMsg::from_slice(&b)?.into_created()?), _ => Err(anyhow!("not an LSS msg")), } } diff --git a/sphinx-key/up.sh b/sphinx-key/up.sh index 3ef4465..61faa21 100755 --- a/sphinx-key/up.sh +++ b/sphinx-key/up.sh @@ -69,5 +69,5 @@ else cargo build fi && esptool.py --chip esp32-c3 elf2image ../target/riscv32imc-esp-espidf/$MODE/sphinx-key && -esptool.py --chip esp32c3 -b 460800 --before=default_reset --after=hard_reset write_flash --flash_mode dio --flash_freq 40m --flash_size 4MB 0x80000 ../target/riscv32imc-esp-espidf/$MODE/sphinx-key.bin && +esptool.py --chip esp32c3 -b 460800 --before=default_reset --after=hard_reset write_flash --flash_mode dio --flash_freq 40m --flash_size 4MB 0x90000 ../target/riscv32imc-esp-espidf/$MODE/sphinx-key.bin && cargo espflash monitor --port $PORT