From 12bcd84eb1a707c1fe96c3cdf2eb15edfd7d0347 Mon Sep 17 00:00:00 2001 From: kompotkot Date: Thu, 7 Dec 2023 16:47:03 +0000 Subject: [PATCH] Body for complete request route --- engineapi/engineapi/data.py | 4 ++++ engineapi/engineapi/middleware.py | 2 +- engineapi/engineapi/routes/metatx.py | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/engineapi/engineapi/data.py b/engineapi/engineapi/data.py index c1b01beb..dbec6a8d 100644 --- a/engineapi/engineapi/data.py +++ b/engineapi/engineapi/data.py @@ -329,6 +329,10 @@ class CallRequestResponse(BaseModel): return Web3.toChecksumAddress(v) +class CompleteCallRequestsAPIRequest(BaseModel): + tx_hash: str + + class QuartilesResponse(BaseModel): percentile_25: Dict[str, Any] percentile_50: Dict[str, Any] diff --git a/engineapi/engineapi/middleware.py b/engineapi/engineapi/middleware.py index 5868f336..395ee332 100644 --- a/engineapi/engineapi/middleware.py +++ b/engineapi/engineapi/middleware.py @@ -147,7 +147,7 @@ async def request_none_or_user_auth( return user -async def metatx_sign_header( +async def metatx_verify_header( authorization: str = Header(None), ) -> Optional[Dict[str, Any]]: message: Optional[Dict[str, Any]] = None diff --git a/engineapi/engineapi/routes/metatx.py b/engineapi/engineapi/routes/metatx.py index 8c9b8a6f..092540b7 100644 --- a/engineapi/engineapi/routes/metatx.py +++ b/engineapi/engineapi/routes/metatx.py @@ -18,7 +18,7 @@ from .. import contracts_actions, data, db from ..middleware import ( BugoutCORSMiddleware, EngineHTTPException, - metatx_sign_header, + metatx_verify_header, request_none_or_user_auth, request_user_auth, ) @@ -423,9 +423,9 @@ async def delete_requests( @app.post("/requests/{request_id}/complete", tags=["requests"]) async def complete_call_request_route( - tx_hash: str = Form(...), + complete_request: data.CompleteCallRequestsAPIRequest = Body(...), request_id: UUID = Path(...), - message=Depends(metatx_sign_header), + message=Depends(metatx_verify_header), db_session: Session = Depends(db.yield_db_session), ): """ @@ -434,7 +434,7 @@ async def complete_call_request_route( try: request = contracts_actions.complete_call_request( db_session=db_session, - tx_hash=tx_hash, + tx_hash=complete_request.tx_hash, call_request_id=request_id, caller=message["caller"], )