compass_api_sdk 0.9.35__py3-none-any.whl → 2.0.21rc1__py3-none-any.whl

compass_api_sdk/uniswap_v3.py

@@ -4,20 +4,21 @@ from .basesdk import BaseSDK
 from compass_api_sdk import errors, models, utils
 from compass_api_sdk._hooks import HookContext
 from compass_api_sdk.types import OptionalNullable, UNSET
+from compass_api_sdk.utils.unmarshal_json_response import unmarshal_json_response
 from typing import Any, Mapping, Optional, Union
 
 
 class UniswapV3(BaseSDK):
-    def quote_buy_exactly(
+    def uniswap_quote_buy_exactly(
         self,
         *,
-        chain: models.UniswapQuoteBuyExactlyChain = models.UniswapQuoteBuyExactlyChain.ARBITRUM_MAINNET,
-        token_in: models.UniswapQuoteBuyExactlyTokenInToken = models.UniswapQuoteBuyExactlyTokenInToken.USDC,
-        token_out: models.UniswapQuoteBuyExactlyTokenOutToken = models.UniswapQuoteBuyExactlyTokenOutToken.USDT,
-        fee: models.UniswapQuoteBuyExactlyFeeEnum = models.UniswapQuoteBuyExactlyFeeEnum.ZERO_DOT_01,
+        chain: models.V1UniswapQuoteBuyExactlyChain,
+        token_in: str,
+        token_out: str,
+        fee: models.V1UniswapQuoteBuyExactlyFeeEnum,
         amount_out: Union[
-            models.UniswapQuoteBuyExactlyAmountOut,
-            models.UniswapQuoteBuyExactlyAmountOutTypedDict,
+            models.V1UniswapQuoteBuyExactlyAmountOut,
+            models.V1UniswapQuoteBuyExactlyAmountOutTypedDict,
         ],
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
@@ -32,9 +33,9 @@ class UniswapV3(BaseSDK):
         It also provides the resulting price after the transaction. The calculation takes
         into account the current pool state and the specified fee tier.
 
-        :param chain: The chain to use.
-        :param token_in: The symbol of the token to swap from.
-        :param token_out: The symbol of the token to swap to.
+        :param chain:
+        :param token_in: The symbol or address of the token to swap from.
+        :param token_out: The symbol or address of the token to swap to.
         :param fee: The fee to pay for the swap
         :param amount_out: The amount of the token to swap to
         :param retries: Override the default retry configuration for this method
@@ -52,7 +53,7 @@ class UniswapV3(BaseSDK):
         else:
             base_url = self._get_url(base_url, url_variables)
 
-        request = models.UniswapQuoteBuyExactlyRequest(
+        request = models.V1UniswapQuoteBuyExactlyRequest(
             chain=chain,
             token_in=token_in,
             token_out=token_out,
@@ -62,7 +63,7 @@ class UniswapV3(BaseSDK):
 
         req = self._build_request(
             method="GET",
-            path="/v0/uniswap/quote/buy_exactly/get",
+            path="/v1/uniswap/quote/buy_exactly",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -73,6 +74,7 @@ class UniswapV3(BaseSDK):
             accept_header_value="application/json",
             http_headers=http_headers,
             security=self.sdk_configuration.security,
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -88,8 +90,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_quote_buy_exactly",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_quote_buy_exactly",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -99,44 +101,31 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.UniswapBuyQuoteInfoResponse
-            )
+            return unmarshal_json_response(models.UniswapBuyQuoteInfoResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    async def quote_buy_exactly_async(
+    async def uniswap_quote_buy_exactly_async(
         self,
         *,
-        chain: models.UniswapQuoteBuyExactlyChain = models.UniswapQuoteBuyExactlyChain.ARBITRUM_MAINNET,
-        token_in: models.UniswapQuoteBuyExactlyTokenInToken = models.UniswapQuoteBuyExactlyTokenInToken.USDC,
-        token_out: models.UniswapQuoteBuyExactlyTokenOutToken = models.UniswapQuoteBuyExactlyTokenOutToken.USDT,
-        fee: models.UniswapQuoteBuyExactlyFeeEnum = models.UniswapQuoteBuyExactlyFeeEnum.ZERO_DOT_01,
+        chain: models.V1UniswapQuoteBuyExactlyChain,
+        token_in: str,
+        token_out: str,
+        fee: models.V1UniswapQuoteBuyExactlyFeeEnum,
         amount_out: Union[
-            models.UniswapQuoteBuyExactlyAmountOut,
-            models.UniswapQuoteBuyExactlyAmountOutTypedDict,
+            models.V1UniswapQuoteBuyExactlyAmountOut,
+            models.V1UniswapQuoteBuyExactlyAmountOutTypedDict,
         ],
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
@@ -151,9 +140,9 @@ class UniswapV3(BaseSDK):
         It also provides the resulting price after the transaction. The calculation takes
         into account the current pool state and the specified fee tier.
 
-        :param chain: The chain to use.
-        :param token_in: The symbol of the token to swap from.
-        :param token_out: The symbol of the token to swap to.
+        :param chain:
+        :param token_in: The symbol or address of the token to swap from.
+        :param token_out: The symbol or address of the token to swap to.
         :param fee: The fee to pay for the swap
         :param amount_out: The amount of the token to swap to
         :param retries: Override the default retry configuration for this method
@@ -171,7 +160,7 @@ class UniswapV3(BaseSDK):
         else:
             base_url = self._get_url(base_url, url_variables)
 
-        request = models.UniswapQuoteBuyExactlyRequest(
+        request = models.V1UniswapQuoteBuyExactlyRequest(
             chain=chain,
             token_in=token_in,
             token_out=token_out,
@@ -181,7 +170,7 @@ class UniswapV3(BaseSDK):
 
         req = self._build_request_async(
             method="GET",
-            path="/v0/uniswap/quote/buy_exactly/get",
+            path="/v1/uniswap/quote/buy_exactly",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -192,6 +181,7 @@ class UniswapV3(BaseSDK):
             accept_header_value="application/json",
             http_headers=http_headers,
             security=self.sdk_configuration.security,
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -207,8 +197,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_quote_buy_exactly",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_quote_buy_exactly",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -218,44 +208,31 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.UniswapBuyQuoteInfoResponse
-            )
+            return unmarshal_json_response(models.UniswapBuyQuoteInfoResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    def quote_sell_exactly(
+    def uniswap_quote_sell_exactly(
         self,
         *,
-        chain: models.UniswapQuoteSellExactlyChain = models.UniswapQuoteSellExactlyChain.ARBITRUM_MAINNET,
-        token_in: models.UniswapQuoteSellExactlyTokenInToken = models.UniswapQuoteSellExactlyTokenInToken.USDC,
-        token_out: models.UniswapQuoteSellExactlyTokenOutToken = models.UniswapQuoteSellExactlyTokenOutToken.USDT,
-        fee: models.UniswapQuoteSellExactlyFeeEnum = models.UniswapQuoteSellExactlyFeeEnum.ZERO_DOT_01,
+        chain: models.V1UniswapQuoteSellExactlyChain,
+        token_in: str,
+        token_out: str,
+        fee: models.V1UniswapQuoteSellExactlyFeeEnum,
         amount_in: Union[
-            models.UniswapQuoteSellExactlyAmountIn,
-            models.UniswapQuoteSellExactlyAmountInTypedDict,
+            models.V1UniswapQuoteSellExactlyAmountIn,
+            models.V1UniswapQuoteSellExactlyAmountInTypedDict,
         ],
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
@@ -270,9 +247,9 @@ class UniswapV3(BaseSDK):
         It also provides the resulting price after the transaction. The calculation takes
         into account the current pool state and the specified fee tier.
 
-        :param chain: The chain to use.
-        :param token_in: The symbol of the token to swap from.
-        :param token_out: The symbol of the token to swap to.
+        :param chain:
+        :param token_in: The symbol or address of the token to swap from.
+        :param token_out: The symbol or address of the token to swap to.
         :param fee: The fee to pay for the swap
         :param amount_in: The amount of the token to swap from
         :param retries: Override the default retry configuration for this method
@@ -290,7 +267,7 @@ class UniswapV3(BaseSDK):
         else:
             base_url = self._get_url(base_url, url_variables)
 
-        request = models.UniswapQuoteSellExactlyRequest(
+        request = models.V1UniswapQuoteSellExactlyRequest(
             chain=chain,
             token_in=token_in,
             token_out=token_out,
@@ -300,7 +277,7 @@ class UniswapV3(BaseSDK):
 
         req = self._build_request(
             method="GET",
-            path="/v0/uniswap/quote/sell_exactly/get",
+            path="/v1/uniswap/quote/sell_exactly",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -311,6 +288,7 @@ class UniswapV3(BaseSDK):
             accept_header_value="application/json",
             http_headers=http_headers,
             security=self.sdk_configuration.security,
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -326,8 +304,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_quote_sell_exactly",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_quote_sell_exactly",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -337,44 +315,33 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.UniswapSellQuoteInfoResponse
+            return unmarshal_json_response(
+                models.UniswapSellQuoteInfoResponse, http_res
             )
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    async def quote_sell_exactly_async(
+    async def uniswap_quote_sell_exactly_async(
         self,
         *,
-        chain: models.UniswapQuoteSellExactlyChain = models.UniswapQuoteSellExactlyChain.ARBITRUM_MAINNET,
-        token_in: models.UniswapQuoteSellExactlyTokenInToken = models.UniswapQuoteSellExactlyTokenInToken.USDC,
-        token_out: models.UniswapQuoteSellExactlyTokenOutToken = models.UniswapQuoteSellExactlyTokenOutToken.USDT,
-        fee: models.UniswapQuoteSellExactlyFeeEnum = models.UniswapQuoteSellExactlyFeeEnum.ZERO_DOT_01,
+        chain: models.V1UniswapQuoteSellExactlyChain,
+        token_in: str,
+        token_out: str,
+        fee: models.V1UniswapQuoteSellExactlyFeeEnum,
         amount_in: Union[
-            models.UniswapQuoteSellExactlyAmountIn,
-            models.UniswapQuoteSellExactlyAmountInTypedDict,
+            models.V1UniswapQuoteSellExactlyAmountIn,
+            models.V1UniswapQuoteSellExactlyAmountInTypedDict,
         ],
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
@@ -389,9 +356,9 @@ class UniswapV3(BaseSDK):
         It also provides the resulting price after the transaction. The calculation takes
         into account the current pool state and the specified fee tier.
 
-        :param chain: The chain to use.
-        :param token_in: The symbol of the token to swap from.
-        :param token_out: The symbol of the token to swap to.
+        :param chain:
+        :param token_in: The symbol or address of the token to swap from.
+        :param token_out: The symbol or address of the token to swap to.
         :param fee: The fee to pay for the swap
         :param amount_in: The amount of the token to swap from
         :param retries: Override the default retry configuration for this method
@@ -409,7 +376,7 @@ class UniswapV3(BaseSDK):
         else:
             base_url = self._get_url(base_url, url_variables)
 
-        request = models.UniswapQuoteSellExactlyRequest(
+        request = models.V1UniswapQuoteSellExactlyRequest(
             chain=chain,
             token_in=token_in,
             token_out=token_out,
@@ -419,7 +386,7 @@ class UniswapV3(BaseSDK):
 
         req = self._build_request_async(
             method="GET",
-            path="/v0/uniswap/quote/sell_exactly/get",
+            path="/v1/uniswap/quote/sell_exactly",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -430,6 +397,7 @@ class UniswapV3(BaseSDK):
             accept_header_value="application/json",
             http_headers=http_headers,
             security=self.sdk_configuration.security,
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -445,8 +413,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_quote_sell_exactly",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_quote_sell_exactly",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -456,41 +424,30 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.UniswapSellQuoteInfoResponse
+            return unmarshal_json_response(
+                models.UniswapSellQuoteInfoResponse, http_res
             )
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    def pool_price(
+    def uniswap_pool_price(
         self,
         *,
-        chain: models.UniswapPoolPriceChain = models.UniswapPoolPriceChain.ARBITRUM_MAINNET,
-        token_in: models.UniswapPoolPriceTokenInToken = models.UniswapPoolPriceTokenInToken.USDC,
-        token_out: models.UniswapPoolPriceTokenOutToken = models.UniswapPoolPriceTokenOutToken.USDT,
-        fee: models.UniswapPoolPriceFeeEnum = models.UniswapPoolPriceFeeEnum.ZERO_DOT_01,
+        chain: models.V1UniswapPoolPriceChain,
+        token_in: str,
+        token_out: str,
+        fee: models.V1UniswapPoolPriceFeeEnum,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -502,9 +459,9 @@ class UniswapV3(BaseSDK):
 
         The price is calculated based on the current pool state and the specified fee tier.
 
-        :param chain: The chain to use.
-        :param token_in: The symbol of a token in the pool
-        :param token_out: The symbol of a token in the pool
+        :param chain:
+        :param token_in: The symbol or address of a token in the pool
+        :param token_out: The symbol or address of a token in the pool
         :param fee: The fee of the pool
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
@@ -521,7 +478,7 @@ class UniswapV3(BaseSDK):
         else:
             base_url = self._get_url(base_url, url_variables)
 
-        request = models.UniswapPoolPriceRequest(
+        request = models.V1UniswapPoolPriceRequest(
             chain=chain,
             token_in=token_in,
             token_out=token_out,
@@ -530,7 +487,7 @@ class UniswapV3(BaseSDK):
 
         req = self._build_request(
             method="GET",
-            path="/v0/uniswap/pool_price/get",
+            path="/v1/uniswap/pool_price",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -541,6 +498,7 @@ class UniswapV3(BaseSDK):
             accept_header_value="application/json",
             http_headers=http_headers,
             security=self.sdk_configuration.security,
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -556,8 +514,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_pool_price",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_pool_price",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -567,39 +525,28 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.UniswapPoolPriceResponse)
+            return unmarshal_json_response(models.UniswapPoolPriceResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    async def pool_price_async(
+    async def uniswap_pool_price_async(
         self,
         *,
-        chain: models.UniswapPoolPriceChain = models.UniswapPoolPriceChain.ARBITRUM_MAINNET,
-        token_in: models.UniswapPoolPriceTokenInToken = models.UniswapPoolPriceTokenInToken.USDC,
-        token_out: models.UniswapPoolPriceTokenOutToken = models.UniswapPoolPriceTokenOutToken.USDT,
-        fee: models.UniswapPoolPriceFeeEnum = models.UniswapPoolPriceFeeEnum.ZERO_DOT_01,
+        chain: models.V1UniswapPoolPriceChain,
+        token_in: str,
+        token_out: str,
+        fee: models.V1UniswapPoolPriceFeeEnum,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -611,9 +558,9 @@ class UniswapV3(BaseSDK):
 
         The price is calculated based on the current pool state and the specified fee tier.
 
-        :param chain: The chain to use.
-        :param token_in: The symbol of a token in the pool
-        :param token_out: The symbol of a token in the pool
+        :param chain:
+        :param token_in: The symbol or address of a token in the pool
+        :param token_out: The symbol or address of a token in the pool
         :param fee: The fee of the pool
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
@@ -630,7 +577,7 @@ class UniswapV3(BaseSDK):
         else:
             base_url = self._get_url(base_url, url_variables)
 
-        request = models.UniswapPoolPriceRequest(
+        request = models.V1UniswapPoolPriceRequest(
             chain=chain,
             token_in=token_in,
             token_out=token_out,
@@ -639,7 +586,7 @@ class UniswapV3(BaseSDK):
 
         req = self._build_request_async(
             method="GET",
-            path="/v0/uniswap/pool_price/get",
+            path="/v1/uniswap/pool_price",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -650,6 +597,7 @@ class UniswapV3(BaseSDK):
             accept_header_value="application/json",
             http_headers=http_headers,
             security=self.sdk_configuration.security,
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -665,8 +613,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_pool_price",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_pool_price",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -676,37 +624,26 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.UniswapPoolPriceResponse)
+            return unmarshal_json_response(models.UniswapPoolPriceResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    def liquidity_provision_in_range(
+    def uniswap_liquidity_provision_in_range(
         self,
         *,
-        chain: models.UniswapLiquidityProvisionInRangeChain = models.UniswapLiquidityProvisionInRangeChain.ARBITRUM_MAINNET,
-        token_id: int = 4318185,
+        chain: models.V1UniswapLiquidityProvisionInRangeChain,
+        token_id: int,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -723,7 +660,7 @@ class UniswapV3(BaseSDK):
         they are actively participating in the trading activities within the liquidity pool
         and earning trading fees.
 
-        :param chain: The chain to use.
+        :param chain:
         :param token_id: Token ID of the NFT representing the liquidity provisioned position.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
@@ -740,14 +677,14 @@ class UniswapV3(BaseSDK):
         else:
             base_url = self._get_url(base_url, url_variables)
 
-        request = models.UniswapLiquidityProvisionInRangeRequest(
+        request = models.V1UniswapLiquidityProvisionInRangeRequest(
             chain=chain,
             token_id=token_id,
         )
 
         req = self._build_request(
             method="GET",
-            path="/v0/uniswap/liquidity_provision/in_range/get",
+            path="/v1/uniswap/liquidity_provision/in_range",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -758,6 +695,7 @@ class UniswapV3(BaseSDK):
             accept_header_value="application/json",
             http_headers=http_headers,
             security=self.sdk_configuration.security,
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -773,8 +711,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_liquidity_provision_in_range",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_liquidity_provision_in_range",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -784,39 +722,26 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.UniswapCheckInRangeResponse
-            )
+            return unmarshal_json_response(models.UniswapCheckInRangeResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    async def liquidity_provision_in_range_async(
+    async def uniswap_liquidity_provision_in_range_async(
         self,
         *,
-        chain: models.UniswapLiquidityProvisionInRangeChain = models.UniswapLiquidityProvisionInRangeChain.ARBITRUM_MAINNET,
-        token_id: int = 4318185,
+        chain: models.V1UniswapLiquidityProvisionInRangeChain,
+        token_id: int,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -833,7 +758,7 @@ class UniswapV3(BaseSDK):
         they are actively participating in the trading activities within the liquidity pool
         and earning trading fees.
 
-        :param chain: The chain to use.
+        :param chain:
         :param token_id: Token ID of the NFT representing the liquidity provisioned position.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
@@ -850,14 +775,14 @@ class UniswapV3(BaseSDK):
         else:
             base_url = self._get_url(base_url, url_variables)
 
-        request = models.UniswapLiquidityProvisionInRangeRequest(
+        request = models.V1UniswapLiquidityProvisionInRangeRequest(
             chain=chain,
             token_id=token_id,
         )
 
         req = self._build_request_async(
             method="GET",
-            path="/v0/uniswap/liquidity_provision/in_range/get",
+            path="/v1/uniswap/liquidity_provision/in_range",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -868,6 +793,7 @@ class UniswapV3(BaseSDK):
             accept_header_value="application/json",
             http_headers=http_headers,
             security=self.sdk_configuration.security,
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -883,8 +809,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_liquidity_provision_in_range",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_liquidity_provision_in_range",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -894,39 +820,26 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.UniswapCheckInRangeResponse
-            )
+            return unmarshal_json_response(models.UniswapCheckInRangeResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    def liquidity_provision_positions(
+    def uniswap_liquidity_provision_positions(
         self,
         *,
-        chain: models.UniswapLiquidityProvisionPositionsChain = models.UniswapLiquidityProvisionPositionsChain.ARBITRUM_MAINNET,
-        user: Optional[str] = "0x29F20a192328eF1aD35e1564aBFf4Be9C5ce5f7B",
+        chain: models.V1UniswapLiquidityProvisionPositionsChain,
+        user: Optional[str] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -942,7 +855,7 @@ class UniswapV3(BaseSDK):
         information is crucial for users to manage and analyze their liquidity provision
         activities effectively.
 
-        :param chain: The chain to use.
+        :param chain:
         :param user: The user to get positions for.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
@@ -959,14 +872,14 @@ class UniswapV3(BaseSDK):
         else:
             base_url = self._get_url(base_url, url_variables)
 
-        request = models.UniswapLiquidityProvisionPositionsRequest(
+        request = models.V1UniswapLiquidityProvisionPositionsRequest(
             chain=chain,
             user=user,
         )
 
         req = self._build_request(
             method="GET",
-            path="/v0/uniswap/liquidity_provision/positions/get",
+            path="/v1/uniswap/liquidity_provision/positions",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -977,6 +890,7 @@ class UniswapV3(BaseSDK):
             accept_header_value="application/json",
             http_headers=http_headers,
             security=self.sdk_configuration.security,
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -992,8 +906,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_liquidity_provision_positions",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_liquidity_provision_positions",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -1003,39 +917,28 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.UniswapLPPositionsInfoResponse
+            return unmarshal_json_response(
+                models.UniswapLPPositionsInfoResponse, http_res
             )
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    async def liquidity_provision_positions_async(
+    async def uniswap_liquidity_provision_positions_async(
         self,
         *,
-        chain: models.UniswapLiquidityProvisionPositionsChain = models.UniswapLiquidityProvisionPositionsChain.ARBITRUM_MAINNET,
-        user: Optional[str] = "0x29F20a192328eF1aD35e1564aBFf4Be9C5ce5f7B",
+        chain: models.V1UniswapLiquidityProvisionPositionsChain,
+        user: Optional[str] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
@@ -1051,7 +954,7 @@ class UniswapV3(BaseSDK):
         information is crucial for users to manage and analyze their liquidity provision
         activities effectively.
 
-        :param chain: The chain to use.
+        :param chain:
         :param user: The user to get positions for.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
@@ -1068,14 +971,14 @@ class UniswapV3(BaseSDK):
         else:
             base_url = self._get_url(base_url, url_variables)
 
-        request = models.UniswapLiquidityProvisionPositionsRequest(
+        request = models.V1UniswapLiquidityProvisionPositionsRequest(
             chain=chain,
             user=user,
         )
 
         req = self._build_request_async(
             method="GET",
-            path="/v0/uniswap/liquidity_provision/positions/get",
+            path="/v1/uniswap/liquidity_provision/positions",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -1086,6 +989,7 @@ class UniswapV3(BaseSDK):
             accept_header_value="application/json",
             http_headers=http_headers,
             security=self.sdk_configuration.security,
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -1101,8 +1005,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_liquidity_provision_positions",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_liquidity_provision_positions",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -1112,53 +1016,42 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.UniswapLPPositionsInfoResponse
+            return unmarshal_json_response(
+                models.UniswapLPPositionsInfoResponse, http_res
             )
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    def swap_buy_exactly(
+    def uniswap_swap_buy_exactly(
         self,
         *,
-        token_in: models.TokenEnum,
-        token_out: models.TokenEnum,
+        token_in: str,
+        token_out: str,
         fee: models.FeeEnum,
-        amount: Union[
-            models.UniswapBuyExactlyRequestAmount,
-            models.UniswapBuyExactlyRequestAmountTypedDict,
+        amount_out: Union[
+            models.UniswapBuyExactlyRequestAmountOut,
+            models.UniswapBuyExactlyRequestAmountOutTypedDict,
         ],
         max_slippage_percent: float,
-        chain: models.Chain,
+        chain: models.UniswapBuyExactlyRequestChain,
         sender: str,
-        wrap_eth: Optional[bool] = False,
+        estimate_gas: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.TxResponse:
+    ) -> models.UniswapBuyExactlyTransactionResponse:
         r"""Buy exact amount
 
         This endpoint allows users to trade a variable amount of one token to receive an
@@ -1166,17 +1059,27 @@ class UniswapV3(BaseSDK):
 
         The transaction is executed on the specified blockchain network, and the user must
         provide the necessary transaction details, including the token to buy, the token to
-        pay with, and the exact amount to receive. If the token being paid with is WETH and
+        pay with, and the exact amount to receive. If the token being paid with is ETH and
         needs to be wrapped, the appropriate amount will be wrapped automatically.
+        <Info>
+        **Required Allowances**
+
+        In order to make this transaction, token allowances need to be set for the following contracts.
+
+        - `UniswapV3Router`
+        </Info>
+
 
-        :param token_in: A class representing the token.  This class is used to represent the token in the system. Notice individual endpoints' documentation where per chain tokens are presented.
-        :param token_out: A class representing the token.  This class is used to represent the token in the system. Notice individual endpoints' documentation where per chain tokens are presented.
-        :param fee: The transaction fee of a Uniswap pool in bips.  Uniswap supports 4 different fee levels.
-        :param amount: The amount of the token to swap to
+        :param token_in: The symbol or address of the token to swap from..
+        :param token_out: The symbol or address of the token to swap to..
+        :param fee: The transaction fee of a Uniswap pool in bips.
+
+            Uniswap supports 4 different fee levels.
+        :param amount_out: The amount of 'token_out' to buy.
         :param max_slippage_percent: The maximum slippage allowed in percent. e.g. `1` means `1 %` slippage allowed.
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
-        :param wrap_eth: Whether to wrap ETH to WETH, only use when swapping WETH into something
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -1196,16 +1099,16 @@ class UniswapV3(BaseSDK):
             token_in=token_in,
             token_out=token_out,
             fee=fee,
-            amount=amount,
+            amount_out=amount_out,
             max_slippage_percent=max_slippage_percent,
-            wrap_eth=wrap_eth,
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
         )
 
         req = self._build_request(
             method="POST",
-            path="/v0/uniswap/swap/buy_exactly",
+            path="/v1/uniswap/swap/buy_exactly",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -1219,6 +1122,7 @@ class UniswapV3(BaseSDK):
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.UniswapBuyExactlyRequest
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -1234,8 +1138,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_swap_buy_exactly",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_swap_buy_exactly",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -1245,51 +1149,42 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return unmarshal_json_response(
+                models.UniswapBuyExactlyTransactionResponse, http_res
+            )
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    async def swap_buy_exactly_async(
+    async def uniswap_swap_buy_exactly_async(
         self,
         *,
-        token_in: models.TokenEnum,
-        token_out: models.TokenEnum,
+        token_in: str,
+        token_out: str,
         fee: models.FeeEnum,
-        amount: Union[
-            models.UniswapBuyExactlyRequestAmount,
-            models.UniswapBuyExactlyRequestAmountTypedDict,
+        amount_out: Union[
+            models.UniswapBuyExactlyRequestAmountOut,
+            models.UniswapBuyExactlyRequestAmountOutTypedDict,
         ],
         max_slippage_percent: float,
-        chain: models.Chain,
+        chain: models.UniswapBuyExactlyRequestChain,
         sender: str,
-        wrap_eth: Optional[bool] = False,
+        estimate_gas: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.TxResponse:
+    ) -> models.UniswapBuyExactlyTransactionResponse:
         r"""Buy exact amount
 
         This endpoint allows users to trade a variable amount of one token to receive an
@@ -1297,17 +1192,27 @@ class UniswapV3(BaseSDK):
 
         The transaction is executed on the specified blockchain network, and the user must
         provide the necessary transaction details, including the token to buy, the token to
-        pay with, and the exact amount to receive. If the token being paid with is WETH and
+        pay with, and the exact amount to receive. If the token being paid with is ETH and
         needs to be wrapped, the appropriate amount will be wrapped automatically.
+        <Info>
+        **Required Allowances**
+
+        In order to make this transaction, token allowances need to be set for the following contracts.
+
+        - `UniswapV3Router`
+        </Info>
+
 
-        :param token_in: A class representing the token.  This class is used to represent the token in the system. Notice individual endpoints' documentation where per chain tokens are presented.
-        :param token_out: A class representing the token.  This class is used to represent the token in the system. Notice individual endpoints' documentation where per chain tokens are presented.
-        :param fee: The transaction fee of a Uniswap pool in bips.  Uniswap supports 4 different fee levels.
-        :param amount: The amount of the token to swap to
+        :param token_in: The symbol or address of the token to swap from..
+        :param token_out: The symbol or address of the token to swap to..
+        :param fee: The transaction fee of a Uniswap pool in bips.
+
+            Uniswap supports 4 different fee levels.
+        :param amount_out: The amount of 'token_out' to buy.
         :param max_slippage_percent: The maximum slippage allowed in percent. e.g. `1` means `1 %` slippage allowed.
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
-        :param wrap_eth: Whether to wrap ETH to WETH, only use when swapping WETH into something
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -1327,16 +1232,16 @@ class UniswapV3(BaseSDK):
             token_in=token_in,
             token_out=token_out,
             fee=fee,
-            amount=amount,
+            amount_out=amount_out,
             max_slippage_percent=max_slippage_percent,
-            wrap_eth=wrap_eth,
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
         )
 
         req = self._build_request_async(
             method="POST",
-            path="/v0/uniswap/swap/buy_exactly",
+            path="/v1/uniswap/swap/buy_exactly",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -1350,6 +1255,7 @@ class UniswapV3(BaseSDK):
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.UniswapBuyExactlyRequest
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -1365,8 +1271,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_swap_buy_exactly",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_swap_buy_exactly",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -1376,51 +1282,42 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return unmarshal_json_response(
+                models.UniswapBuyExactlyTransactionResponse, http_res
+            )
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    def swap_sell_exactly(
+    def uniswap_swap_sell_exactly(
         self,
         *,
-        token_in: models.TokenEnum,
-        token_out: models.TokenEnum,
+        token_in: str,
+        token_out: str,
         fee: models.FeeEnum,
-        amount: Union[
-            models.UniswapSellExactlyRequestAmount,
-            models.UniswapSellExactlyRequestAmountTypedDict,
+        amount_in: Union[
+            models.UniswapSellExactlyRequestAmountIn,
+            models.UniswapSellExactlyRequestAmountInTypedDict,
         ],
         max_slippage_percent: float,
-        chain: models.Chain,
+        chain: models.UniswapSellExactlyRequestChain,
         sender: str,
-        wrap_eth: Optional[bool] = False,
+        estimate_gas: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.TxResponse:
+    ) -> models.UniswapSellExactlyTransactionResponse:
         r"""Sell exact amount
 
         This endpoint allows users to trade a specific amount of one token into another
@@ -1428,17 +1325,27 @@ class UniswapV3(BaseSDK):
 
         The transaction is executed on the specified blockchain network, and the user must
         provide the necessary transaction details, including the token to sell, the token to
-        receive, and the amount to sell. If the token being sold is WETH and needs to be
+        receive, and the amount to sell. If the token being sold is ETH and needs to be
         wrapped, the appropriate amount will be wrapped automatically.
+        <Info>
+        **Required Allowances**
 
-        :param token_in: A class representing the token.  This class is used to represent the token in the system. Notice individual endpoints' documentation where per chain tokens are presented.
-        :param token_out: A class representing the token.  This class is used to represent the token in the system. Notice individual endpoints' documentation where per chain tokens are presented.
-        :param fee: The transaction fee of a Uniswap pool in bips.  Uniswap supports 4 different fee levels.
-        :param amount: The amount of the token to swap from
+        In order to make this transaction, token allowances need to be set for the following contracts.
+
+        - `UniswapV3Router`
+        </Info>
+
+
+        :param token_in: The symbol or address of the token to sell..
+        :param token_out: The symbol or address of the token to buy..
+        :param fee: The transaction fee of a Uniswap pool in bips.
+
+            Uniswap supports 4 different fee levels.
+        :param amount_in: The amount of the `token_in` to sell
         :param max_slippage_percent: The maximum slippage allowed in percent. e.g. `1` means `1 %` slippage allowed.
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
-        :param wrap_eth: Whether to wrap ETH to WETH, only use when swapping WETH into something
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -1458,16 +1365,16 @@ class UniswapV3(BaseSDK):
             token_in=token_in,
             token_out=token_out,
             fee=fee,
-            amount=amount,
+            amount_in=amount_in,
             max_slippage_percent=max_slippage_percent,
-            wrap_eth=wrap_eth,
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
         )
 
         req = self._build_request(
             method="POST",
-            path="/v0/uniswap/swap/sell_exactly",
+            path="/v1/uniswap/swap/sell_exactly",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -1481,6 +1388,7 @@ class UniswapV3(BaseSDK):
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.UniswapSellExactlyRequest
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -1496,8 +1404,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_swap_sell_exactly",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_swap_sell_exactly",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -1507,51 +1415,42 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return unmarshal_json_response(
+                models.UniswapSellExactlyTransactionResponse, http_res
+            )
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    async def swap_sell_exactly_async(
+    async def uniswap_swap_sell_exactly_async(
         self,
         *,
-        token_in: models.TokenEnum,
-        token_out: models.TokenEnum,
+        token_in: str,
+        token_out: str,
         fee: models.FeeEnum,
-        amount: Union[
-            models.UniswapSellExactlyRequestAmount,
-            models.UniswapSellExactlyRequestAmountTypedDict,
+        amount_in: Union[
+            models.UniswapSellExactlyRequestAmountIn,
+            models.UniswapSellExactlyRequestAmountInTypedDict,
         ],
         max_slippage_percent: float,
-        chain: models.Chain,
+        chain: models.UniswapSellExactlyRequestChain,
         sender: str,
-        wrap_eth: Optional[bool] = False,
+        estimate_gas: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.TxResponse:
+    ) -> models.UniswapSellExactlyTransactionResponse:
         r"""Sell exact amount
 
         This endpoint allows users to trade a specific amount of one token into another
@@ -1559,17 +1458,27 @@ class UniswapV3(BaseSDK):
 
         The transaction is executed on the specified blockchain network, and the user must
         provide the necessary transaction details, including the token to sell, the token to
-        receive, and the amount to sell. If the token being sold is WETH and needs to be
+        receive, and the amount to sell. If the token being sold is ETH and needs to be
         wrapped, the appropriate amount will be wrapped automatically.
+        <Info>
+        **Required Allowances**
+
+        In order to make this transaction, token allowances need to be set for the following contracts.
+
+        - `UniswapV3Router`
+        </Info>
 
-        :param token_in: A class representing the token.  This class is used to represent the token in the system. Notice individual endpoints' documentation where per chain tokens are presented.
-        :param token_out: A class representing the token.  This class is used to represent the token in the system. Notice individual endpoints' documentation where per chain tokens are presented.
-        :param fee: The transaction fee of a Uniswap pool in bips.  Uniswap supports 4 different fee levels.
-        :param amount: The amount of the token to swap from
+
+        :param token_in: The symbol or address of the token to sell..
+        :param token_out: The symbol or address of the token to buy..
+        :param fee: The transaction fee of a Uniswap pool in bips.
+
+            Uniswap supports 4 different fee levels.
+        :param amount_in: The amount of the `token_in` to sell
         :param max_slippage_percent: The maximum slippage allowed in percent. e.g. `1` means `1 %` slippage allowed.
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
-        :param wrap_eth: Whether to wrap ETH to WETH, only use when swapping WETH into something
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -1589,16 +1498,16 @@ class UniswapV3(BaseSDK):
             token_in=token_in,
             token_out=token_out,
             fee=fee,
-            amount=amount,
+            amount_in=amount_in,
             max_slippage_percent=max_slippage_percent,
-            wrap_eth=wrap_eth,
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
         )
 
         req = self._build_request_async(
             method="POST",
-            path="/v0/uniswap/swap/sell_exactly",
+            path="/v1/uniswap/swap/sell_exactly",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -1612,6 +1521,7 @@ class UniswapV3(BaseSDK):
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.UniswapSellExactlyRequest
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -1627,8 +1537,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_swap_sell_exactly",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_swap_sell_exactly",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -1638,37 +1548,28 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return unmarshal_json_response(
+                models.UniswapSellExactlyTransactionResponse, http_res
+            )
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    def liquidity_provision_mint(
+    def uniswap_liquidity_provision_mint(
         self,
         *,
-        token0: models.TokenEnum,
-        token1: models.TokenEnum,
+        token0: str,
+        token1: str,
         fee: models.FeeEnum,
         tick_lower: int,
         tick_upper: int,
@@ -1688,14 +1589,15 @@ class UniswapV3(BaseSDK):
             models.UniswapMintLiquidityProvisionRequestAmount1Min,
             models.UniswapMintLiquidityProvisionRequestAmount1MinTypedDict,
         ],
-        chain: models.Chain,
+        chain: models.UniswapMintLiquidityProvisionRequestChain,
         sender: str,
         recipient: OptionalNullable[str] = UNSET,
+        estimate_gas: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.TxResponse:
+    ) -> models.TransactionResponse:
         r"""Open a new LP position
 
         This endpoint allows users to open a new Liquidity Provider (LP) position on the
@@ -1707,19 +1609,30 @@ class UniswapV3(BaseSDK):
         enabling them to earn fees from trades that occur within the pool. The endpoint
         requires details such as the token pair, amount, and any additional parameters
         needed for the minting process.
+        <Info>
+        **Required Allowances**
+
+        In order to make this transaction, token allowances need to be set for the following contracts.
+
+        - `UniswapV3NFTPositionManager`
+        </Info>
+
 
-        :param token0: A class representing the token.  This class is used to represent the token in the system. Notice individual endpoints' documentation where per chain tokens are presented.
-        :param token1: A class representing the token.  This class is used to represent the token in the system. Notice individual endpoints' documentation where per chain tokens are presented.
-        :param fee: The transaction fee of a Uniswap pool in bips.  Uniswap supports 4 different fee levels.
+        :param token0: The symbol or address of the first token in the pair.
+        :param token1: The symbol or address of the second token in the pair.
+        :param fee: The transaction fee of a Uniswap pool in bips.
+
+            Uniswap supports 4 different fee levels.
         :param tick_lower: The lower tick of the range to mint the position in
         :param tick_upper: The upper tick of the range to mint the position in
         :param amount0_desired: The desired amount of the first token to deposit
         :param amount1_desired: The desired amount of the second token to deposit
         :param amount0_min: The minimum amount of the first token to deposit
         :param amount1_min: The minimum amount of the second token to deposit
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
         :param recipient: The address that will receive the LP tokens
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -1748,11 +1661,12 @@ class UniswapV3(BaseSDK):
             recipient=recipient,
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
         )
 
         req = self._build_request(
             method="POST",
-            path="/v0/uniswap/liquidity_provision/mint",
+            path="/v1/uniswap/liquidity_provision/mint",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -1770,6 +1684,7 @@ class UniswapV3(BaseSDK):
                 "json",
                 models.UniswapMintLiquidityProvisionRequest,
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -1785,8 +1700,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_liquidity_provision_mint",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_liquidity_provision_mint",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -1796,37 +1711,26 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return unmarshal_json_response(models.TransactionResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    async def liquidity_provision_mint_async(
+    async def uniswap_liquidity_provision_mint_async(
         self,
         *,
-        token0: models.TokenEnum,
-        token1: models.TokenEnum,
+        token0: str,
+        token1: str,
         fee: models.FeeEnum,
         tick_lower: int,
         tick_upper: int,
@@ -1846,14 +1750,15 @@ class UniswapV3(BaseSDK):
             models.UniswapMintLiquidityProvisionRequestAmount1Min,
             models.UniswapMintLiquidityProvisionRequestAmount1MinTypedDict,
         ],
-        chain: models.Chain,
+        chain: models.UniswapMintLiquidityProvisionRequestChain,
         sender: str,
         recipient: OptionalNullable[str] = UNSET,
+        estimate_gas: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.TxResponse:
+    ) -> models.TransactionResponse:
         r"""Open a new LP position
 
         This endpoint allows users to open a new Liquidity Provider (LP) position on the
@@ -1865,19 +1770,30 @@ class UniswapV3(BaseSDK):
         enabling them to earn fees from trades that occur within the pool. The endpoint
         requires details such as the token pair, amount, and any additional parameters
         needed for the minting process.
+        <Info>
+        **Required Allowances**
+
+        In order to make this transaction, token allowances need to be set for the following contracts.
+
+        - `UniswapV3NFTPositionManager`
+        </Info>
+
 
-        :param token0: A class representing the token.  This class is used to represent the token in the system. Notice individual endpoints' documentation where per chain tokens are presented.
-        :param token1: A class representing the token.  This class is used to represent the token in the system. Notice individual endpoints' documentation where per chain tokens are presented.
-        :param fee: The transaction fee of a Uniswap pool in bips.  Uniswap supports 4 different fee levels.
+        :param token0: The symbol or address of the first token in the pair.
+        :param token1: The symbol or address of the second token in the pair.
+        :param fee: The transaction fee of a Uniswap pool in bips.
+
+            Uniswap supports 4 different fee levels.
         :param tick_lower: The lower tick of the range to mint the position in
         :param tick_upper: The upper tick of the range to mint the position in
         :param amount0_desired: The desired amount of the first token to deposit
         :param amount1_desired: The desired amount of the second token to deposit
         :param amount0_min: The minimum amount of the first token to deposit
         :param amount1_min: The minimum amount of the second token to deposit
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
         :param recipient: The address that will receive the LP tokens
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -1906,11 +1822,12 @@ class UniswapV3(BaseSDK):
             recipient=recipient,
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
         )
 
         req = self._build_request_async(
             method="POST",
-            path="/v0/uniswap/liquidity_provision/mint",
+            path="/v1/uniswap/liquidity_provision/mint",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -1928,6 +1845,7 @@ class UniswapV3(BaseSDK):
                 "json",
                 models.UniswapMintLiquidityProvisionRequest,
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -1943,8 +1861,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_liquidity_provision_mint",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_liquidity_provision_mint",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -1954,33 +1872,22 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return unmarshal_json_response(models.TransactionResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    def liquidity_provision_increase(
+    def uniswap_liquidity_provision_increase(
         self,
         *,
         token_id: int,
@@ -2000,13 +1907,14 @@ class UniswapV3(BaseSDK):
             models.UniswapIncreaseLiquidityProvisionRequestAmount1Min,
             models.UniswapIncreaseLiquidityProvisionRequestAmount1MinTypedDict,
         ],
-        chain: models.Chain,
+        chain: models.UniswapIncreaseLiquidityProvisionRequestChain,
         sender: str,
+        estimate_gas: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.TxResponse:
+    ) -> models.TransactionResponse:
         r"""Increase an LP position
 
         This endpoint allows users to increase their existing Liquidity Provider (LP)
@@ -2018,14 +1926,23 @@ class UniswapV3(BaseSDK):
         within the pool. The endpoint requires details such as the token pair, additional
         amount to be added, and any other parameters necessary for the liquidity increase
         process.
+        <Info>
+        **Required Allowances**
+
+        In order to make this transaction, token allowances need to be set for the following contracts.
+
+        - `AerodromeSlipstreamRouter`
+        </Info>
+
 
         :param token_id: Token ID of the NFT representing the liquidity provisioned position.
         :param amount0_desired: The desired amount of the first token to deposit
         :param amount1_desired: The desired amount of the second token to deposit
         :param amount0_min: The minimum amount of the first token to deposit
         :param amount1_min: The minimum amount of the second token to deposit
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -2049,11 +1966,12 @@ class UniswapV3(BaseSDK):
             amount1_min=amount1_min,
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
         )
 
         req = self._build_request(
             method="POST",
-            path="/v0/uniswap/liquidity_provision/increase",
+            path="/v1/uniswap/liquidity_provision/increase",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -2071,6 +1989,7 @@ class UniswapV3(BaseSDK):
                 "json",
                 models.UniswapIncreaseLiquidityProvisionRequest,
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -2086,8 +2005,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_liquidity_provision_increase",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_liquidity_provision_increase",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -2097,33 +2016,22 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return unmarshal_json_response(models.TransactionResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    async def liquidity_provision_increase_async(
+    async def uniswap_liquidity_provision_increase_async(
         self,
         *,
         token_id: int,
@@ -2143,13 +2051,14 @@ class UniswapV3(BaseSDK):
             models.UniswapIncreaseLiquidityProvisionRequestAmount1Min,
             models.UniswapIncreaseLiquidityProvisionRequestAmount1MinTypedDict,
         ],
-        chain: models.Chain,
+        chain: models.UniswapIncreaseLiquidityProvisionRequestChain,
         sender: str,
+        estimate_gas: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.TxResponse:
+    ) -> models.TransactionResponse:
         r"""Increase an LP position
 
         This endpoint allows users to increase their existing Liquidity Provider (LP)
@@ -2161,14 +2070,23 @@ class UniswapV3(BaseSDK):
         within the pool. The endpoint requires details such as the token pair, additional
         amount to be added, and any other parameters necessary for the liquidity increase
         process.
+        <Info>
+        **Required Allowances**
+
+        In order to make this transaction, token allowances need to be set for the following contracts.
+
+        - `AerodromeSlipstreamRouter`
+        </Info>
+
 
         :param token_id: Token ID of the NFT representing the liquidity provisioned position.
         :param amount0_desired: The desired amount of the first token to deposit
         :param amount1_desired: The desired amount of the second token to deposit
         :param amount0_min: The minimum amount of the first token to deposit
         :param amount1_min: The minimum amount of the second token to deposit
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -2192,11 +2110,12 @@ class UniswapV3(BaseSDK):
             amount1_min=amount1_min,
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
         )
 
         req = self._build_request_async(
             method="POST",
-            path="/v0/uniswap/liquidity_provision/increase",
+            path="/v1/uniswap/liquidity_provision/increase",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -2214,6 +2133,7 @@ class UniswapV3(BaseSDK):
                 "json",
                 models.UniswapIncreaseLiquidityProvisionRequest,
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -2229,8 +2149,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_liquidity_provision_increase",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_liquidity_provision_increase",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -2240,33 +2160,22 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return unmarshal_json_response(models.TransactionResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    def liquidity_provision_withdraw(
+    def uniswap_liquidity_provision_withdraw(
         self,
         *,
         token_id: int,
@@ -2274,13 +2183,14 @@ class UniswapV3(BaseSDK):
             models.UniswapWithdrawLiquidityProvisionRequestPercentageForWithdrawal,
             models.UniswapWithdrawLiquidityProvisionRequestPercentageForWithdrawalTypedDict,
         ],
-        chain: models.Chain,
+        chain: models.UniswapWithdrawLiquidityProvisionRequestChain,
         sender: str,
+        estimate_gas: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.TxResponse:
+    ) -> models.TransactionResponse:
         r"""Withdraw an LP position
 
         This endpoint allows users to withdraw their Liquidity Provider (LP) positions
@@ -2293,11 +2203,20 @@ class UniswapV3(BaseSDK):
         amount to be withdrawn, and any additional parameters needed for the withdrawal
         process. Users should ensure they meet any protocol requirements or conditions
         before initiating a withdrawal to avoid potential issues or penalties.
+        <Info>
+        **Required Allowances**
+
+        In order to make this transaction, token allowances need to be set for the following contracts.
+
+        - `UniswapV3NFTPositionManager`
+        </Info>
+
 
         :param token_id: Token ID of the NFT representing the liquidity provisioned position.
         :param percentage_for_withdrawal: How much liquidity to take out in percentage.
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -2318,11 +2237,12 @@ class UniswapV3(BaseSDK):
             percentage_for_withdrawal=percentage_for_withdrawal,
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
         )
 
         req = self._build_request(
             method="POST",
-            path="/v0/uniswap/liquidity_provision/withdraw",
+            path="/v1/uniswap/liquidity_provision/withdraw",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -2340,6 +2260,7 @@ class UniswapV3(BaseSDK):
                 "json",
                 models.UniswapWithdrawLiquidityProvisionRequest,
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -2355,8 +2276,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_liquidity_provision_withdraw",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_liquidity_provision_withdraw",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -2366,33 +2287,22 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return unmarshal_json_response(models.TransactionResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = utils.stream_to_text(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = utils.stream_to_text(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)
 
-    async def liquidity_provision_withdraw_async(
+    async def uniswap_liquidity_provision_withdraw_async(
         self,
         *,
         token_id: int,
@@ -2400,13 +2310,14 @@ class UniswapV3(BaseSDK):
             models.UniswapWithdrawLiquidityProvisionRequestPercentageForWithdrawal,
             models.UniswapWithdrawLiquidityProvisionRequestPercentageForWithdrawalTypedDict,
         ],
-        chain: models.Chain,
+        chain: models.UniswapWithdrawLiquidityProvisionRequestChain,
         sender: str,
+        estimate_gas: Optional[bool] = None,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.TxResponse:
+    ) -> models.TransactionResponse:
         r"""Withdraw an LP position
 
         This endpoint allows users to withdraw their Liquidity Provider (LP) positions
@@ -2419,11 +2330,20 @@ class UniswapV3(BaseSDK):
         amount to be withdrawn, and any additional parameters needed for the withdrawal
         process. Users should ensure they meet any protocol requirements or conditions
         before initiating a withdrawal to avoid potential issues or penalties.
+        <Info>
+        **Required Allowances**
+
+        In order to make this transaction, token allowances need to be set for the following contracts.
+
+        - `UniswapV3NFTPositionManager`
+        </Info>
+
 
         :param token_id: Token ID of the NFT representing the liquidity provisioned position.
         :param percentage_for_withdrawal: How much liquidity to take out in percentage.
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
         :param timeout_ms: Override the default request timeout configuration for this method in milliseconds
@@ -2444,11 +2364,12 @@ class UniswapV3(BaseSDK):
             percentage_for_withdrawal=percentage_for_withdrawal,
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
         )
 
         req = self._build_request_async(
             method="POST",
-            path="/v0/uniswap/liquidity_provision/withdraw",
+            path="/v1/uniswap/liquidity_provision/withdraw",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -2466,6 +2387,7 @@ class UniswapV3(BaseSDK):
                 "json",
                 models.UniswapWithdrawLiquidityProvisionRequest,
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -2481,8 +2403,8 @@ class UniswapV3(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="uniswap_liquidity_provision_withdraw",
-                oauth2_scopes=[],
+                operation_id="v1_uniswap_liquidity_provision_withdraw",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -2492,28 +2414,17 @@ class UniswapV3(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(http_res.text, models.TxResponse)
+            return unmarshal_json_response(models.TransactionResponse, http_res)
         if utils.match_response(http_res, "422", "application/json"):
-            response_data = utils.unmarshal_json(
-                http_res.text, errors.HTTPValidationErrorData
+            response_data = unmarshal_json_response(
+                errors.HTTPValidationErrorData, http_res
             )
-            raise errors.HTTPValidationError(data=response_data)
+            raise errors.HTTPValidationError(response_data, http_res)
         if utils.match_response(http_res, "4XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
         if utils.match_response(http_res, "5XX", "*"):
             http_res_text = await utils.stream_to_text_async(http_res)
-            raise errors.APIError(
-                "API error occurred", http_res.status_code, http_res_text, http_res
-            )
+            raise errors.APIError("API error occurred", http_res, http_res_text)
 
-        content_type = http_res.headers.get("Content-Type")
-        http_res_text = await utils.stream_to_text_async(http_res)
-        raise errors.APIError(
-            f"Unexpected response received (code: {http_res.status_code}, type: {content_type})",
-            http_res.status_code,
-            http_res_text,
-            http_res,
-        )
+        raise errors.APIError("Unexpected response received", http_res)