From cddae1d3c688949873ad4576d84fb79adf224e6e Mon Sep 17 00:00:00 2001 From: Atul Srivastava Date: Tue, 18 Oct 2022 10:40:00 -0400 Subject: [PATCH 1/6] Make Fee field of swap response repeated --- proto/api.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/api.proto b/proto/api.proto index 02d22c11..70ca2096 100644 --- a/proto/api.proto +++ b/proto/api.proto @@ -833,7 +833,7 @@ message TradeSwapResponse{ double outAmount = 3; double minOutAmount = 4; PriceImpactPercent priceImpact = 5; - Fee fee = 6; + repeated Fee fee = 6; } enum Project { From 511aba1ee717db563a9d4d2aa568c9d8ba5bcc0b Mon Sep 17 00:00:00 2001 From: Atul Srivastava Date: Tue, 18 Oct 2022 15:34:28 -0400 Subject: [PATCH 2/6] Update Security header in proto file for swagger ui --- proto/api.proto | 177 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) diff --git a/proto/api.proto b/proto/api.proto index 70ca2096..bed1aa46 100644 --- a/proto/api.proto +++ b/proto/api.proto @@ -9,6 +9,16 @@ import "google/api/visibility.proto"; import "protoc-gen-openapiv2/options/annotations.proto"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { + security_definitions: { + security: { + key: "Authorization"; + value: { + type: TYPE_API_KEY; + in: IN_HEADER; + name: "Authorization"; + }; + } + }; info: { title: "Trader API"; version: "1.1"; @@ -19,6 +29,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { email: "support@bloxroute.com"; }; }; + consumes: "application/json"; produces: "application/json"; }; @@ -36,6 +47,11 @@ service Api { get: "/api/v1/market/price" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns the list of prices for specified tokens"; summary: "Token prices"; tags: ["Market", "Universal"]; @@ -46,7 +62,13 @@ service Api { option (google.api.http) = { get: "/api/v1/market/markets" }; + option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns the list of orderbook markets"; summary: "Orderbook markets"; tags: ["Market", "Orderbook"]; @@ -58,6 +80,11 @@ service Api { get: "/api/v1/market/pools" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns the list of supported AMM pools"; summary: "AMM Pools"; tags: ["Market", "AMM"]; @@ -69,6 +96,11 @@ service Api { get: "/api/v1/market/tickers/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns updated ticker(s). To receive all tickers use empty string for {market} param value"; summary: "Orderbook tickers"; tags: ["Market", "Orderbook"]; @@ -81,6 +113,11 @@ service Api { get: "/api/v1/market/kline/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns the KLine per market"; summary: "Market KLine"; tags: ["Market", "Orderbook"]; @@ -92,6 +129,11 @@ service Api { get: "/api/v1/market/orderbooks/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns market's orderbook. Use limit param to reduce the number of bids/asks returned"; summary: "Market orderbook"; tags: ["Market", "Orderbook"]; @@ -104,6 +146,11 @@ service Api { get: "/api/v1/market/trades/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns recent trades on the market"; summary: "Market trades"; tags: ["Market", "Orderbook"]; @@ -115,6 +162,11 @@ service Api { get: "/api/v1/market/quote" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns quotes from supported AMMs"; summary: "AMM Quotes"; tags: ["Market", "AMM"]; @@ -127,6 +179,11 @@ service Api { get: "/api/v1/system/time" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns current time on the server"; summary: "Server time"; tags: "System"; @@ -138,6 +195,11 @@ service Api { get: "/api/v1/system/blockhash" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns recent block hash"; summary: "Recent block hash"; tags: "System"; @@ -150,6 +212,11 @@ service Api { get: "/api/v1/account/balance" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns the all balances for a wallet"; summary: "Account balances markets"; tags: "Account"; @@ -163,6 +230,11 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Generates a NewOrderV3 unsigned transaction object"; summary: "Unsigned NewOrderV3 transaction"; tags: ["Trade", "Orderbook"]; @@ -175,6 +247,11 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Submits a signed transaction"; summary: "Transaction submit"; tags: ["Trade", "Universal"]; @@ -199,6 +276,11 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Generates a CancelOrder unsigned transaction object"; summary: "Unsigned CancelOrder transaction"; tags: ["Trade", "Orderbook"]; @@ -211,6 +293,11 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Generates a CancelOrderByID unsigned transaction object"; summary: "Unsigned CancelOrderByID transaction"; tags: ["Trade", "Orderbook"]; @@ -223,6 +310,11 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Generates a CancelAll unsigned transaction object"; summary: "Unsigned CancelAll transaction"; tags: ["Trade", "Orderbook"]; @@ -235,6 +327,11 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Generates a ReplaceByClientOrderID unsigned transaction object"; summary: "Unsigned ReplaceByClientOrderID transaction"; tags: ["Trade", "Orderbook"]; @@ -247,6 +344,11 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Generates a ReplaceOrder unsigned transaction object"; summary: "Unsigned ReplaceOrder transaction"; tags: ["Trade", "Orderbook"]; @@ -259,6 +361,11 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Generates a SettleFunds unsigned transaction object"; summary: "Unsigned SettleFunds transaction"; tags: ["Trade", "Orderbook"]; @@ -271,6 +378,11 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Generates an unsigned transaction object for the best available AMM swap"; summary: "Unsigned best available AMM swap transaction"; tags: ["Trade", "AMM"]; @@ -283,6 +395,11 @@ service Api { get: "/api/v1/trade/orders/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns all user's orders"; summary: "List of user's orders"; tags: ["Trade", "Orderbook"]; @@ -294,6 +411,11 @@ service Api { get: "/api/v1/trade/openorders/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns the list of open orders per user per market"; summary: "List of user's open orders"; tags: ["Trade", "Orderbook"]; @@ -306,6 +428,11 @@ service Api { get: "/api/v1/trade/orderbyid/{orderID}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns an order by ID"; summary: "Order by ID"; tags: ["Trade", "Orderbook"]; @@ -317,6 +444,11 @@ service Api { get: "/api/v1/trade/unsettled/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Returns the unsettled amounts of user in a market"; summary: "Unsettled amounts"; tags: ["Trade", "Orderbook"]; @@ -329,6 +461,11 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; description: "Generates an unsigned transaction object for the AMM swap on the specified route"; summary: "Unsigned AMM swap transaction along route"; tags: ["Trade", "AMM"]; @@ -338,48 +475,88 @@ service Api { // streaming endpoints rpc GetOrderbooksStream(GetOrderbooksRequest) returns (stream GetOrderbooksStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; tags: "Trade"; }; } rpc GetTickersStream(GetTickersRequest) returns (stream GetTickersStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; tags: "Trade"; }; } rpc GetMarketDepthStream(GetMarketsRequest) returns (stream GetMarketDepthStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; tags: "Trade"; }; } rpc GetTradesStream(GetTradesRequest) returns (stream GetTradesStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; tags: "Trade"; }; } rpc GetOrderStatusStream(GetOrderStatusStreamRequest) returns (stream GetOrderStatusStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; tags: "Trade"; }; } rpc GetRecentBlockHashStream(GetRecentBlockHashRequest) returns (stream GetRecentBlockHashResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; tags: "System"; }; } rpc GetQuotesStream(GetQuotesStreamRequest) returns (stream GetQuotesStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; tags: "AMMs"; }; } rpc GetPoolReservesStream(GetPoolReservesStreamRequest) returns (stream GetPoolReservesStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { + security: { + security_requirement: { + key: "Authorization"; + }; + }; tags: "AMMs"; }; } From 9fc5f75da842d8489370ca0edda503315751814e Mon Sep 17 00:00:00 2001 From: Atul Srivastava Date: Tue, 18 Oct 2022 15:44:46 -0400 Subject: [PATCH 3/6] Remove unneeded commit on repeated Fee --- proto/api.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/api.proto b/proto/api.proto index bed1aa46..e6374097 100644 --- a/proto/api.proto +++ b/proto/api.proto @@ -1010,7 +1010,7 @@ message TradeSwapResponse{ double outAmount = 3; double minOutAmount = 4; PriceImpactPercent priceImpact = 5; - repeated Fee fee = 6; + Fee fee = 6; } enum Project { From 0ce526c1bb2859c3a419b42848f471ba16bef220 Mon Sep 17 00:00:00 2001 From: Atul Srivastava Date: Wed, 19 Oct 2022 14:08:21 -0400 Subject: [PATCH 4/6] Add global security header --- proto/api.proto | 158 +++--------------------------------------------- 1 file changed, 8 insertions(+), 150 deletions(-) diff --git a/proto/api.proto b/proto/api.proto index e6374097..d9243779 100644 --- a/proto/api.proto +++ b/proto/api.proto @@ -9,6 +9,14 @@ import "google/api/visibility.proto"; import "protoc-gen-openapiv2/options/annotations.proto"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { + security: { + security_requirement: { + key: "Authorization"; + value: { + scope: [] + } + } + } security_definitions: { security: { key: "Authorization"; @@ -96,11 +104,6 @@ service Api { get: "/api/v1/market/tickers/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns updated ticker(s). To receive all tickers use empty string for {market} param value"; summary: "Orderbook tickers"; tags: ["Market", "Orderbook"]; @@ -113,11 +116,6 @@ service Api { get: "/api/v1/market/kline/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns the KLine per market"; summary: "Market KLine"; tags: ["Market", "Orderbook"]; @@ -129,11 +127,6 @@ service Api { get: "/api/v1/market/orderbooks/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns market's orderbook. Use limit param to reduce the number of bids/asks returned"; summary: "Market orderbook"; tags: ["Market", "Orderbook"]; @@ -146,11 +139,6 @@ service Api { get: "/api/v1/market/trades/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns recent trades on the market"; summary: "Market trades"; tags: ["Market", "Orderbook"]; @@ -162,11 +150,6 @@ service Api { get: "/api/v1/market/quote" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns quotes from supported AMMs"; summary: "AMM Quotes"; tags: ["Market", "AMM"]; @@ -179,11 +162,6 @@ service Api { get: "/api/v1/system/time" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns current time on the server"; summary: "Server time"; tags: "System"; @@ -195,11 +173,6 @@ service Api { get: "/api/v1/system/blockhash" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns recent block hash"; summary: "Recent block hash"; tags: "System"; @@ -212,11 +185,6 @@ service Api { get: "/api/v1/account/balance" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns the all balances for a wallet"; summary: "Account balances markets"; tags: "Account"; @@ -230,11 +198,6 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Generates a NewOrderV3 unsigned transaction object"; summary: "Unsigned NewOrderV3 transaction"; tags: ["Trade", "Orderbook"]; @@ -247,11 +210,6 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Submits a signed transaction"; summary: "Transaction submit"; tags: ["Trade", "Universal"]; @@ -276,11 +234,6 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Generates a CancelOrder unsigned transaction object"; summary: "Unsigned CancelOrder transaction"; tags: ["Trade", "Orderbook"]; @@ -293,11 +246,6 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Generates a CancelOrderByID unsigned transaction object"; summary: "Unsigned CancelOrderByID transaction"; tags: ["Trade", "Orderbook"]; @@ -310,11 +258,6 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Generates a CancelAll unsigned transaction object"; summary: "Unsigned CancelAll transaction"; tags: ["Trade", "Orderbook"]; @@ -327,11 +270,6 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Generates a ReplaceByClientOrderID unsigned transaction object"; summary: "Unsigned ReplaceByClientOrderID transaction"; tags: ["Trade", "Orderbook"]; @@ -344,11 +282,6 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Generates a ReplaceOrder unsigned transaction object"; summary: "Unsigned ReplaceOrder transaction"; tags: ["Trade", "Orderbook"]; @@ -361,11 +294,6 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Generates a SettleFunds unsigned transaction object"; summary: "Unsigned SettleFunds transaction"; tags: ["Trade", "Orderbook"]; @@ -378,11 +306,6 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Generates an unsigned transaction object for the best available AMM swap"; summary: "Unsigned best available AMM swap transaction"; tags: ["Trade", "AMM"]; @@ -395,11 +318,6 @@ service Api { get: "/api/v1/trade/orders/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns all user's orders"; summary: "List of user's orders"; tags: ["Trade", "Orderbook"]; @@ -411,11 +329,6 @@ service Api { get: "/api/v1/trade/openorders/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns the list of open orders per user per market"; summary: "List of user's open orders"; tags: ["Trade", "Orderbook"]; @@ -428,11 +341,6 @@ service Api { get: "/api/v1/trade/orderbyid/{orderID}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns an order by ID"; summary: "Order by ID"; tags: ["Trade", "Orderbook"]; @@ -444,11 +352,6 @@ service Api { get: "/api/v1/trade/unsettled/{market}" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns the unsettled amounts of user in a market"; summary: "Unsettled amounts"; tags: ["Trade", "Orderbook"]; @@ -461,11 +364,6 @@ service Api { body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Generates an unsigned transaction object for the AMM swap on the specified route"; summary: "Unsigned AMM swap transaction along route"; tags: ["Trade", "AMM"]; @@ -475,88 +373,48 @@ service Api { // streaming endpoints rpc GetOrderbooksStream(GetOrderbooksRequest) returns (stream GetOrderbooksStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; tags: "Trade"; }; } rpc GetTickersStream(GetTickersRequest) returns (stream GetTickersStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; tags: "Trade"; }; } rpc GetMarketDepthStream(GetMarketsRequest) returns (stream GetMarketDepthStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; tags: "Trade"; }; } rpc GetTradesStream(GetTradesRequest) returns (stream GetTradesStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; tags: "Trade"; }; } rpc GetOrderStatusStream(GetOrderStatusStreamRequest) returns (stream GetOrderStatusStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; tags: "Trade"; }; } rpc GetRecentBlockHashStream(GetRecentBlockHashRequest) returns (stream GetRecentBlockHashResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; tags: "System"; }; } rpc GetQuotesStream(GetQuotesStreamRequest) returns (stream GetQuotesStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; tags: "AMMs"; }; } rpc GetPoolReservesStream(GetPoolReservesStreamRequest) returns (stream GetPoolReservesStreamResponse) { option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; tags: "AMMs"; }; } From 1ed4015c8fdd46a7a2dfc2e906bb0a9f54010b1c Mon Sep 17 00:00:00 2001 From: Atul Srivastava Date: Fri, 21 Oct 2022 13:43:30 -0400 Subject: [PATCH 5/6] Change Authorization to Auth Header --- proto/api.proto | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proto/api.proto b/proto/api.proto index d9243779..946cb7fa 100644 --- a/proto/api.proto +++ b/proto/api.proto @@ -11,7 +11,7 @@ import "protoc-gen-openapiv2/options/annotations.proto"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { security: { security_requirement: { - key: "Authorization"; + key: "Auth Header"; value: { scope: [] } @@ -19,11 +19,11 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { } security_definitions: { security: { - key: "Authorization"; + key: "Auth Header"; value: { type: TYPE_API_KEY; in: IN_HEADER; - name: "Authorization"; + name: "Auth Header"; }; } }; From 4fe91b6fcf908db405959b573c54e66aff7d8fea Mon Sep 17 00:00:00 2001 From: Atul Srivastava Date: Fri, 21 Oct 2022 14:01:26 -0400 Subject: [PATCH 6/6] Remove some unneeded security headers --- proto/api.proto | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/proto/api.proto b/proto/api.proto index 946cb7fa..12d05dbd 100644 --- a/proto/api.proto +++ b/proto/api.proto @@ -55,11 +55,6 @@ service Api { get: "/api/v1/market/price" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns the list of prices for specified tokens"; summary: "Token prices"; tags: ["Market", "Universal"]; @@ -72,11 +67,6 @@ service Api { }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns the list of orderbook markets"; summary: "Orderbook markets"; tags: ["Market", "Orderbook"]; @@ -88,11 +78,6 @@ service Api { get: "/api/v1/market/pools" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { - security: { - security_requirement: { - key: "Authorization"; - }; - }; description: "Returns the list of supported AMM pools"; summary: "AMM Pools"; tags: ["Market", "AMM"];