tornadocontrib/web3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new heads subscription works

Browse Source
This commit is contained in:
Bryan Stitt 2022-06-05 22:39:44 +00:00
parent 3abfeaab0b
commit 2243cacf70
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web3-proxy/src/app.rs
View File

@ -158,13 +158,12 @@ impl Web3ProxyApp {
let f = {
let subscription_id = subscription_id.clone();
let id = payload.id;
let params = payload.params.as_deref().unwrap().get();
if params == r#"["newHeads"]"# {
let head_block_receiver = self.head_block_receiver.clone();
info!("received new heads subscription");
trace!(?subscription_id, "new heads subscription");
async move {
let mut head_block_receiver = Abortable::new(
WatchStream::new(head_block_receiver),
@ -172,9 +171,8 @@ impl Web3ProxyApp {
);
while let Some(new_head) = head_block_receiver.next().await {
// TODO: make a struct for this? using JsonRpcForwardedResponse
// TODO: make a struct for this? using JsonRpcForwardedResponse won't work because it needs an id
let msg = json!({
"id": id,
"jsonrpc": "2.0",
"method":"eth_subscription",
"params": {
@ -185,8 +183,13 @@ impl Web3ProxyApp {
let msg = Message::Text(serde_json::to_string(&msg).unwrap());
subscription_tx.send_async(msg).await.unwrap();
if subscription_tx.send_async(msg).await.is_err() {
// TODO: cancel this subscription earlier? select on head_block_receiver.next() and an abort handle?
break;
};
}
trace!(?subscription_id, "closed new heads subscription");
}
} else {
return Err(anyhow::anyhow!("unimplemented"));

2
web3-proxy/src/config.rs
View File

@ -13,7 +13,7 @@ pub struct CliConfig {
#[argh(option, default = "8544")]
pub port: u16,
/// number of worker threads
/// number of worker threads. Defaults to the number of logical processors
#[argh(option, default = "0")]
pub workers: usize,

6
web3-proxy/src/frontend/errors.rs
View File

@ -12,12 +12,12 @@ pub async fn handler_404() -> impl IntoResponse {
/// handle errors by converting them into something that implements `IntoResponse`
/// TODO: use this. i can't get https://docs.rs/axum/latest/axum/error_handling/index.html to work
/// TODO: i think we want a custom result type instead. put the anyhow result inside. then `impl IntoResponse for CustomResult`
pub async fn handle_anyhow_error(
err: anyhow::Error,
code: Option<StatusCode>,
) -> impl IntoResponse {
// TODO: what id can we use? how do we make sure the incoming id gets attached to this?
let id = RawValue::from_string("0".to_string()).unwrap();
let id = RawValue::from_string("null".to_string()).unwrap();
let err = JsonRpcForwardedResponse::from_anyhow_error(err, id);
@ -27,5 +27,3 @@ pub async fn handle_anyhow_error(
(code, Json(err))
}
// i think we want a custom result type. it has an anyhow result inside. if it impl IntoResponse I think we'll get this for free

2
web3-proxy/src/frontend/ws_proxy.rs
View File

@ -83,7 +83,7 @@ async fn handle_socket_payload(
}
Err(err) => {
// TODO: what should this id be?
let id = RawValue::from_string("0".to_string()).unwrap();
let id = RawValue::from_string("null".to_string()).unwrap();
(id, Err(err.into()))
}
};

4
web3-proxy/src/jsonrpc.rs
View File

@ -193,7 +193,9 @@ impl JsonRpcForwardedResponse {
pub fn from_string(partial_response: String, id: Box<RawValue>) -> Self {
trace!("partial_response: {}", partial_response);
let partial_response = RawValue::from_string(partial_response).unwrap();
// TODO: anyhow result on this
// TODO: proper escaping. this feels wrong. probably refactor to not need this at all
let partial_response = RawValue::from_string(format!(r#""{}""#, partial_response)).unwrap();
Self::from_response(partial_response, id)
}