2023-05-31 07:26:11 +03:00
|
|
|
use crate::errors::{Web3ProxyError, Web3ProxyResult};
|
2023-05-31 02:32:34 +03:00
|
|
|
use crate::relational_db::{DatabaseConnection, DatabaseReplica};
|
2023-10-11 12:00:50 +03:00
|
|
|
use crate::{app::App, user_token::UserBearerToken};
|
2023-01-26 08:24:09 +03:00
|
|
|
use anyhow::Context;
|
|
|
|
use axum::{
|
|
|
|
headers::{authorization::Bearer, Authorization},
|
|
|
|
TypedHeader,
|
|
|
|
};
|
|
|
|
use chrono::{NaiveDateTime, Utc};
|
|
|
|
use entities::login;
|
|
|
|
use hashbrown::HashMap;
|
2023-05-31 02:32:34 +03:00
|
|
|
use migration::sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
|
2023-01-26 08:24:09 +03:00
|
|
|
use redis_rate_limiter::{redis::AsyncCommands, RedisConnection};
|
2023-06-24 02:28:45 +03:00
|
|
|
use tracing::{trace, warn};
|
2023-01-26 08:24:09 +03:00
|
|
|
|
|
|
|
/// get the attached address for the given bearer token.
|
|
|
|
/// First checks redis. Then checks the database.
|
|
|
|
/// 0 means all users.
|
|
|
|
/// This authenticates that the bearer is allowed to view this user_id's stats
|
|
|
|
pub async fn get_user_id_from_params(
|
|
|
|
redis_conn: &mut RedisConnection,
|
|
|
|
db_conn: &DatabaseConnection,
|
|
|
|
db_replica: &DatabaseReplica,
|
|
|
|
// this is a long type. should we strip it down?
|
|
|
|
bearer: Option<TypedHeader<Authorization<Bearer>>>,
|
|
|
|
params: &HashMap<String, String>,
|
2023-03-17 05:38:11 +03:00
|
|
|
) -> Web3ProxyResult<u64> {
|
2023-01-26 08:24:09 +03:00
|
|
|
match (bearer, params.get("user_id")) {
|
|
|
|
(Some(TypedHeader(Authorization(bearer))), Some(user_id)) => {
|
|
|
|
// check for the bearer cache key
|
|
|
|
let user_bearer_token = UserBearerToken::try_from(bearer)?;
|
|
|
|
|
|
|
|
let user_redis_key = user_bearer_token.redis_key();
|
|
|
|
|
|
|
|
let mut save_to_redis = false;
|
|
|
|
|
|
|
|
// get the user id that is attached to this bearer token
|
|
|
|
let bearer_user_id = match redis_conn.get::<_, u64>(&user_redis_key).await {
|
|
|
|
Err(_) => {
|
|
|
|
// TODO: inspect the redis error? if redis is down we should warn
|
|
|
|
// this also means redis being down will not kill our app. Everything will need a db read query though.
|
|
|
|
|
|
|
|
let user_login = login::Entity::find()
|
|
|
|
.filter(login::Column::BearerToken.eq(user_bearer_token.uuid()))
|
2023-05-31 02:32:34 +03:00
|
|
|
.one(db_replica.as_ref())
|
2023-06-24 21:11:07 +03:00
|
|
|
.await?
|
2023-06-29 09:00:34 +03:00
|
|
|
.ok_or(Web3ProxyError::AccessDenied("unknown bearer token".into()))?;
|
2023-01-26 08:24:09 +03:00
|
|
|
|
|
|
|
// if expired, delete ALL expired logins
|
|
|
|
let now = Utc::now();
|
|
|
|
if now > user_login.expires_at {
|
|
|
|
// this row is expired! do not allow auth!
|
|
|
|
// delete ALL expired logins.
|
|
|
|
let delete_result = login::Entity::delete_many()
|
|
|
|
.filter(login::Column::ExpiresAt.lte(now))
|
|
|
|
.exec(db_conn)
|
|
|
|
.await?;
|
|
|
|
|
|
|
|
// TODO: emit a stat? if this is high something weird might be happening
|
2023-06-17 09:46:20 +03:00
|
|
|
trace!("cleared expired logins: {:?}", delete_result);
|
2023-01-26 08:24:09 +03:00
|
|
|
|
2023-06-29 09:00:34 +03:00
|
|
|
return Err(Web3ProxyError::AccessDenied("login expired".into()));
|
2023-01-26 08:24:09 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
save_to_redis = true;
|
|
|
|
|
|
|
|
user_login.user_id
|
|
|
|
}
|
|
|
|
Ok(x) => {
|
|
|
|
// TODO: push cache ttl further in the future?
|
|
|
|
x
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let user_id: u64 = user_id.parse().context("Parsing user_id param")?;
|
|
|
|
|
|
|
|
if bearer_user_id != user_id {
|
2023-06-29 09:00:34 +03:00
|
|
|
return Err(Web3ProxyError::AccessDenied(
|
|
|
|
"bearer_user_id and user_id mismatch".into(),
|
|
|
|
));
|
2023-01-26 08:24:09 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if save_to_redis {
|
|
|
|
// TODO: how long? we store in database for 4 weeks
|
|
|
|
const ONE_DAY: usize = 60 * 60 * 24;
|
|
|
|
|
|
|
|
if let Err(err) = redis_conn
|
|
|
|
.set_ex::<_, _, ()>(user_redis_key, user_id, ONE_DAY)
|
|
|
|
.await
|
|
|
|
{
|
2023-06-29 07:30:00 +03:00
|
|
|
warn!(?err, "Unable to save user bearer token to redis")
|
2023-01-26 08:24:09 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(bearer_user_id)
|
|
|
|
}
|
|
|
|
(_, None) => {
|
|
|
|
// they have a bearer token. we don't care about it on public pages
|
|
|
|
// 0 means all
|
|
|
|
Ok(0)
|
|
|
|
}
|
|
|
|
(None, Some(_)) => {
|
|
|
|
// they do not have a bearer token, but requested a specific id. block
|
|
|
|
// TODO: proper error code from a useful error code
|
|
|
|
// TODO: maybe instead of this sharp edged warn, we have a config value?
|
|
|
|
// TODO: check config for if we should deny or allow this
|
2023-06-29 09:00:34 +03:00
|
|
|
Err(Web3ProxyError::AccessDenied(
|
|
|
|
"bearer token required when requesting a specific id".into(),
|
|
|
|
))
|
2023-01-26 08:24:09 +03:00
|
|
|
// // TODO: make this a flag
|
|
|
|
// warn!("allowing without auth during development!");
|
|
|
|
// Ok(x.parse()?)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// only allow rpc_key to be set if user_id is also set.
|
|
|
|
/// this will keep people from reading someone else's keys.
|
|
|
|
/// 0 means none.
|
|
|
|
|
|
|
|
pub fn get_rpc_key_id_from_params(
|
|
|
|
user_id: u64,
|
|
|
|
params: &HashMap<String, String>,
|
|
|
|
) -> anyhow::Result<u64> {
|
|
|
|
if user_id > 0 {
|
|
|
|
params.get("rpc_key_id").map_or_else(
|
|
|
|
|| Ok(0),
|
|
|
|
|c| {
|
|
|
|
let c = c.parse()?;
|
|
|
|
|
|
|
|
Ok(c)
|
|
|
|
},
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
Ok(0)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn get_chain_id_from_params(
|
2023-10-11 12:00:50 +03:00
|
|
|
app: &App,
|
2023-01-26 08:24:09 +03:00
|
|
|
params: &HashMap<String, String>,
|
|
|
|
) -> anyhow::Result<u64> {
|
|
|
|
params.get("chain_id").map_or_else(
|
|
|
|
|| Ok(app.config.chain_id),
|
|
|
|
|c| {
|
|
|
|
let c = c.parse()?;
|
|
|
|
|
|
|
|
Ok(c)
|
|
|
|
},
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn get_page_from_params(params: &HashMap<String, String>) -> anyhow::Result<u64> {
|
|
|
|
params.get("page").map_or_else::<anyhow::Result<u64>, _, _>(
|
|
|
|
|| {
|
|
|
|
// no page in params. set default
|
|
|
|
Ok(0)
|
|
|
|
},
|
|
|
|
|x: &String| {
|
|
|
|
// parse the given timestamp
|
|
|
|
// TODO: error code 401
|
|
|
|
let x = x.parse().context("parsing page query from params")?;
|
|
|
|
|
|
|
|
Ok(x)
|
|
|
|
},
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: return chrono::Utc instead?
|
|
|
|
pub fn get_query_start_from_params(
|
|
|
|
params: &HashMap<String, String>,
|
|
|
|
) -> anyhow::Result<chrono::NaiveDateTime> {
|
|
|
|
params.get("query_start").map_or_else(
|
|
|
|
|| {
|
|
|
|
// no timestamp in params. set default
|
|
|
|
let x = chrono::Utc::now() - chrono::Duration::days(30);
|
|
|
|
|
|
|
|
Ok(x.naive_utc())
|
|
|
|
},
|
|
|
|
|x: &String| {
|
|
|
|
// parse the given timestamp
|
2023-02-22 07:25:02 +03:00
|
|
|
let x = x
|
|
|
|
.parse::<i64>()
|
|
|
|
.context("parsing start timestamp query param")?;
|
2023-01-26 08:24:09 +03:00
|
|
|
|
2023-02-22 07:25:02 +03:00
|
|
|
let x = NaiveDateTime::from_timestamp_opt(x, 0)
|
|
|
|
.context("parsing start timestamp query param")?;
|
|
|
|
|
|
|
|
Ok(x)
|
|
|
|
},
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: return chrono::Utc instead?
|
|
|
|
pub fn get_query_stop_from_params(
|
|
|
|
params: &HashMap<String, String>,
|
|
|
|
) -> anyhow::Result<chrono::NaiveDateTime> {
|
|
|
|
params.get("query_stop").map_or_else(
|
|
|
|
|| {
|
|
|
|
// no timestamp in params. set default
|
|
|
|
let x = chrono::Utc::now();
|
|
|
|
|
|
|
|
Ok(x.naive_utc())
|
|
|
|
},
|
|
|
|
|x: &String| {
|
|
|
|
// parse the given timestamp
|
|
|
|
let x = x
|
|
|
|
.parse::<i64>()
|
|
|
|
.context("parsing stop timestamp query param")?;
|
|
|
|
|
|
|
|
let x = NaiveDateTime::from_timestamp_opt(x, 0)
|
|
|
|
.context("parsing stop timestamp query param")?;
|
2023-01-26 08:24:09 +03:00
|
|
|
|
|
|
|
Ok(x)
|
|
|
|
},
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn get_query_window_seconds_from_params(
|
|
|
|
params: &HashMap<String, String>,
|
2023-03-17 05:38:11 +03:00
|
|
|
) -> Web3ProxyResult<u64> {
|
2023-01-26 08:24:09 +03:00
|
|
|
params.get("query_window_seconds").map_or_else(
|
|
|
|
|| {
|
2023-04-20 23:35:59 +03:00
|
|
|
// no query_window_seconds in params. set default
|
|
|
|
Ok(60)
|
2023-01-26 08:24:09 +03:00
|
|
|
},
|
|
|
|
|query_window_seconds: &String| {
|
|
|
|
// parse the given timestamp
|
2023-04-20 20:38:10 +03:00
|
|
|
query_window_seconds.parse::<u64>().map_err(|_| {
|
2023-05-31 09:17:05 +03:00
|
|
|
Web3ProxyError::BadRequest("Unable to parse query_window_seconds".into())
|
2023-01-26 08:24:09 +03:00
|
|
|
})
|
|
|
|
},
|
|
|
|
)
|
|
|
|
}
|
2023-03-12 18:09:20 +03:00
|
|
|
|
2023-03-22 08:40:39 +03:00
|
|
|
pub fn get_stats_column_from_params(params: &HashMap<String, String>) -> Web3ProxyResult<&str> {
|
2023-03-12 18:09:20 +03:00
|
|
|
params.get("query_stats_column").map_or_else(
|
User Balance + Referral Logic (#44)
* will implement balance topup endpoint
* will quickly fix other PR reviews
* merging from master
* will finish up godmoe
* will finish up login
* added logic to top up balance (first iteration)
* should implement additional columns soon (currency, amount, tx-hash), as well as a new table for spend
* updated migrations, will account for spend next
* get back to this later
* will merge PR from stats-v2
* stats v2
rebased all my commits and squashed them down to one
* cargo upgrade
* added migrtation for spend in accounting table. will run test-deposit next
* trying to get request from polygon
* first iteration /user/balance/:tx_hash works, needs to add accepted tokens next
* creating the referral code seems to work
* will now check if spending enough credits will lead to both parties receiving credits
* rpcstats takes care of accounting for spend data
* removed track spend from table
* Revert "removed track spend from table"
This reverts commit a50802d6ae75f786864c5ec42d0ceb2cb27124ed.
* Revert "rpcstats takes care of accounting for spend data"
This reverts commit 1cec728bf241e4cfd24351134637ed81c1a5a10b.
* removed rpc request table entity
* updated referral code to use ulid s
* credits used are aggregated
* added a bunch of fields to referrer
* added database logic whenever an aggregate stats is added. will have to iterate over this a couple times i think. go to (1) detecting accepted stables next, (2) fix influxdb bug and (3) start to write test
* removed track spend as this will occur in the database
* will first work on "balance", then referral. these should really be treated as two separate PRs (although already convoluted)
* balance logic initial commit
* breaking WIP, changing the RPC call logic functions
* will start testing next
* got rid of warnings & lint
* will proceed with subtracting / adding to balance
* added decimal points, balance tracking seems to work
* will beautify code a bit
* removed deprecated dependency, and added topic + deposit contract to app.yaml
* brownie test suite does not rely on local contract files it pulls all from polygonscan
* will continue with referral
* should perhaps (in a future revision) recordhow much the referees got for free. marking referrals seems to work rn
* user is upgraded to premium if they deposit more than 10$. we dont accept more than $10M in a single tx
* will start PR, referral seems to be fine so far, perhaps up to some numbers that still may need tweaking
* will start PR
* removed rogue comments, cleaned up payments a bit
* changes before PR
* apply stats
* added unique constraint
* some refactoring such that the user file is not too bloated
* compiling
* progress with subusers, creating a table entry seems to work
* good response type is there as well now, will work on getters from primary user and secondary user next
* subuser logic also seems fine now
* downgrade logic
* fixed bug influxdb does not support different types in same query (which makes sense)
* WIP temporary commit
* merging with PR
* Delete daemon.rs
there are multiple daemons now, so this was moved to `proxyd`
* will remove request clone to &mut
* multiple request handles for payment
* making requests still seem fine
* removed redundant commented out bits
* added deposit endpoint, added deposit amount and deposit user, untested yet
* small bug with downgrade tier id
* will add authorization so balance can be received for users
* balance history should be set now too
* will check balance over time again
* subususer can see rpc key balance if admin or owner
* stats also seems to work fine now with historical balance
* things seem to be building and working
* removed clone from OpenRequestHandle
* removed influxdb from workspace members
* changed config files
* reran sea-orm generate entities, added a foreign key, should be proper now
* removed contract from commit
* made deposit contract optional
* added topic in polygon dev
* changed deposit contract to deposit factory contract
* added selfrelation on user_tier
* added payment required
* changed chain id to u64
* add wss in polygon llamarpc
* removed origin and method from the table
* added onchain transactions naming (and forgot to add a migration before)
* changed foreign key to be the referrer (id), not the code itself
* forgot to add id as the target foreign key
* WIP adding cache to update role
* fixed merge conflicts
---------
Co-authored-by: Bryan Stitt <bryan@llamanodes.com>
Co-authored-by: Bryan Stitt <bryan@stitthappens.com>
2023-05-12 19:45:15 +03:00
|
|
|
|| Ok(""),
|
2023-03-12 18:09:20 +03:00
|
|
|
|query_stats_column: &String| {
|
|
|
|
// Must be one of: Otherwise respond with an error ...
|
|
|
|
match query_stats_column.as_str() {
|
User Balance + Referral Logic (#44)
* will implement balance topup endpoint
* will quickly fix other PR reviews
* merging from master
* will finish up godmoe
* will finish up login
* added logic to top up balance (first iteration)
* should implement additional columns soon (currency, amount, tx-hash), as well as a new table for spend
* updated migrations, will account for spend next
* get back to this later
* will merge PR from stats-v2
* stats v2
rebased all my commits and squashed them down to one
* cargo upgrade
* added migrtation for spend in accounting table. will run test-deposit next
* trying to get request from polygon
* first iteration /user/balance/:tx_hash works, needs to add accepted tokens next
* creating the referral code seems to work
* will now check if spending enough credits will lead to both parties receiving credits
* rpcstats takes care of accounting for spend data
* removed track spend from table
* Revert "removed track spend from table"
This reverts commit a50802d6ae75f786864c5ec42d0ceb2cb27124ed.
* Revert "rpcstats takes care of accounting for spend data"
This reverts commit 1cec728bf241e4cfd24351134637ed81c1a5a10b.
* removed rpc request table entity
* updated referral code to use ulid s
* credits used are aggregated
* added a bunch of fields to referrer
* added database logic whenever an aggregate stats is added. will have to iterate over this a couple times i think. go to (1) detecting accepted stables next, (2) fix influxdb bug and (3) start to write test
* removed track spend as this will occur in the database
* will first work on "balance", then referral. these should really be treated as two separate PRs (although already convoluted)
* balance logic initial commit
* breaking WIP, changing the RPC call logic functions
* will start testing next
* got rid of warnings & lint
* will proceed with subtracting / adding to balance
* added decimal points, balance tracking seems to work
* will beautify code a bit
* removed deprecated dependency, and added topic + deposit contract to app.yaml
* brownie test suite does not rely on local contract files it pulls all from polygonscan
* will continue with referral
* should perhaps (in a future revision) recordhow much the referees got for free. marking referrals seems to work rn
* user is upgraded to premium if they deposit more than 10$. we dont accept more than $10M in a single tx
* will start PR, referral seems to be fine so far, perhaps up to some numbers that still may need tweaking
* will start PR
* removed rogue comments, cleaned up payments a bit
* changes before PR
* apply stats
* added unique constraint
* some refactoring such that the user file is not too bloated
* compiling
* progress with subusers, creating a table entry seems to work
* good response type is there as well now, will work on getters from primary user and secondary user next
* subuser logic also seems fine now
* downgrade logic
* fixed bug influxdb does not support different types in same query (which makes sense)
* WIP temporary commit
* merging with PR
* Delete daemon.rs
there are multiple daemons now, so this was moved to `proxyd`
* will remove request clone to &mut
* multiple request handles for payment
* making requests still seem fine
* removed redundant commented out bits
* added deposit endpoint, added deposit amount and deposit user, untested yet
* small bug with downgrade tier id
* will add authorization so balance can be received for users
* balance history should be set now too
* will check balance over time again
* subususer can see rpc key balance if admin or owner
* stats also seems to work fine now with historical balance
* things seem to be building and working
* removed clone from OpenRequestHandle
* removed influxdb from workspace members
* changed config files
* reran sea-orm generate entities, added a foreign key, should be proper now
* removed contract from commit
* made deposit contract optional
* added topic in polygon dev
* changed deposit contract to deposit factory contract
* added selfrelation on user_tier
* added payment required
* changed chain id to u64
* add wss in polygon llamarpc
* removed origin and method from the table
* added onchain transactions naming (and forgot to add a migration before)
* changed foreign key to be the referrer (id), not the code itself
* forgot to add id as the target foreign key
* WIP adding cache to update role
* fixed merge conflicts
---------
Co-authored-by: Bryan Stitt <bryan@llamanodes.com>
Co-authored-by: Bryan Stitt <bryan@stitthappens.com>
2023-05-12 19:45:15 +03:00
|
|
|
""
|
|
|
|
| "frontend_requests"
|
2023-03-22 08:40:39 +03:00
|
|
|
| "backend_requests"
|
|
|
|
| "cache_hits"
|
|
|
|
| "cache_misses"
|
|
|
|
| "no_servers"
|
|
|
|
| "sum_request_bytes"
|
|
|
|
| "sum_response_bytes"
|
User Balance + Referral Logic (#44)
* will implement balance topup endpoint
* will quickly fix other PR reviews
* merging from master
* will finish up godmoe
* will finish up login
* added logic to top up balance (first iteration)
* should implement additional columns soon (currency, amount, tx-hash), as well as a new table for spend
* updated migrations, will account for spend next
* get back to this later
* will merge PR from stats-v2
* stats v2
rebased all my commits and squashed them down to one
* cargo upgrade
* added migrtation for spend in accounting table. will run test-deposit next
* trying to get request from polygon
* first iteration /user/balance/:tx_hash works, needs to add accepted tokens next
* creating the referral code seems to work
* will now check if spending enough credits will lead to both parties receiving credits
* rpcstats takes care of accounting for spend data
* removed track spend from table
* Revert "removed track spend from table"
This reverts commit a50802d6ae75f786864c5ec42d0ceb2cb27124ed.
* Revert "rpcstats takes care of accounting for spend data"
This reverts commit 1cec728bf241e4cfd24351134637ed81c1a5a10b.
* removed rpc request table entity
* updated referral code to use ulid s
* credits used are aggregated
* added a bunch of fields to referrer
* added database logic whenever an aggregate stats is added. will have to iterate over this a couple times i think. go to (1) detecting accepted stables next, (2) fix influxdb bug and (3) start to write test
* removed track spend as this will occur in the database
* will first work on "balance", then referral. these should really be treated as two separate PRs (although already convoluted)
* balance logic initial commit
* breaking WIP, changing the RPC call logic functions
* will start testing next
* got rid of warnings & lint
* will proceed with subtracting / adding to balance
* added decimal points, balance tracking seems to work
* will beautify code a bit
* removed deprecated dependency, and added topic + deposit contract to app.yaml
* brownie test suite does not rely on local contract files it pulls all from polygonscan
* will continue with referral
* should perhaps (in a future revision) recordhow much the referees got for free. marking referrals seems to work rn
* user is upgraded to premium if they deposit more than 10$. we dont accept more than $10M in a single tx
* will start PR, referral seems to be fine so far, perhaps up to some numbers that still may need tweaking
* will start PR
* removed rogue comments, cleaned up payments a bit
* changes before PR
* apply stats
* added unique constraint
* some refactoring such that the user file is not too bloated
* compiling
* progress with subusers, creating a table entry seems to work
* good response type is there as well now, will work on getters from primary user and secondary user next
* subuser logic also seems fine now
* downgrade logic
* fixed bug influxdb does not support different types in same query (which makes sense)
* WIP temporary commit
* merging with PR
* Delete daemon.rs
there are multiple daemons now, so this was moved to `proxyd`
* will remove request clone to &mut
* multiple request handles for payment
* making requests still seem fine
* removed redundant commented out bits
* added deposit endpoint, added deposit amount and deposit user, untested yet
* small bug with downgrade tier id
* will add authorization so balance can be received for users
* balance history should be set now too
* will check balance over time again
* subususer can see rpc key balance if admin or owner
* stats also seems to work fine now with historical balance
* things seem to be building and working
* removed clone from OpenRequestHandle
* removed influxdb from workspace members
* changed config files
* reran sea-orm generate entities, added a foreign key, should be proper now
* removed contract from commit
* made deposit contract optional
* added topic in polygon dev
* changed deposit contract to deposit factory contract
* added selfrelation on user_tier
* added payment required
* changed chain id to u64
* add wss in polygon llamarpc
* removed origin and method from the table
* added onchain transactions naming (and forgot to add a migration before)
* changed foreign key to be the referrer (id), not the code itself
* forgot to add id as the target foreign key
* WIP adding cache to update role
* fixed merge conflicts
---------
Co-authored-by: Bryan Stitt <bryan@llamanodes.com>
Co-authored-by: Bryan Stitt <bryan@stitthappens.com>
2023-05-12 19:45:15 +03:00
|
|
|
| "sum_response_millis"
|
|
|
|
| "sum_credits_used"
|
|
|
|
| "balance" => Ok(query_stats_column),
|
2023-03-22 08:40:39 +03:00
|
|
|
_ => Err(Web3ProxyError::BadRequest(
|
User Balance + Referral Logic (#44)
* will implement balance topup endpoint
* will quickly fix other PR reviews
* merging from master
* will finish up godmoe
* will finish up login
* added logic to top up balance (first iteration)
* should implement additional columns soon (currency, amount, tx-hash), as well as a new table for spend
* updated migrations, will account for spend next
* get back to this later
* will merge PR from stats-v2
* stats v2
rebased all my commits and squashed them down to one
* cargo upgrade
* added migrtation for spend in accounting table. will run test-deposit next
* trying to get request from polygon
* first iteration /user/balance/:tx_hash works, needs to add accepted tokens next
* creating the referral code seems to work
* will now check if spending enough credits will lead to both parties receiving credits
* rpcstats takes care of accounting for spend data
* removed track spend from table
* Revert "removed track spend from table"
This reverts commit a50802d6ae75f786864c5ec42d0ceb2cb27124ed.
* Revert "rpcstats takes care of accounting for spend data"
This reverts commit 1cec728bf241e4cfd24351134637ed81c1a5a10b.
* removed rpc request table entity
* updated referral code to use ulid s
* credits used are aggregated
* added a bunch of fields to referrer
* added database logic whenever an aggregate stats is added. will have to iterate over this a couple times i think. go to (1) detecting accepted stables next, (2) fix influxdb bug and (3) start to write test
* removed track spend as this will occur in the database
* will first work on "balance", then referral. these should really be treated as two separate PRs (although already convoluted)
* balance logic initial commit
* breaking WIP, changing the RPC call logic functions
* will start testing next
* got rid of warnings & lint
* will proceed with subtracting / adding to balance
* added decimal points, balance tracking seems to work
* will beautify code a bit
* removed deprecated dependency, and added topic + deposit contract to app.yaml
* brownie test suite does not rely on local contract files it pulls all from polygonscan
* will continue with referral
* should perhaps (in a future revision) recordhow much the referees got for free. marking referrals seems to work rn
* user is upgraded to premium if they deposit more than 10$. we dont accept more than $10M in a single tx
* will start PR, referral seems to be fine so far, perhaps up to some numbers that still may need tweaking
* will start PR
* removed rogue comments, cleaned up payments a bit
* changes before PR
* apply stats
* added unique constraint
* some refactoring such that the user file is not too bloated
* compiling
* progress with subusers, creating a table entry seems to work
* good response type is there as well now, will work on getters from primary user and secondary user next
* subuser logic also seems fine now
* downgrade logic
* fixed bug influxdb does not support different types in same query (which makes sense)
* WIP temporary commit
* merging with PR
* Delete daemon.rs
there are multiple daemons now, so this was moved to `proxyd`
* will remove request clone to &mut
* multiple request handles for payment
* making requests still seem fine
* removed redundant commented out bits
* added deposit endpoint, added deposit amount and deposit user, untested yet
* small bug with downgrade tier id
* will add authorization so balance can be received for users
* balance history should be set now too
* will check balance over time again
* subususer can see rpc key balance if admin or owner
* stats also seems to work fine now with historical balance
* things seem to be building and working
* removed clone from OpenRequestHandle
* removed influxdb from workspace members
* changed config files
* reran sea-orm generate entities, added a foreign key, should be proper now
* removed contract from commit
* made deposit contract optional
* added topic in polygon dev
* changed deposit contract to deposit factory contract
* added selfrelation on user_tier
* added payment required
* changed chain id to u64
* add wss in polygon llamarpc
* removed origin and method from the table
* added onchain transactions naming (and forgot to add a migration before)
* changed foreign key to be the referrer (id), not the code itself
* forgot to add id as the target foreign key
* WIP adding cache to update role
* fixed merge conflicts
---------
Co-authored-by: Bryan Stitt <bryan@llamanodes.com>
Co-authored-by: Bryan Stitt <bryan@stitthappens.com>
2023-05-12 19:45:15 +03:00
|
|
|
"Unable to parse query_stats_column. It must be empty, or one of: \
|
2023-03-12 18:09:20 +03:00
|
|
|
frontend_requests, \
|
|
|
|
backend_requests, \
|
|
|
|
cache_hits, \
|
|
|
|
cache_misses, \
|
|
|
|
no_servers, \
|
|
|
|
sum_request_bytes, \
|
|
|
|
sum_response_bytes, \
|
User Balance + Referral Logic (#44)
* will implement balance topup endpoint
* will quickly fix other PR reviews
* merging from master
* will finish up godmoe
* will finish up login
* added logic to top up balance (first iteration)
* should implement additional columns soon (currency, amount, tx-hash), as well as a new table for spend
* updated migrations, will account for spend next
* get back to this later
* will merge PR from stats-v2
* stats v2
rebased all my commits and squashed them down to one
* cargo upgrade
* added migrtation for spend in accounting table. will run test-deposit next
* trying to get request from polygon
* first iteration /user/balance/:tx_hash works, needs to add accepted tokens next
* creating the referral code seems to work
* will now check if spending enough credits will lead to both parties receiving credits
* rpcstats takes care of accounting for spend data
* removed track spend from table
* Revert "removed track spend from table"
This reverts commit a50802d6ae75f786864c5ec42d0ceb2cb27124ed.
* Revert "rpcstats takes care of accounting for spend data"
This reverts commit 1cec728bf241e4cfd24351134637ed81c1a5a10b.
* removed rpc request table entity
* updated referral code to use ulid s
* credits used are aggregated
* added a bunch of fields to referrer
* added database logic whenever an aggregate stats is added. will have to iterate over this a couple times i think. go to (1) detecting accepted stables next, (2) fix influxdb bug and (3) start to write test
* removed track spend as this will occur in the database
* will first work on "balance", then referral. these should really be treated as two separate PRs (although already convoluted)
* balance logic initial commit
* breaking WIP, changing the RPC call logic functions
* will start testing next
* got rid of warnings & lint
* will proceed with subtracting / adding to balance
* added decimal points, balance tracking seems to work
* will beautify code a bit
* removed deprecated dependency, and added topic + deposit contract to app.yaml
* brownie test suite does not rely on local contract files it pulls all from polygonscan
* will continue with referral
* should perhaps (in a future revision) recordhow much the referees got for free. marking referrals seems to work rn
* user is upgraded to premium if they deposit more than 10$. we dont accept more than $10M in a single tx
* will start PR, referral seems to be fine so far, perhaps up to some numbers that still may need tweaking
* will start PR
* removed rogue comments, cleaned up payments a bit
* changes before PR
* apply stats
* added unique constraint
* some refactoring such that the user file is not too bloated
* compiling
* progress with subusers, creating a table entry seems to work
* good response type is there as well now, will work on getters from primary user and secondary user next
* subuser logic also seems fine now
* downgrade logic
* fixed bug influxdb does not support different types in same query (which makes sense)
* WIP temporary commit
* merging with PR
* Delete daemon.rs
there are multiple daemons now, so this was moved to `proxyd`
* will remove request clone to &mut
* multiple request handles for payment
* making requests still seem fine
* removed redundant commented out bits
* added deposit endpoint, added deposit amount and deposit user, untested yet
* small bug with downgrade tier id
* will add authorization so balance can be received for users
* balance history should be set now too
* will check balance over time again
* subususer can see rpc key balance if admin or owner
* stats also seems to work fine now with historical balance
* things seem to be building and working
* removed clone from OpenRequestHandle
* removed influxdb from workspace members
* changed config files
* reran sea-orm generate entities, added a foreign key, should be proper now
* removed contract from commit
* made deposit contract optional
* added topic in polygon dev
* changed deposit contract to deposit factory contract
* added selfrelation on user_tier
* added payment required
* changed chain id to u64
* add wss in polygon llamarpc
* removed origin and method from the table
* added onchain transactions naming (and forgot to add a migration before)
* changed foreign key to be the referrer (id), not the code itself
* forgot to add id as the target foreign key
* WIP adding cache to update role
* fixed merge conflicts
---------
Co-authored-by: Bryan Stitt <bryan@llamanodes.com>
Co-authored-by: Bryan Stitt <bryan@stitthappens.com>
2023-05-12 19:45:15 +03:00
|
|
|
sum_response_millis, \
|
|
|
|
sum_credits_used, \
|
|
|
|
balance"
|
2023-05-31 09:17:05 +03:00
|
|
|
.into(),
|
2023-03-22 08:40:39 +03:00
|
|
|
)),
|
2023-03-12 18:09:20 +03:00
|
|
|
}
|
2023-03-22 08:40:39 +03:00
|
|
|
},
|
2023-03-12 18:09:20 +03:00
|
|
|
)
|
2023-03-22 08:40:39 +03:00
|
|
|
}
|