diff --git a/signer/Cargo.toml b/signer/Cargo.toml index 7a74189..eb0ed15 100644 --- a/signer/Cargo.toml +++ b/signer/Cargo.toml @@ -6,6 +6,7 @@ edition = "2018" [dependencies] sphinx-key-parser = { path = "../parser" } +# vls-protocol-signer = { path = "../../../evanf/validating-lightning-signer/vls-protocol-signer", default-features = false, features = ["std", "secp-lowmemory"] } vls-protocol-signer = { git = "https://gitlab.com/lightning-signer/validating-lightning-signer", default-features = false, features = ["secp-lowmemory"] } anyhow = {version = "1", features = ["backtrace"]} log = "0.4" diff --git a/signer/src/lib.rs b/signer/src/lib.rs index 7d36d50..435f830 100644 --- a/signer/src/lib.rs +++ b/signer/src/lib.rs @@ -1,13 +1,13 @@ -pub use lightning_signer::persist::{DummyPersister, Persist}; -pub use lightning_signer::Arc as SignerArc; +use lightning_signer::persist::{DummyPersister, Persist}; +use lightning_signer::Arc as SignerArc; use sphinx_key_parser::MsgDriver; use vls_protocol::msgs::{read_serial_request_header, write_serial_response_header, Message}; -use vls_protocol_signer::lightning_signer; -use vls_protocol_signer::vls_protocol; -pub use vls_protocol::{msgs, model::{PubKey, Secret}}; -pub use vls_protocol_signer::handler::{Handler, RootHandler}; -pub use vls_protocol::serde_bolt::WireString; +use vls_protocol::{model::PubKey, msgs, serde_bolt::WireString}; +use vls_protocol_signer::handler::{Handler, RootHandler}; + pub use sphinx_key_parser as parser; +pub use vls_protocol_signer::lightning_signer; +pub use vls_protocol_signer::vls_protocol; pub struct InitResponse { pub root_handler: RootHandler, diff --git a/sphinx-key/src/core/events.rs b/sphinx-key/src/core/events.rs index 607e997..30f5803 100644 --- a/sphinx-key/src/core/events.rs +++ b/sphinx-key/src/core/events.rs @@ -1,5 +1,6 @@ use crate::conn::mqtt::{RETURN_TOPIC, TOPIC, QOS}; -use sphinx_key_signer::{self, InitResponse, PubKey}; +use sphinx_key_signer::{self, InitResponse}; +use sphinx_key_signer::vls_protocol::model::PubKey; use std::sync::mpsc; use esp_idf_sys; diff --git a/sphinx-key/src/tiny.rs b/sphinx-key/src/tiny.rs index 0f01e33..980e9f0 100644 --- a/sphinx-key/src/tiny.rs +++ b/sphinx-key/src/tiny.rs @@ -1,12 +1,29 @@ #![feature(once_cell)] -use sphinx_key_signer::{self, DummyPersister, Persist, RootHandler, SignerArc}; +use lightning_signer::node::{NodeConfig}; +use lightning_signer::signer::derive::KeyDerivationStyle; +use lightning_signer::signer::my_keys_manager::MyKeysManager; +use std::time::Duration; +use sphinx_key_signer::lightning_signer; +use sphinx_key_signer::lightning_signer::bitcoin::Network; fn main() -> anyhow::Result<()> { esp_idf_sys::link_patches(); + + let network = Network::Regtest; + let config = NodeConfig { network, key_derivation_style: KeyDerivationStyle::Native }; - let persister: SignerArc = SignerArc::new(DummyPersister); - let rh = RootHandler::new(0, Some([0; 32]), persister, Vec::new()); + let seed = [0; 32]; + + let now = Duration::from_secs(1); + let keys_manager = MyKeysManager::new( + config.key_derivation_style, + &seed[..], + config.network, + now.as_secs(), + now.subsec_nanos(), + ); Ok(()) } +