Merge 'master' into refactor/restructure-project

diff --cc Cargo.lock
index 40d97a644b352b77104e00b96bd5c04c2e20a711,992f3c633f59758ecf67ac8c01d3130e79181100..83faa43ffe3989788c0ee72a0022583d494e7a80
--- 1/Cargo.lock
--- 2/Cargo.lock
+++ b/Cargo.lock
@@@ -121,9 -121,9 +121,9 @@@ dependencies = 
  
  [[package]]
  name = "arrayvec"
- version = "0.7.6"
 -version = "0.7.7"
++version = "0.7.8"
  source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 -checksum = "f02882884d3e1bc524fb12c79f107f6ad0e1cfd498c536ffb494301740995dfe"
++checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56"
  
  [[package]]
  name = "async-trait"
@@@ -647,6 -660,6 +660,17 @@@ dependencies = 
   "cpufeatures 0.2.17",
  ]
  
++[[package]]
++name = "chacha20"
++version = "0.10.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81"
++dependencies = [
++ "cfg-if",
++ "cpufeatures 0.3.0",
++ "rand_core 0.10.1",
++]
++
  [[package]]
  name = "chacha20-poly1305"
  version = "0.1.2"
@@@ -867,6 -876,6 +887,15 @@@ dependencies = 
   "libc",
  ]
  
++[[package]]
++name = "cpufeatures"
++version = "0.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
++dependencies = [
++ "libc",
++]
++
  [[package]]
  name = "crunchy"
  version = "0.2.4"
@@@ -924,6 -933,38 +953,37 @@@ dependencies = 
   "cipher 0.3.0",
  ]
  
 -version = "1.1.0"
+ [[package]]
+ name = "defmt"
 -checksum = "a6e524506490a1953d237cb87b1cfc1e46f88c18f10a22dfe0f507dc6bfc7f7f"
++version = "1.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
 -version = "1.1.0"
++checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1"
+ dependencies = [
+  "bitflags 1.3.2",
+  "defmt-macros",
+ ]
+ 
+ [[package]]
+ name = "defmt-macros"
 -checksum = "f0a27770e9c8f719a79d8b638281f4d828f77d8fd61e0bd94451b9b85e576a0b"
++version = "1.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
 - "proc-macro-error2",
++checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8"
+ dependencies = [
+  "defmt-parser",
+  "proc-macro2",
+  "quote",
+  "syn",
+ ]
+ 
+ [[package]]
+ name = "defmt-parser"
+ version = "1.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e"
+ dependencies = [
+  "thiserror 2.0.18",
+ ]
+ 
  [[package]]
  name = "digest"
  version = "0.9.0"
@@@ -1227,11 -1267,22 +1286,23 @@@ source = "registry+https://github.com/r
  checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
  dependencies = [
   "cfg-if",
-- "js-sys",
   "libc",
-  "r-efi",
+  "r-efi 5.3.0",
   "wasip2",
 - "wasm-bindgen",
+ ]
+ 
+ [[package]]
+ name = "getrandom"
+ version = "0.4.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
+ dependencies = [
+  "cfg-if",
++ "js-sys",
+  "libc",
+  "r-efi 6.0.0",
++ "rand_core 0.10.1",
 + "wasm-bindgen",
  ]
  
  [[package]]
@@@ -2098,18 -2153,18 +2151,19 @@@ dependencies = 
  
  [[package]]
  name = "quinn-proto"
- version = "0.11.14"
 -version = "0.11.15"
++version = "0.11.16"
  source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098"
 -checksum = "4fcb935c5bec503c2f0e306bdd3e58bb9029dcb14fa8d9ac76e3a5256ac0763e"
++checksum = "2f4bfc015262b9df63c8845072ce59068853ff5872180c2ce2f13038b970e560"
  dependencies = [
   "aws-lc-rs",
   "bytes",
-- "getrandom 0.3.4",
++ "getrandom 0.4.3",
   "lru-slab",
-- "rand 0.9.4",
++ "rand 0.10.2",
++ "rand_pcg",
   "ring",
   "rustc-hash",
-  "rustls 0.23.36",
+  "rustls 0.23.41",
   "rustls-pki-types",
   "slab",
   "thiserror 2.0.18",
@@@ -2120,16 -2175,16 +2174,16 @@@
  
  [[package]]
  name = "quinn-udp"
--version = "0.5.14"
++version = "0.5.15"
  source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
++checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694"
  dependencies = [
   "cfg_aliases",
   "libc",
   "once_cell",
   "socket2",
   "tracing",
-- "windows-sys 0.60.2",
++ "windows-sys 0.61.2",
  ]
  
  [[package]]
@@@ -2147,25 -2202,31 +2201,32 @@@ version = "5.3.0
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
  
+ [[package]]
+ name = "r-efi"
+ version = "6.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+ 
  [[package]]
  name = "rand"
- version = "0.8.5"
+ version = "0.8.6"
  source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+ checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
  dependencies = [
   "libc",
-- "rand_chacha 0.3.1",
++ "rand_chacha",
   "rand_core 0.6.4",
  ]
  
  [[package]]
  name = "rand"
--version = "0.9.4"
++version = "0.10.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea"
++checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80"
  dependencies = [
-- "rand_chacha 0.9.0",
-- "rand_core 0.9.5",
++ "chacha20 0.10.1",
++ "getrandom 0.4.3",
++ "rand_core 0.10.1",
  ]
  
  [[package]]
@@@ -2178,16 -2239,16 +2239,6 @@@ dependencies = 
   "rand_core 0.6.4",
  ]
  
--[[package]]
--name = "rand_chacha"
--version = "0.9.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
--dependencies = [
-- "ppv-lite86",
-- "rand_core 0.9.5",
--]
--
  [[package]]
  name = "rand_core"
  version = "0.6.4"
@@@ -2199,11 -2260,11 +2250,17 @@@ dependencies = 
  
  [[package]]
  name = "rand_core"
--version = "0.9.5"
++version = "0.10.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
++checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
++
++[[package]]
++name = "rand_pcg"
++version = "0.10.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
++checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a"
  dependencies = [
-- "getrandom 0.3.4",
++ "rand_core 0.10.1",
  ]
  
  [[package]]
@@@ -2370,9 -2431,18 +2427,18 @@@ dependencies = 
  
  [[package]]
  name = "rustc-hash"
--version = "2.1.2"
++version = "2.1.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
++checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
+ 
+ [[package]]
+ name = "rustc_version"
+ version = "0.4.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+ dependencies = [
+  "semver",
+ ]
  
  [[package]]
  name = "rustix"
@@@ -3358,16 -3436,16 +3432,7 @@@ version = "0.52.0
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
  dependencies = [
-- "windows-targets 0.52.6",
--]
--
--[[package]]
--name = "windows-sys"
--version = "0.60.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
--dependencies = [
-- "windows-targets 0.53.5",
++ "windows-targets",
  ]
  
  [[package]]
@@@ -3400,176 -3463,134 +3450,69 @@@ version = "0.52.6
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
  dependencies = [
-- "windows_aarch64_gnullvm 0.52.6",
-- "windows_aarch64_msvc 0.52.6",
-- "windows_i686_gnu 0.52.6",
-- "windows_i686_gnullvm 0.52.6",
-- "windows_i686_msvc 0.52.6",
-- "windows_x86_64_gnu 0.52.6",
-- "windows_x86_64_gnullvm 0.52.6",
-- "windows_x86_64_msvc 0.52.6",
--]
--
--[[package]]
--name = "windows-targets"
--version = "0.53.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
--dependencies = [
-- "windows-link",
-- "windows_aarch64_gnullvm 0.53.1",
-- "windows_aarch64_msvc 0.53.1",
-- "windows_i686_gnu 0.53.1",
-- "windows_i686_gnullvm 0.53.1",
-- "windows_i686_msvc 0.53.1",
-- "windows_x86_64_gnu 0.53.1",
-- "windows_x86_64_gnullvm 0.53.1",
-- "windows_x86_64_msvc 0.53.1",
++ "windows_aarch64_gnullvm",
++ "windows_aarch64_msvc",
++ "windows_i686_gnu",
++ "windows_i686_gnullvm",
++ "windows_i686_msvc",
++ "windows_x86_64_gnu",
++ "windows_x86_64_gnullvm",
++ "windows_x86_64_msvc",
  ]
  
- [[package]]
- name = "windows_aarch64_gnullvm"
- version = "0.42.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
- 
  [[package]]
  name = "windows_aarch64_gnullvm"
  version = "0.52.6"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
  
--[[package]]
--name = "windows_aarch64_gnullvm"
--version = "0.53.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
- 
- [[package]]
- name = "windows_aarch64_msvc"
- version = "0.42.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
--
  [[package]]
  name = "windows_aarch64_msvc"
  version = "0.52.6"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
  
--[[package]]
--name = "windows_aarch64_msvc"
--version = "0.53.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
- 
- [[package]]
- name = "windows_i686_gnu"
- version = "0.42.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
--
  [[package]]
  name = "windows_i686_gnu"
  version = "0.52.6"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
  
--[[package]]
--name = "windows_i686_gnu"
--version = "0.53.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
--
  [[package]]
  name = "windows_i686_gnullvm"
  version = "0.52.6"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
  
--[[package]]
--name = "windows_i686_gnullvm"
--version = "0.53.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
- 
- [[package]]
- name = "windows_i686_msvc"
- version = "0.42.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
--
  [[package]]
  name = "windows_i686_msvc"
  version = "0.52.6"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
  
--[[package]]
--name = "windows_i686_msvc"
--version = "0.53.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
- 
- [[package]]
- name = "windows_x86_64_gnu"
- version = "0.42.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
--
  [[package]]
  name = "windows_x86_64_gnu"
  version = "0.52.6"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
  
--[[package]]
--name = "windows_x86_64_gnu"
--version = "0.53.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
- 
- [[package]]
- name = "windows_x86_64_gnullvm"
- version = "0.42.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
--
  [[package]]
  name = "windows_x86_64_gnullvm"
  version = "0.52.6"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
  
--[[package]]
--name = "windows_x86_64_gnullvm"
--version = "0.53.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
- 
- [[package]]
- name = "windows_x86_64_msvc"
- version = "0.42.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
--
  [[package]]
  name = "windows_x86_64_msvc"
  version = "0.52.6"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
  
--[[package]]
--name = "windows_x86_64_msvc"
--version = "0.53.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
--
  [[package]]
  name = "winnow"
- version = "1.0.0"
+ version = "1.0.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8"
+ checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
  
  [[package]]
  name = "wit-bindgen"

diff --cc Cargo.toml
index 0db04f3f69933a1b6c6ec96cdeac0497851eb39a,04a713f96ce98d391a8b8b0efc1e2e6dd2dba432..825cd31d3398b9b0e213bfcd6304ef34b00df805
--- 1/Cargo.toml
--- 2/Cargo.toml
+++ b/Cargo.toml
@@@ -26,6 -26,8 +26,7 @@@ tracing = "0.1.44
  tracing-subscriber = "0.3.20"
  toml = "1.1.0"
  serde= {version = "1.0", features = ["derive"]}
 -shlex = "1.3.0"
+ tap = "1.0.1"
  
  # Optional dependencies
  bdk_bitcoind_rpc = { version = "0.22.0", features = ["std"], optional = true }

diff --cc README.md
Simple merge