df2f3d340f
* fix popularity contest * more info in the Debug for Web3Rpc * add frontend_requests and cache_misses to the Balance query * add more to balance and stats flushing and improved test coverage * it compiles * deserializer for Ulid to Uuid I think a wrapper type on Ulid that implements sea_orm::Value is probably better * rename variable to match struct name * add deserializer for Address -> Vec<u8> * sql sum returns a Decimal. need to convert to u64 * assert more * one log and assert more * log more * use a helper to get the user's rpc provider * this should be 2 now that we have a public and authed call * this should be zero. the public has the cache miss * instrument cu calcs * trace the value we took, not the default that replaced it * move usd_per_chain into config * remove some extra logging * use Arc::into_inner to maybe avoid a race * off by 1 * pass paid credits used instead of returning it this lets us use it to write to our user balance cache first. importantly, this keeps us from holding a write lock while writing to mysql * no cache misses expected in this test * actually check the admin * put the balance checks back now that the rest of the test works * archive request is being set incorrectly * wow howd we manage flipping the greater than sign on archive depth * move latest_balance and premium_credits_used to before any stats are emitted * lint * and build undoes the linting. fun i didnt even want to lint them in the first place, so this is fine * missed incrementing total_spent when not incrementing total_spent_paid_credits * use the credits on self * use the credits on self (pt 2) * fix type for 10 cu query * convert the requestmetadata on the other side of the channel * logs * viewing stats is allowed even without a balance * move paid_credits_used to AuthorizationChecks * wip * test_sum_credits_used finally passes * UserBalanceCache::get_or_insert * re-enable rpc_secret_key_cache * move invalidate to a helper function and always call it **after** the db is commited * fix PartialEq and Eq on RpcSecretKey * cargo upgrade
83 lines
2.2 KiB
Rust
83 lines
2.2 KiB
Rust
use std::time::Duration;
|
|
|
|
use crate::TestApp;
|
|
use serde::Deserialize;
|
|
use tracing::info;
|
|
use ulid::Ulid;
|
|
use web3_proxy::{
|
|
frontend::users::authentication::LoginPostResponse,
|
|
rpcs::provider::{connect_http, EthersHttpProvider},
|
|
};
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
pub struct RpcKeyResponse {
|
|
pub user_id: u64,
|
|
pub user_rpc_keys: std::collections::HashMap<String, RpcKey>,
|
|
}
|
|
|
|
#[derive(Debug, Deserialize)]
|
|
pub struct RpcKey {
|
|
pub active: bool,
|
|
pub allowed_ips: Option<serde_json::Value>,
|
|
pub allowed_origins: Option<serde_json::Value>,
|
|
pub allowed_referers: Option<serde_json::Value>,
|
|
pub allowed_user_agents: Option<serde_json::Value>,
|
|
pub description: Option<serde_json::Value>,
|
|
pub id: u64,
|
|
pub log_revert_chance: f64,
|
|
pub private_txs: bool,
|
|
pub role: String,
|
|
pub secret_key: Ulid,
|
|
pub user_id: u64,
|
|
}
|
|
|
|
/// Helper function to get the user's balance
|
|
#[allow(unused)]
|
|
pub async fn user_get_first_rpc_key(
|
|
x: &TestApp,
|
|
r: &reqwest::Client,
|
|
login_response: &LoginPostResponse,
|
|
) -> RpcKey {
|
|
// TODO: refactor to use login_response? or compare?
|
|
let get_keys = format!("{}user/keys", x.proxy_provider.url());
|
|
|
|
info!("Get balance");
|
|
let rpc_key_response = r
|
|
.get(get_keys)
|
|
.bearer_auth(login_response.bearer_token)
|
|
.send()
|
|
.await
|
|
.unwrap();
|
|
info!(?rpc_key_response);
|
|
|
|
let rpc_key_response = rpc_key_response.json::<serde_json::Value>().await.unwrap();
|
|
info!(?rpc_key_response);
|
|
|
|
info!("Parsing rpc key as json");
|
|
let rpc_key: RpcKeyResponse = serde_json::from_value(rpc_key_response).unwrap();
|
|
info!(?rpc_key);
|
|
|
|
rpc_key.user_rpc_keys.into_iter().next().unwrap().1
|
|
}
|
|
|
|
#[allow(unused)]
|
|
pub async fn user_get_provider(
|
|
x: &TestApp,
|
|
r: &reqwest::Client,
|
|
login_response: &LoginPostResponse,
|
|
) -> anyhow::Result<EthersHttpProvider> {
|
|
let first_key = login_response.rpc_keys.iter().next().unwrap().1;
|
|
|
|
let rpc_url = format!(
|
|
"{}rpc/{}",
|
|
x.proxy_provider.url(),
|
|
Ulid::from(first_key.secret_key)
|
|
);
|
|
|
|
connect_http(
|
|
rpc_url.parse().unwrap(),
|
|
Some(r.clone()),
|
|
Duration::from_secs(1),
|
|
)
|
|
}
|