sproxy: Migrate from tokio-based implementation to sync implementation#629
Merged
cdecker merged 4 commits intoBlockstream:mainfrom Nov 11, 2025
Conversation
Replace tokio async I/O with std synchronous I/O in wire.rs: - Remove tokio::net::UnixStream, use std::os::unix::net::UnixStream - Remove tokio::sync::Mutex, use std::sync::Mutex - Convert async read/write methods to blocking - Replace AsyncReadExt/AsyncWriteExt with std::io Read/Write - Manually handle 4-byte length prefix with BigEndian read/write This is Phase 1 of removing old tokio 0.2 dependency and converting the gl-signerproxy subdaemon to use standard library threading instead of async/await. The passfd FD passing implementation works naturally with blocking sockets.
Replace async tokio tasks with standard library threads: - Convert async fn run() to synchronous fn run() - Convert async fn process_requests() to synchronous - Replace tokio::spawn() with std::thread::spawn() - Create dedicated tokio Runtime for gRPC operations only - Use runtime.block_on() to execute gRPC calls (ping, request) - Remove TokioUnixStream, use std::os::unix::net::UnixStream directly - Pass Arc<Runtime> to all handlers for gRPC operations - All socket I/O is now blocking (no .await) The gRPC client still requires tokio internally, so we create a minimal single-threaded runtime and use it only for gRPC operations via block_on(). This allows us to remove the tokio async runtime from everywhere except where strictly necessary for tonic.
…(Phase 3 & 4) Phase 3 - Upgrade dependencies to modern versions: - tokio: 0.2 -> 1.x with minimal features (rt, net, io-util only) - tonic: 0.3 -> 0.8 (matches workspace) - prost: 0.6 -> 0.11 (matches workspace) - tonic-build: 0.3 -> 0.8 (matches workspace) - tower: 0.3 -> 0.4 (matches workspace) Phase 4 - Remove async from entry points: - lib.rs: Remove async from Proxy::run() - signerproxy.rs: Remove #[tokio::main] and async from main() The subdaemon now uses only std threading with a minimal tokio runtime exclusively for gRPC operations. No more old tokio 0.2 dependency and no async/await except where required by tonic.
Disable the cln-grpc plugin for standard CLN test nodes created via node_factory to prevent port conflicts with GL nodes. GL nodes already have cln-grpc disabled in favor of gl-plugin, but standard test nodes (e.g., created via node_factory.line_graph()) were still running cln-grpc, which could cause port collisions during tests. This ensures consistent behavior across all test nodes.
cdecker
force-pushed
the
claude/gl-signerproxy-cln-subdaemon-011CUpYwEFUedqadL8eVo7Rg
branch
from
8f4601d to
b2f95da
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The use of the
passfdcrate meant that we could not upgrade past the tokio==0.3 dependency. Then again the async nature of the whole daemon was not really necessary. Claude went and replaced the async UnixStream + PassFD implementation to sync threads, while still keeping the tokio dependency, but freed from its constraints, for the grpc communication with the plugin.