From e8cd576f4ea4c448fda354d2cf62a5ec18962a11 Mon Sep 17 00:00:00 2001 From: nidakarimali Date: Tue, 27 May 2025 13:16:29 -0400 Subject: [PATCH 1/2] fixed issue --- python/sdk/src/openapi_client/api/rewards_api.py | 13 +++++++------ .../sdk/src/openapi_client/docs/CampaignRewards.md | 1 + python/sdk/src/openapi_client/docs/RewardsApi.md | 5 +++-- .../src/openapi_client/models/campaign_rewards.py | 10 ++++++++-- resources/rewards-data-api.yaml | 6 ++++-- rust/gen/bluefin_api/docs/CampaignRewards.md | 1 + rust/gen/bluefin_api/docs/RewardsApi.md | 4 ++-- rust/gen/bluefin_api/src/apis/rewards_api.rs | 2 +- rust/gen/bluefin_api/src/models/campaign_rewards.rs | 3 +++ ts/sdk/src/api.ts | 12 ++++++++---- 10 files changed, 38 insertions(+), 19 deletions(-) diff --git a/python/sdk/src/openapi_client/api/rewards_api.py b/python/sdk/src/openapi_client/api/rewards_api.py index 475d02a8..f7491f22 100644 --- a/python/sdk/src/openapi_client/api/rewards_api.py +++ b/python/sdk/src/openapi_client/api/rewards_api.py @@ -17,12 +17,13 @@ from typing_extensions import Annotated from pydantic import Field, StrictInt, StrictStr, field_validator -from typing import Any, Dict, List, Optional +from typing import List, Optional from typing_extensions import Annotated from openapi_client.models.affiliate_metadata import AffiliateMetadata from openapi_client.models.affiliate_onboard_response import AffiliateOnboardResponse from openapi_client.models.affiliate_summary import AffiliateSummary from openapi_client.models.campaign_metadata import CampaignMetadata +from openapi_client.models.campaign_rewards import CampaignRewards from openapi_client.models.epoch_configs import EpochConfigs from openapi_client.models.epoch_metadata import EpochMetadata from openapi_client.models.get_affiliate_interval_overview200_response import GetAffiliateIntervalOverview200Response @@ -1566,7 +1567,7 @@ async def get_campaign_rewards( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[UserCampaignRewards]: + ) -> List[CampaignRewards]: """Get rewards information for a specific campaign Returns the rewards earned by users for a specific campaign @@ -1607,7 +1608,7 @@ async def get_campaign_rewards( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "List[UserCampaignRewards]", + '200': "List[CampaignRewards]", } response_data = await self.api_client.call_api( *_param, @@ -1637,7 +1638,7 @@ async def get_campaign_rewards_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[List[UserCampaignRewards]]: + ) -> ApiResponse[List[CampaignRewards]]: """Get rewards information for a specific campaign Returns the rewards earned by users for a specific campaign @@ -1678,7 +1679,7 @@ async def get_campaign_rewards_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "List[UserCampaignRewards]", + '200': "List[CampaignRewards]", } response_data = await self.api_client.call_api( *_param, @@ -1749,7 +1750,7 @@ async def get_campaign_rewards_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "List[UserCampaignRewards]", + '200': "List[CampaignRewards]", } response_data = await self.api_client.call_api( *_param, diff --git a/python/sdk/src/openapi_client/docs/CampaignRewards.md b/python/sdk/src/openapi_client/docs/CampaignRewards.md index 7a46578d..4c69871f 100644 --- a/python/sdk/src/openapi_client/docs/CampaignRewards.md +++ b/python/sdk/src/openapi_client/docs/CampaignRewards.md @@ -5,6 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**rewards** | [**UserCampaignRewards**](UserCampaignRewards.md) | | [optional] ## Example diff --git a/python/sdk/src/openapi_client/docs/RewardsApi.md b/python/sdk/src/openapi_client/docs/RewardsApi.md index cd58ef92..3a9ade04 100644 --- a/python/sdk/src/openapi_client/docs/RewardsApi.md +++ b/python/sdk/src/openapi_client/docs/RewardsApi.md @@ -429,7 +429,7 @@ This endpoint does not need any parameter. [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_campaign_rewards** -> List[UserCampaignRewards] get_campaign_rewards(campaign_name, epoch_number=epoch_number) +> List[CampaignRewards] get_campaign_rewards(campaign_name, epoch_number=epoch_number) Get rewards information for a specific campaign @@ -441,6 +441,7 @@ Returns the rewards earned by users for a specific campaign ```python import openapi_client +from openapi_client.models.campaign_rewards import CampaignRewards from openapi_client.rest import ApiException from pprint import pprint @@ -488,7 +489,7 @@ Name | Type | Description | Notes ### Return type -[**List[UserCampaignRewards]**](UserCampaignRewards.md) +[**List[CampaignRewards]**](CampaignRewards.md) ### Authorization diff --git a/python/sdk/src/openapi_client/models/campaign_rewards.py b/python/sdk/src/openapi_client/models/campaign_rewards.py index 24e545bd..9279ca8e 100644 --- a/python/sdk/src/openapi_client/models/campaign_rewards.py +++ b/python/sdk/src/openapi_client/models/campaign_rewards.py @@ -18,7 +18,8 @@ import json from pydantic import BaseModel, ConfigDict -from typing import Any, ClassVar, Dict, List +from typing import Any, ClassVar, Dict, List, Optional +from openapi_client.models.user_campaign_rewards import UserCampaignRewards from typing import Optional, Set from typing_extensions import Self @@ -26,7 +27,8 @@ class CampaignRewards(BaseModel): """ CampaignRewards """ # noqa: E501 - __properties: ClassVar[List[str]] = [] + rewards: Optional[UserCampaignRewards] = None + __properties: ClassVar[List[str]] = ["rewards"] model_config = ConfigDict( populate_by_name=True, @@ -67,6 +69,9 @@ def to_dict(self) -> Dict[str, Any]: exclude=excluded_fields, exclude_none=True, ) + # override the default output from pydantic by calling `to_dict()` of rewards + if self.rewards: + _dict['rewards'] = self.rewards.to_dict() return _dict @classmethod @@ -79,6 +84,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: return cls.model_validate(obj) _obj = cls.model_validate({ + "rewards": UserCampaignRewards.from_dict(obj["rewards"]) if obj.get("rewards") is not None else None }) return _obj diff --git a/resources/rewards-data-api.yaml b/resources/rewards-data-api.yaml index 98d6f899..4bc870a0 100644 --- a/resources/rewards-data-api.yaml +++ b/resources/rewards-data-api.yaml @@ -26,8 +26,10 @@ components: $ref: './common.yaml#/components/schemas/Error' CampaignRewards: - type: object - $ref: "#/components/schemas/UserCampaignRewards" + type: object + properties: + rewards: + $ref: "#/components/schemas/UserCampaignRewards" # Add other campaign data types as needed # Campaign rewards schema can be extended to have custom fields for the campaign once start adding more campaign specific data diff --git a/rust/gen/bluefin_api/docs/CampaignRewards.md b/rust/gen/bluefin_api/docs/CampaignRewards.md index 9d3924c5..061f1e30 100644 --- a/rust/gen/bluefin_api/docs/CampaignRewards.md +++ b/rust/gen/bluefin_api/docs/CampaignRewards.md @@ -4,6 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- +**rewards** | Option<[**models::UserCampaignRewards**](UserCampaignRewards.md)> | | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/rust/gen/bluefin_api/docs/RewardsApi.md b/rust/gen/bluefin_api/docs/RewardsApi.md index c3848409..a17f1401 100644 --- a/rust/gen/bluefin_api/docs/RewardsApi.md +++ b/rust/gen/bluefin_api/docs/RewardsApi.md @@ -178,7 +178,7 @@ This endpoint does not need any parameter. ## get_campaign_rewards -> Vec get_campaign_rewards(campaign_name, epoch_number) +> Vec get_campaign_rewards(campaign_name, epoch_number) Get rewards information for a specific campaign Returns the rewards earned by users for a specific campaign @@ -193,7 +193,7 @@ Name | Type | Description | Required | Notes ### Return type -[**Vec**](UserCampaignRewards.md) +[**Vec**](CampaignRewards.md) ### Authorization diff --git a/rust/gen/bluefin_api/src/apis/rewards_api.rs b/rust/gen/bluefin_api/src/apis/rewards_api.rs index 8bee16a8..46da1e5c 100644 --- a/rust/gen/bluefin_api/src/apis/rewards_api.rs +++ b/rust/gen/bluefin_api/src/apis/rewards_api.rs @@ -334,7 +334,7 @@ pub async fn get_affiliate_summary(configuration: &configuration::Configuration, } /// Returns the rewards earned by users for a specific campaign -pub async fn get_campaign_rewards(configuration: &configuration::Configuration, campaign_name: &str, epoch_number: Option) -> Result, Error> { +pub async fn get_campaign_rewards(configuration: &configuration::Configuration, campaign_name: &str, epoch_number: Option) -> Result, Error> { // add a prefix to parameters to efficiently prevent name collisions let p_campaign_name = campaign_name; let p_epoch_number = epoch_number; diff --git a/rust/gen/bluefin_api/src/models/campaign_rewards.rs b/rust/gen/bluefin_api/src/models/campaign_rewards.rs index a192106a..bf1c154a 100644 --- a/rust/gen/bluefin_api/src/models/campaign_rewards.rs +++ b/rust/gen/bluefin_api/src/models/campaign_rewards.rs @@ -13,11 +13,14 @@ use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CampaignRewards { + #[serde(rename = "rewards", skip_serializing_if = "Option::is_none")] + pub rewards: Option, } impl CampaignRewards { pub fn new() -> CampaignRewards { CampaignRewards { + rewards: None, } } } diff --git a/ts/sdk/src/api.ts b/ts/sdk/src/api.ts index 51b22cbf..ae8681f0 100644 --- a/ts/sdk/src/api.ts +++ b/ts/sdk/src/api.ts @@ -1648,8 +1648,12 @@ export type CampaignMetadataStatusEnum = typeof CampaignMetadataStatusEnum[keyof * @interface CampaignRewards */ export interface CampaignRewards { - [key: string]: NULL_SCHEMA_ERR; - + /** + * + * @type {UserCampaignRewards} + * @memberof CampaignRewards + */ + 'rewards'?: UserCampaignRewards; } /** * Cancelling Orders for a specific symbol. If order hashes are not specified, all orders are canceled for this symbol @@ -6844,7 +6848,7 @@ export const RewardsApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getCampaignRewards(campaignName: string, epochNumber?: number, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async getCampaignRewards(campaignName: string, epochNumber?: number, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.getCampaignRewards(campaignName, epochNumber, options); const localVarOperationServerIndex = configuration?.serverIndex ?? 0; const localVarOperationServerBasePath = operationServerMap['RewardsApi.getCampaignRewards']?.[localVarOperationServerIndex]?.url; @@ -7043,7 +7047,7 @@ export const RewardsApiFactory = function (configuration?: Configuration, basePa * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getCampaignRewards(campaignName: string, epochNumber?: number, options?: RawAxiosRequestConfig): AxiosPromise> { + getCampaignRewards(campaignName: string, epochNumber?: number, options?: RawAxiosRequestConfig): AxiosPromise> { return localVarFp.getCampaignRewards(campaignName, epochNumber, options).then((request) => request(axios, basePath)); }, /** From d1189e682550bb3f0457cfec8acc8d2b2f123c1a Mon Sep 17 00:00:00 2001 From: nidakarimali Date: Tue, 27 May 2025 13:28:51 -0400 Subject: [PATCH 2/2] fixed issue --- python/sdk/src/.openapi-generator/FILES | 2 - python/sdk/src/openapi_client/__init__.py | 1 - .../sdk/src/openapi_client/api/rewards_api.py | 12 +- .../sdk/src/openapi_client/docs/RewardsApi.md | 6 +- .../sdk/src/openapi_client/models/__init__.py | 1 - python/sdk/src/openapi_client_README.md | 1 - resources/rewards-data-api.yaml | 5 +- rust/gen/bluefin_api/.openapi-generator/FILES | 2 - rust/gen/bluefin_api/README.md | 1 - rust/gen/bluefin_api/docs/RewardsApi.md | 4 +- rust/gen/bluefin_api/src/apis/rewards_api.rs | 2 +- rust/gen/bluefin_api/src/models/mod.rs | 2 - ts/sdk/src/.openapi-generator/FILES | 114 ------------------ ts/sdk/src/.openapi-generator/VERSION | 2 +- ts/sdk/src/api.ts | 17 +-- ts/sdk/src/configuration.ts | 3 +- 16 files changed, 18 insertions(+), 157 deletions(-) diff --git a/python/sdk/src/.openapi-generator/FILES b/python/sdk/src/.openapi-generator/FILES index a3f1334a..a58a41ad 100644 --- a/python/sdk/src/.openapi-generator/FILES +++ b/python/sdk/src/.openapi-generator/FILES @@ -47,7 +47,6 @@ openapi_client/docs/Asset.md openapi_client/docs/AssetConfig.md openapi_client/docs/AuthApi.md openapi_client/docs/CampaignMetadata.md -openapi_client/docs/CampaignRewards.md openapi_client/docs/CancelOrdersRequest.md openapi_client/docs/CancelOrdersResponse.md openapi_client/docs/CandlePriceType.md @@ -161,7 +160,6 @@ openapi_client/models/affiliate_summary.py openapi_client/models/asset.py openapi_client/models/asset_config.py openapi_client/models/campaign_metadata.py -openapi_client/models/campaign_rewards.py openapi_client/models/cancel_orders_request.py openapi_client/models/cancel_orders_response.py openapi_client/models/candle_price_type.py diff --git a/python/sdk/src/openapi_client/__init__.py b/python/sdk/src/openapi_client/__init__.py index 9ddf8124..69d0c3d2 100644 --- a/python/sdk/src/openapi_client/__init__.py +++ b/python/sdk/src/openapi_client/__init__.py @@ -72,7 +72,6 @@ from openapi_client.models.asset import Asset from openapi_client.models.asset_config import AssetConfig from openapi_client.models.campaign_metadata import CampaignMetadata -from openapi_client.models.campaign_rewards import CampaignRewards from openapi_client.models.cancel_orders_request import CancelOrdersRequest from openapi_client.models.cancel_orders_response import CancelOrdersResponse from openapi_client.models.candle_price_type import CandlePriceType diff --git a/python/sdk/src/openapi_client/api/rewards_api.py b/python/sdk/src/openapi_client/api/rewards_api.py index f7491f22..b9e23757 100644 --- a/python/sdk/src/openapi_client/api/rewards_api.py +++ b/python/sdk/src/openapi_client/api/rewards_api.py @@ -23,7 +23,6 @@ from openapi_client.models.affiliate_onboard_response import AffiliateOnboardResponse from openapi_client.models.affiliate_summary import AffiliateSummary from openapi_client.models.campaign_metadata import CampaignMetadata -from openapi_client.models.campaign_rewards import CampaignRewards from openapi_client.models.epoch_configs import EpochConfigs from openapi_client.models.epoch_metadata import EpochMetadata from openapi_client.models.get_affiliate_interval_overview200_response import GetAffiliateIntervalOverview200Response @@ -36,6 +35,7 @@ from openapi_client.models.referee_onboard_response import RefereeOnboardResponse from openapi_client.models.rewards_summary import RewardsSummary from openapi_client.models.update_affiliate_fee_config_request import UpdateAffiliateFeeConfigRequest +from openapi_client.models.user_campaign_rewards import UserCampaignRewards from openapi_client.api_client import ApiClient, RequestSerialized from openapi_client.api_response import ApiResponse @@ -1567,7 +1567,7 @@ async def get_campaign_rewards( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> List[CampaignRewards]: + ) -> List[UserCampaignRewards]: """Get rewards information for a specific campaign Returns the rewards earned by users for a specific campaign @@ -1608,7 +1608,7 @@ async def get_campaign_rewards( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "List[CampaignRewards]", + '200': "List[UserCampaignRewards]", } response_data = await self.api_client.call_api( *_param, @@ -1638,7 +1638,7 @@ async def get_campaign_rewards_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[List[CampaignRewards]]: + ) -> ApiResponse[List[UserCampaignRewards]]: """Get rewards information for a specific campaign Returns the rewards earned by users for a specific campaign @@ -1679,7 +1679,7 @@ async def get_campaign_rewards_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "List[CampaignRewards]", + '200': "List[UserCampaignRewards]", } response_data = await self.api_client.call_api( *_param, @@ -1750,7 +1750,7 @@ async def get_campaign_rewards_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "List[CampaignRewards]", + '200': "List[UserCampaignRewards]", } response_data = await self.api_client.call_api( *_param, diff --git a/python/sdk/src/openapi_client/docs/RewardsApi.md b/python/sdk/src/openapi_client/docs/RewardsApi.md index 3a9ade04..a5cfccc2 100644 --- a/python/sdk/src/openapi_client/docs/RewardsApi.md +++ b/python/sdk/src/openapi_client/docs/RewardsApi.md @@ -429,7 +429,7 @@ This endpoint does not need any parameter. [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) # **get_campaign_rewards** -> List[CampaignRewards] get_campaign_rewards(campaign_name, epoch_number=epoch_number) +> List[UserCampaignRewards] get_campaign_rewards(campaign_name, epoch_number=epoch_number) Get rewards information for a specific campaign @@ -441,7 +441,7 @@ Returns the rewards earned by users for a specific campaign ```python import openapi_client -from openapi_client.models.campaign_rewards import CampaignRewards +from openapi_client.models.user_campaign_rewards import UserCampaignRewards from openapi_client.rest import ApiException from pprint import pprint @@ -489,7 +489,7 @@ Name | Type | Description | Notes ### Return type -[**List[CampaignRewards]**](CampaignRewards.md) +[**List[UserCampaignRewards]**](UserCampaignRewards.md) ### Authorization diff --git a/python/sdk/src/openapi_client/models/__init__.py b/python/sdk/src/openapi_client/models/__init__.py index 630c8a0a..cd0c8bbb 100644 --- a/python/sdk/src/openapi_client/models/__init__.py +++ b/python/sdk/src/openapi_client/models/__init__.py @@ -50,7 +50,6 @@ from openapi_client.models.asset import Asset from openapi_client.models.asset_config import AssetConfig from openapi_client.models.campaign_metadata import CampaignMetadata -from openapi_client.models.campaign_rewards import CampaignRewards from openapi_client.models.cancel_orders_request import CancelOrdersRequest from openapi_client.models.cancel_orders_response import CancelOrdersResponse from openapi_client.models.candle_price_type import CandlePriceType diff --git a/python/sdk/src/openapi_client_README.md b/python/sdk/src/openapi_client_README.md index 8aa0c7fc..03c2bd27 100644 --- a/python/sdk/src/openapi_client_README.md +++ b/python/sdk/src/openapi_client_README.md @@ -149,7 +149,6 @@ Class | Method | HTTP request | Description - [Asset](openapi_client/docs/Asset.md) - [AssetConfig](openapi_client/docs/AssetConfig.md) - [CampaignMetadata](openapi_client/docs/CampaignMetadata.md) - - [CampaignRewards](openapi_client/docs/CampaignRewards.md) - [CancelOrdersRequest](openapi_client/docs/CancelOrdersRequest.md) - [CancelOrdersResponse](openapi_client/docs/CancelOrdersResponse.md) - [CandlePriceType](openapi_client/docs/CandlePriceType.md) diff --git a/resources/rewards-data-api.yaml b/resources/rewards-data-api.yaml index 4bc870a0..1c37d14d 100644 --- a/resources/rewards-data-api.yaml +++ b/resources/rewards-data-api.yaml @@ -26,10 +26,7 @@ components: $ref: './common.yaml#/components/schemas/Error' CampaignRewards: - type: object - properties: - rewards: - $ref: "#/components/schemas/UserCampaignRewards" + $ref: "#/components/schemas/UserCampaignRewards" # Add other campaign data types as needed # Campaign rewards schema can be extended to have custom fields for the campaign once start adding more campaign specific data diff --git a/rust/gen/bluefin_api/.openapi-generator/FILES b/rust/gen/bluefin_api/.openapi-generator/FILES index 9f254b7a..4d32f03c 100644 --- a/rust/gen/bluefin_api/.openapi-generator/FILES +++ b/rust/gen/bluefin_api/.openapi-generator/FILES @@ -40,7 +40,6 @@ docs/Asset.md docs/AssetConfig.md docs/AuthApi.md docs/CampaignMetadata.md -docs/CampaignRewards.md docs/CancelOrdersRequest.md docs/CancelOrdersResponse.md docs/CandlePriceType.md @@ -162,7 +161,6 @@ src/models/affiliate_summary.rs src/models/asset.rs src/models/asset_config.rs src/models/campaign_metadata.rs -src/models/campaign_rewards.rs src/models/cancel_orders_request.rs src/models/cancel_orders_response.rs src/models/candle_price_type.rs diff --git a/rust/gen/bluefin_api/README.md b/rust/gen/bluefin_api/README.md index 364d0e39..aebc5a97 100644 --- a/rust/gen/bluefin_api/README.md +++ b/rust/gen/bluefin_api/README.md @@ -109,7 +109,6 @@ Class | Method | HTTP request | Description - [Asset](docs/Asset.md) - [AssetConfig](docs/AssetConfig.md) - [CampaignMetadata](docs/CampaignMetadata.md) - - [CampaignRewards](docs/CampaignRewards.md) - [CancelOrdersRequest](docs/CancelOrdersRequest.md) - [CancelOrdersResponse](docs/CancelOrdersResponse.md) - [CandlePriceType](docs/CandlePriceType.md) diff --git a/rust/gen/bluefin_api/docs/RewardsApi.md b/rust/gen/bluefin_api/docs/RewardsApi.md index a17f1401..c3848409 100644 --- a/rust/gen/bluefin_api/docs/RewardsApi.md +++ b/rust/gen/bluefin_api/docs/RewardsApi.md @@ -178,7 +178,7 @@ This endpoint does not need any parameter. ## get_campaign_rewards -> Vec get_campaign_rewards(campaign_name, epoch_number) +> Vec get_campaign_rewards(campaign_name, epoch_number) Get rewards information for a specific campaign Returns the rewards earned by users for a specific campaign @@ -193,7 +193,7 @@ Name | Type | Description | Required | Notes ### Return type -[**Vec**](CampaignRewards.md) +[**Vec**](UserCampaignRewards.md) ### Authorization diff --git a/rust/gen/bluefin_api/src/apis/rewards_api.rs b/rust/gen/bluefin_api/src/apis/rewards_api.rs index 46da1e5c..8bee16a8 100644 --- a/rust/gen/bluefin_api/src/apis/rewards_api.rs +++ b/rust/gen/bluefin_api/src/apis/rewards_api.rs @@ -334,7 +334,7 @@ pub async fn get_affiliate_summary(configuration: &configuration::Configuration, } /// Returns the rewards earned by users for a specific campaign -pub async fn get_campaign_rewards(configuration: &configuration::Configuration, campaign_name: &str, epoch_number: Option) -> Result, Error> { +pub async fn get_campaign_rewards(configuration: &configuration::Configuration, campaign_name: &str, epoch_number: Option) -> Result, Error> { // add a prefix to parameters to efficiently prevent name collisions let p_campaign_name = campaign_name; let p_epoch_number = epoch_number; diff --git a/rust/gen/bluefin_api/src/models/mod.rs b/rust/gen/bluefin_api/src/models/mod.rs index a6da6c80..82fceff2 100644 --- a/rust/gen/bluefin_api/src/models/mod.rs +++ b/rust/gen/bluefin_api/src/models/mod.rs @@ -70,8 +70,6 @@ pub mod asset_config; pub use self::asset_config::AssetConfig; pub mod campaign_metadata; pub use self::campaign_metadata::CampaignMetadata; -pub mod campaign_rewards; -pub use self::campaign_rewards::CampaignRewards; pub mod cancel_orders_request; pub use self::cancel_orders_request::CancelOrdersRequest; pub mod cancel_orders_response; diff --git a/ts/sdk/src/.openapi-generator/FILES b/ts/sdk/src/.openapi-generator/FILES index 48db4cdf..43c2915d 100644 --- a/ts/sdk/src/.openapi-generator/FILES +++ b/ts/sdk/src/.openapi-generator/FILES @@ -4,118 +4,4 @@ api.ts base.ts common.ts configuration.ts -docs/Account.md -docs/AccountAggregatedTradeUpdate.md -docs/AccountAuthorizationRequest.md -docs/AccountAuthorizationRequestSignedFields.md -docs/AccountCommandFailureUpdate.md -docs/AccountDataApi.md -docs/AccountDataStream.md -docs/AccountEventReason.md -docs/AccountEventType.md -docs/AccountFundingRateHistory.md -docs/AccountFundingRateHistoryData.md -docs/AccountMarketPreference.md -docs/AccountOrderUpdate.md -docs/AccountPositionLeverageUpdateRequest.md -docs/AccountPositionLeverageUpdateRequestSignedFields.md -docs/AccountPositionUpdate.md -docs/AccountPreference.md -docs/AccountStreamMessage.md -docs/AccountStreamMessagePayload.md -docs/AccountSubscriptionMessage.md -docs/AccountTradeUpdate.md -docs/AccountTransactionUpdate.md -docs/AccountUpdate.md -docs/ActiveOrderUpdate.md -docs/AdjustIsolatedMarginRequest.md -docs/AdjustIsolatedMarginRequestSignedFields.md -docs/AdjustMarginOperation.md -docs/AffiliateIntervalOverview.md -docs/AffiliateLeaderDashboard.md -docs/AffiliateMetadata.md -docs/AffiliateMetadataFees.md -docs/AffiliateOnboardResponse.md -docs/AffiliateOverview.md -docs/AffiliateSummary.md -docs/Asset.md -docs/AssetConfig.md -docs/AuthApi.md -docs/CampaignMetadata.md -docs/CampaignRewards.md -docs/CancelOrdersRequest.md -docs/CancelOrdersResponse.md -docs/CandlePriceType.md -docs/CandlestickUpdate.md -docs/ContractsConfig.md -docs/CreateOrderRequest.md -docs/CreateOrderRequestSignedFields.md -docs/CreateOrderResponse.md -docs/EpochConfigs.md -docs/EpochMetadata.md -docs/Error.md -docs/ExchangeApi.md -docs/ExchangeInfoResponse.md -docs/FundingRateEntry.md -docs/GetAffiliateIntervalOverview200Response.md -docs/GetAffiliateLeaderDashboard200Response.md -docs/GetAffiliateOverview200Response.md -docs/IntervalMetadata.md -docs/IntervalRewards.md -docs/KlineInterval.md -docs/LoginRequest.md -docs/LoginResponse.md -docs/MarginType.md -docs/MarkPriceUpdate.md -docs/Market.md -docs/MarketDataStreamName.md -docs/MarketEventType.md -docs/MarketPriceUpdate.md -docs/MarketStatus.md -docs/MarketStreamMessage.md -docs/MarketStreamMessagePayload.md -docs/MarketSubscriptionMessage.md -docs/MarketSubscriptionStreams.md -docs/OnboardAffiliateRequest.md -docs/OnboardAffiliateRequestSocialUserNames.md -docs/OnboardRefereeRequest.md -docs/OpenOrderResponse.md -docs/Operators.md -docs/OraclePriceUpdate.md -docs/OrderCancelReason.md -docs/OrderCancellationFailureReason.md -docs/OrderCancellationUpdate.md -docs/OrderSide.md -docs/OrderStatus.md -docs/OrderTimeInForce.md -docs/OrderType.md -docs/OrderbookDepthResponse.md -docs/OrderbookDiffDepthUpdate.md -docs/OrderbookPartialDepthUpdate.md -docs/Position.md -docs/PositionSide.md -docs/RecentTradesUpdates.md -docs/RefereeOnboardResponse.md -docs/RefreshTokenRequest.md -docs/RefreshTokenResponse.md -docs/RewardsApi.md -docs/RewardsSummary.md -docs/SelfTradePreventionType.md -docs/StreamsApi.md -docs/SubscriptionResponseMessage.md -docs/SubscriptionType.md -docs/TickerAllUpdate.md -docs/TickerResponse.md -docs/TickerUpdate.md -docs/Trade.md -docs/TradeApi.md -docs/TradeSide.md -docs/TradeType.md -docs/TradingFees.md -docs/Transaction.md -docs/TransactionType.md -docs/UpdateAffiliateFeeConfigRequest.md -docs/UserCampaignRewards.md -docs/WithdrawRequest.md -docs/WithdrawRequestSignedFields.md git_push.sh diff --git a/ts/sdk/src/.openapi-generator/VERSION b/ts/sdk/src/.openapi-generator/VERSION index eb1dc6a5..b23eb275 100644 --- a/ts/sdk/src/.openapi-generator/VERSION +++ b/ts/sdk/src/.openapi-generator/VERSION @@ -1 +1 @@ -7.13.0 +7.11.0 diff --git a/ts/sdk/src/api.ts b/ts/sdk/src/api.ts index ae8681f0..fbe6714e 100644 --- a/ts/sdk/src/api.ts +++ b/ts/sdk/src/api.ts @@ -1642,19 +1642,6 @@ export const CampaignMetadataStatusEnum = { export type CampaignMetadataStatusEnum = typeof CampaignMetadataStatusEnum[keyof typeof CampaignMetadataStatusEnum]; -/** - * - * @export - * @interface CampaignRewards - */ -export interface CampaignRewards { - /** - * - * @type {UserCampaignRewards} - * @memberof CampaignRewards - */ - 'rewards'?: UserCampaignRewards; -} /** * Cancelling Orders for a specific symbol. If order hashes are not specified, all orders are canceled for this symbol * @export @@ -6848,7 +6835,7 @@ export const RewardsApiFp = function(configuration?: Configuration) { * @param {*} [options] Override http request option. * @throws {RequiredError} */ - async getCampaignRewards(campaignName: string, epochNumber?: number, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { + async getCampaignRewards(campaignName: string, epochNumber?: number, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise>> { const localVarAxiosArgs = await localVarAxiosParamCreator.getCampaignRewards(campaignName, epochNumber, options); const localVarOperationServerIndex = configuration?.serverIndex ?? 0; const localVarOperationServerBasePath = operationServerMap['RewardsApi.getCampaignRewards']?.[localVarOperationServerIndex]?.url; @@ -7047,7 +7034,7 @@ export const RewardsApiFactory = function (configuration?: Configuration, basePa * @param {*} [options] Override http request option. * @throws {RequiredError} */ - getCampaignRewards(campaignName: string, epochNumber?: number, options?: RawAxiosRequestConfig): AxiosPromise> { + getCampaignRewards(campaignName: string, epochNumber?: number, options?: RawAxiosRequestConfig): AxiosPromise> { return localVarFp.getCampaignRewards(campaignName, epochNumber, options).then((request) => request(axios, basePath)); }, /** diff --git a/ts/sdk/src/configuration.ts b/ts/sdk/src/configuration.ts index 0a425a26..52e5ff6c 100644 --- a/ts/sdk/src/configuration.ts +++ b/ts/sdk/src/configuration.ts @@ -90,10 +90,11 @@ export class Configuration { this.basePath = param.basePath; this.serverIndex = param.serverIndex; this.baseOptions = { - ...param.baseOptions, headers: { ...param.baseOptions?.headers, + 'User-Agent': "OpenAPI-Generator/1.0.0/typescript-axios" }, + ...param.baseOptions }; this.formDataCtor = param.formDataCtor; }