alphabetical

TODO.md

@@ -193,6 +193,7 @@ These are roughly in order of completition
 - [x] don't use unix timestamps for response_millis since leap seconds will confuse it
 - [x] config to allow origins even on the anonymous endpoints
 - [x] send logs to sentry
+- [x] login should return the user id
 - [-] ability to domain lock or ip lock said key
   - the code to check the database and use these entries already exists, but users don't have a way to set them
 - [-] new endpoints for users (not totally sure about the exact paths, but these features are all needed):
@@ -215,6 +216,7 @@ These are roughly in order of completition
 - [ ] endpoint for creating/modifying api keys and their advanced security features
 - [ ] include if archive query or not in the stats
   - this is already partially done, but we need to double check it works. preferrably with tests
+- [ ] login should include the key id, not just the key ULID
 - [-] add configurable size limits to all the Caches
   - [ ] instead of configuring each cache with MB sizes, have one value for total memory footprint and then percentages for each cache
 - [-] let users choose a % to log (or maybe x/second). someone like curve logging all reverts will be a BIG database very quickly
@@ -223,7 +225,6 @@ These are roughly in order of completition
 - [ ] document url params with examples
 - [ ] endpoint to list keys without having to sign a message to log in again
 - [ ] when we show keys, also show the key's id
-- [ ] login should return the user id
 - [ ] WARN http_request:request: web3_proxy::block_number: could not get block from params err=unexpected params length id=01GF4HTRKM4JV6NX52XSF9AYMW method=POST authorized_request=User(Some(SqlxMySqlPoolConnection), AuthorizedKey { ip: 10.11.12.15, origin: None, user_key_id: 4, log_revert_chance: 0.0000 })
 - ERROR http_request:request:try_send_all_upstream_servers: web3_proxy::rpcs::request: bad response! err=JsonRpcClientError(JsonRpcError(JsonRpcError { code: -32000, message: "INTERNAL_ERROR: existing tx with same hash", data: None })) method=eth_sendRawTransaction rpc=local_erigon_alpha_archive id=01GF4HV03Y4ZNKQV8DW5NDQ5CG method=POST authorized_request=User(Some(SqlxMySqlPoolConnection), AuthorizedKey { ip: 10.11.12.15, origin: None, user_key_id: 4, log_revert_chance: 0.0000 }) self=Web3Connections { conns: {"local_erigon_alpha_archive_ws": Web3Connection { name: "local_erigon_alpha_archive_ws", blocks: "all", .. }, "local_geth_ws": Web3Connection { name: "local_geth_ws", blocks: 64, .. }, "local_erigon_alpha_archive": Web3Connection { name: "local_erigon_alpha_archive", blocks: "all", .. }}, .. } authorized_request=Some(User(Some(SqlxMySqlPoolConnection), AuthorizedKey { ip: 10.11.12.15, origin: None, user_key_id: 4, log_revert_chance: 0.0000 })) request=JsonRpcRequest { id: RawValue(39), method: "eth_sendRawTransaction", .. } request_metadata=Some(RequestMetadata { datetime: 2022-10-11T22:14:57.406829095Z, period_seconds: 60, request_bytes: 633, backend_requests: 0, no_servers: 0, error_response: false, response_bytes: 0, response_millis: 0 }) block_needed=None
   - why is it failing to get the block from params when its set to None? That should be the simple case
@@ -250,6 +251,8 @@ These are roughly in order of completition
   - and block hashes count is tiny (83)
   - what is going on?
 - [ ] after adding semaphores (or maybe something else), CPU load seems a lot higher. investigate
+- [ ] Ulid instead of Uuid for database ids
+  - might have to use Uuid in sea-orm and then convert to Ulid on display
 
 ## V1
 
@@ -440,8 +443,6 @@ in another repo: event subscriber
 - [ ] web3_proxy_cli command should read database settings from config
 - [ ] how should we handle reverting transactions? they won't confirm for a while after we send them
 - [ ] allow configuration of the expiration time of bearer tokens. currently defaults to 4 weeks
-- [ ] Ulid instead of Uuid for database ids
-  - might have to use Uuid in sea-orm and then convert to Ulid on display
 - [ ] emit stat when an IP/key goes over rate limits
 - [ ] readme command should run create_user commands via docker-compose
 - [ ] helper for UUID <-> ULID

web3_proxy/src/frontend/users.rs

@@ -283,8 +283,8 @@ pub async fn user_login_post(
             txn.commit().await?;
 
             let response_json = PostLoginResponse {
-                bearer_token,
                 api_keys: uks.iter().map(|uk| uk.api_key.into()).collect(),
+                bearer_token,
                 user_id: u.id,
             };
 
@@ -301,8 +301,8 @@ pub async fn user_login_post(
                 .context("failed loading user's key")?;
 
             let response_json = PostLoginResponse {
-                bearer_token,
                 api_keys: uks.iter().map(|uk| uk.api_key.into()).collect(),
+                bearer_token,
                 user_id: u.id,
             };