From 1a7d4c9cbbca963c69755140ab2016dd9b400d01 Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Mon, 26 Jun 2023 21:09:33 -0700 Subject: [PATCH] handle subscriptions and unimplemented this also means we handle new methods that haven't been added to our list as only 2 cu --- web3_proxy/src/compute_units.rs | 14 ++++++++++---- web3_proxy/src/stats/mod.rs | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/web3_proxy/src/compute_units.rs b/web3_proxy/src/compute_units.rs index a217af2d..3a7653ab 100644 --- a/web3_proxy/src/compute_units.rs +++ b/web3_proxy/src/compute_units.rs @@ -14,7 +14,12 @@ pub struct ComputeUnit(Decimal); impl ComputeUnit { /// costs can vary widely depending on method and chain - pub fn new(method: &str, chain_id: u64) -> Self { + pub fn new(method: &str, chain_id: u64, response_bytes: u64) -> Self { + // TODO: this works, but this is fragile. think of a better way to check the method is a subscription + if method.ends_with(')') { + return Self::subscription_response(response_bytes); + } + let cu = match (chain_id, method) { (_, "debug_traceTransaction") => 309, (_, "debug_traceCall") => 309, @@ -96,9 +101,8 @@ impl ComputeUnit { (_, "eth_getUserOperationReceipt") => 15, (_, "eth_supportedEntryPoints") => 5, (_, method) => { - // default to 10 CU for methods that aren't included here warn!("unknown method {}", method); - 10 + return Self::unimplemented(); } }; @@ -123,13 +127,15 @@ impl ComputeUnit { /// All methods cost the same /// The number of bytes are based on input, and output bytes pub fn cost(&self, archive_request: bool, cache_hit: bool, usd_per_cu: Decimal) -> Decimal { + // TODO: server errors are free. need to split server and user errors + let mut cost = self.0 * usd_per_cu; if archive_request { cost *= Decimal::from_str("2.5").unwrap(); } - // cache hits get a 50% discount + // cache hits get a 25% discount if cache_hit { cost *= Decimal::from_str("0.75").unwrap() } diff --git a/web3_proxy/src/stats/mod.rs b/web3_proxy/src/stats/mod.rs index 3d73646c..35f85a2b 100644 --- a/web3_proxy/src/stats/mod.rs +++ b/web3_proxy/src/stats/mod.rs @@ -810,7 +810,7 @@ impl TryFrom for RpcQueryStats { x => x, }; - let cu = ComputeUnit::new(&metadata.method, metadata.chain_id); + let cu = ComputeUnit::new(&metadata.method, metadata.chain_id, response_bytes); // TODO: get from config? a helper function? how should we pick this? let usd_per_cu = match metadata.chain_id {