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

compass_api_sdk/transaction_bundler.py

@@ -4,14 +4,15 @@ 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, List, Mapping, Optional, Union
 
 
 class TransactionBundler(BaseSDK):
-    def bundler_authorization(
+    def transaction_bundler_authorization(
         self,
         *,
-        chain: models.Chain,
+        chain: models.MulticallAuthorizationRequestChain,
         sender: str,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
@@ -27,7 +28,7 @@ class TransactionBundler(BaseSDK):
         transaction. The authorization includes a nonce and chain ID to guarantee
         transaction uniqueness and proper network targeting.
 
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The Ethereum address to use for authorization
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
@@ -51,7 +52,7 @@ class TransactionBundler(BaseSDK):
 
         req = self._build_request(
             method="POST",
-            path="/v0/transaction_bundler/authorization",
+            path="/v1/transaction_bundler/authorization",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -65,6 +66,7 @@ class TransactionBundler(BaseSDK):
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.MulticallAuthorizationRequest
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -80,8 +82,8 @@ class TransactionBundler(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="transaction_bundler_authorization",
-                oauth2_scopes=[],
+                operation_id="v1_transaction_bundler_authorization",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -91,38 +93,27 @@ class TransactionBundler(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.MulticallAuthorizationResponse
+            return unmarshal_json_response(
+                models.MulticallAuthorizationResponse, 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 bundler_authorization_async(
+    async def transaction_bundler_authorization_async(
         self,
         *,
-        chain: models.Chain,
+        chain: models.MulticallAuthorizationRequestChain,
         sender: str,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
@@ -138,7 +129,7 @@ class TransactionBundler(BaseSDK):
         transaction. The authorization includes a nonce and chain ID to guarantee
         transaction uniqueness and proper network targeting.
 
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The Ethereum address to use for authorization
         :param retries: Override the default retry configuration for this method
         :param server_url: Override the default server URL for this method
@@ -162,7 +153,7 @@ class TransactionBundler(BaseSDK):
 
         req = self._build_request_async(
             method="POST",
-            path="/v0/transaction_bundler/authorization",
+            path="/v1/transaction_bundler/authorization",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -176,6 +167,7 @@ class TransactionBundler(BaseSDK):
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.MulticallAuthorizationRequest
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -191,8 +183,8 @@ class TransactionBundler(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="transaction_bundler_authorization",
-                oauth2_scopes=[],
+                operation_id="v1_transaction_bundler_authorization",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -202,48 +194,38 @@ class TransactionBundler(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.MulticallAuthorizationResponse
+            return unmarshal_json_response(
+                models.MulticallAuthorizationResponse, 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 bundler_execute(
+    def transaction_bundler_execute(
         self,
         *,
-        chain: models.Chain,
+        chain: models.MulticallExecuteRequestChain,
         sender: str,
-        signed_authorization: Union[
-            models.SignedAuthorization, models.SignedAuthorizationTypedDict
-        ],
         actions: Union[List[models.UserOperation], List[models.UserOperationTypedDict]],
+        estimate_gas: Optional[bool] = None,
+        signed_authorization: OptionalNullable[
+            Union[models.SignedAuthorization, models.SignedAuthorizationTypedDict]
+        ] = UNSET,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.UnsignedMulticallTransaction:
+    ) -> models.BundlerTransactionResponse:
         r"""Construct Bundled Transaction
 
         Bundle arbitrary transactions together into a single multicall transaction using
@@ -254,10 +236,11 @@ class TransactionBundler(BaseSDK):
         together. The transaction must be authorized using the /authorization endpoint to
         prevent replay attacks.
 
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
-        :param signed_authorization:
         :param actions: List of possible actions for multicall
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
+        :param signed_authorization: EIP-7702 authorization
         :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
@@ -276,15 +259,16 @@ class TransactionBundler(BaseSDK):
         request = models.MulticallExecuteRequest(
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
             signed_authorization=utils.get_pydantic_model(
-                signed_authorization, models.SignedAuthorization
+                signed_authorization, OptionalNullable[models.SignedAuthorization]
             ),
             actions=utils.get_pydantic_model(actions, List[models.UserOperation]),
         )
 
         req = self._build_request(
             method="POST",
-            path="/v0/transaction_bundler/execute",
+            path="/v1/transaction_bundler/execute",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -298,6 +282,7 @@ class TransactionBundler(BaseSDK):
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.MulticallExecuteRequest
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -313,8 +298,8 @@ class TransactionBundler(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="transaction_bundler_execute",
-                oauth2_scopes=[],
+                operation_id="v1_transaction_bundler_execute",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -324,48 +309,36 @@ class TransactionBundler(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.UnsignedMulticallTransaction
-            )
+            return unmarshal_json_response(models.BundlerTransactionResponse, 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 bundler_execute_async(
+    async def transaction_bundler_execute_async(
         self,
         *,
-        chain: models.Chain,
+        chain: models.MulticallExecuteRequestChain,
         sender: str,
-        signed_authorization: Union[
-            models.SignedAuthorization, models.SignedAuthorizationTypedDict
-        ],
         actions: Union[List[models.UserOperation], List[models.UserOperationTypedDict]],
+        estimate_gas: Optional[bool] = None,
+        signed_authorization: OptionalNullable[
+            Union[models.SignedAuthorization, models.SignedAuthorizationTypedDict]
+        ] = UNSET,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.UnsignedMulticallTransaction:
+    ) -> models.BundlerTransactionResponse:
         r"""Construct Bundled Transaction
 
         Bundle arbitrary transactions together into a single multicall transaction using
@@ -376,10 +349,11 @@ class TransactionBundler(BaseSDK):
         together. The transaction must be authorized using the /authorization endpoint to
         prevent replay attacks.
 
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
-        :param signed_authorization:
         :param actions: List of possible actions for multicall
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
+        :param signed_authorization: EIP-7702 authorization
         :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
@@ -398,15 +372,16 @@ class TransactionBundler(BaseSDK):
         request = models.MulticallExecuteRequest(
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
             signed_authorization=utils.get_pydantic_model(
-                signed_authorization, models.SignedAuthorization
+                signed_authorization, OptionalNullable[models.SignedAuthorization]
             ),
             actions=utils.get_pydantic_model(actions, List[models.UserOperation]),
         )
 
         req = self._build_request_async(
             method="POST",
-            path="/v0/transaction_bundler/execute",
+            path="/v1/transaction_bundler/execute",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -420,6 +395,7 @@ class TransactionBundler(BaseSDK):
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.MulticallExecuteRequest
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -435,8 +411,8 @@ class TransactionBundler(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="transaction_bundler_execute",
-                oauth2_scopes=[],
+                operation_id="v1_transaction_bundler_execute",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -446,44 +422,28 @@ class TransactionBundler(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.UnsignedMulticallTransaction
-            )
+            return unmarshal_json_response(models.BundlerTransactionResponse, 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 bundler_aave_loop(
+    def transaction_bundler_aave_loop(
         self,
         *,
-        chain: models.Chain,
+        chain: models.AaveLoopRequestChain,
         sender: str,
-        signed_authorization: Union[
-            models.SignedAuthorization, models.SignedAuthorizationTypedDict
-        ],
-        collateral_token: models.TokenEnum,
-        borrow_token: models.TokenEnum,
+        collateral_token: str,
+        borrow_token: str,
         initial_collateral_amount: Union[
             models.InitialCollateralAmount, models.InitialCollateralAmountTypedDict
         ],
@@ -492,11 +452,18 @@ class TransactionBundler(BaseSDK):
             models.MaxSlippagePercent, models.MaxSlippagePercentTypedDict
         ],
         loan_to_value: Union[models.LoanToValue, models.LoanToValueTypedDict],
+        estimate_gas: Optional[bool] = None,
+        signed_authorization: OptionalNullable[
+            Union[models.SignedAuthorization, models.SignedAuthorizationTypedDict]
+        ] = UNSET,
+        emode_category: OptionalNullable[int] = UNSET,
+        is_account_abstraction: Optional[bool] = None,
+        account_owner: OptionalNullable[str] = UNSET,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.UnsignedMulticallTransaction:
+    ) -> models.ResponseV1TransactionBundlerAaveLoop:
         r"""AAVE Leverage Long/Short
 
         Execute an Aave looping strategy that involves repeated supply and borrow
@@ -511,15 +478,19 @@ class TransactionBundler(BaseSDK):
 
         The transaction must be authorized using the /authorization endpoint to prevent replay attacks.
 
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
-        :param signed_authorization:
-        :param collateral_token: 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 borrow_token: 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 collateral_token: Symbol or address of token to supply to Aave..
+        :param borrow_token: Symbol or address of token to borrow from Aave..
         :param initial_collateral_amount: Amount of collateral token to supply to Aave
         :param multiplier: Leverage multiplier. Total loop collateral will be calculated as `multiplier` x `initial_collateral_amount`
         :param max_slippage_percent: Maximum allowed slippage for token swaps in percentage
         :param loan_to_value: Loan To Value percentage of the loop
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
+        :param signed_authorization: EIP-7702 authorization. Required when `is_account_abstraction` is False.
+        :param emode_category: Aave E-Mode category ID to set before executing the loop. If not provided, E-Mode will not be changed.
+        :param is_account_abstraction: Whether to use account abstraction for the transaction.
+        :param account_owner: The owner address of the smart account (Safe). Required when `is_account_abstraction` is True. This address will be used as the 'from' address when building the execTransaction call.
         :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
@@ -538,8 +509,9 @@ class TransactionBundler(BaseSDK):
         request = models.AaveLoopRequest(
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
             signed_authorization=utils.get_pydantic_model(
-                signed_authorization, models.SignedAuthorization
+                signed_authorization, OptionalNullable[models.SignedAuthorization]
             ),
             collateral_token=collateral_token,
             borrow_token=borrow_token,
@@ -547,11 +519,14 @@ class TransactionBundler(BaseSDK):
             multiplier=multiplier,
             max_slippage_percent=max_slippage_percent,
             loan_to_value=loan_to_value,
+            emode_category=emode_category,
+            is_account_abstraction=is_account_abstraction,
+            account_owner=account_owner,
         )
 
         req = self._build_request(
             method="POST",
-            path="/v0/transaction_bundler/aave/loop",
+            path="/v1/transaction_bundler/aave/loop",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -565,6 +540,7 @@ class TransactionBundler(BaseSDK):
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.AaveLoopRequest
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -580,8 +556,8 @@ class TransactionBundler(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="transaction_bundler_aave_loop",
-                oauth2_scopes=[],
+                operation_id="v1_transaction_bundler_aave_loop",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -591,44 +567,30 @@ class TransactionBundler(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.UnsignedMulticallTransaction
+            return unmarshal_json_response(
+                models.ResponseV1TransactionBundlerAaveLoop, 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 bundler_aave_loop_async(
+    async def transaction_bundler_aave_loop_async(
         self,
         *,
-        chain: models.Chain,
+        chain: models.AaveLoopRequestChain,
         sender: str,
-        signed_authorization: Union[
-            models.SignedAuthorization, models.SignedAuthorizationTypedDict
-        ],
-        collateral_token: models.TokenEnum,
-        borrow_token: models.TokenEnum,
+        collateral_token: str,
+        borrow_token: str,
         initial_collateral_amount: Union[
             models.InitialCollateralAmount, models.InitialCollateralAmountTypedDict
         ],
@@ -637,11 +599,18 @@ class TransactionBundler(BaseSDK):
             models.MaxSlippagePercent, models.MaxSlippagePercentTypedDict
         ],
         loan_to_value: Union[models.LoanToValue, models.LoanToValueTypedDict],
+        estimate_gas: Optional[bool] = None,
+        signed_authorization: OptionalNullable[
+            Union[models.SignedAuthorization, models.SignedAuthorizationTypedDict]
+        ] = UNSET,
+        emode_category: OptionalNullable[int] = UNSET,
+        is_account_abstraction: Optional[bool] = None,
+        account_owner: OptionalNullable[str] = UNSET,
         retries: OptionalNullable[utils.RetryConfig] = UNSET,
         server_url: Optional[str] = None,
         timeout_ms: Optional[int] = None,
         http_headers: Optional[Mapping[str, str]] = None,
-    ) -> models.UnsignedMulticallTransaction:
+    ) -> models.ResponseV1TransactionBundlerAaveLoop:
         r"""AAVE Leverage Long/Short
 
         Execute an Aave looping strategy that involves repeated supply and borrow
@@ -656,15 +625,19 @@ class TransactionBundler(BaseSDK):
 
         The transaction must be authorized using the /authorization endpoint to prevent replay attacks.
 
-        :param chain: The chain to use.
+        :param chain:
         :param sender: The address of the transaction sender.
-        :param signed_authorization:
-        :param collateral_token: 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 borrow_token: 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 collateral_token: Symbol or address of token to supply to Aave..
+        :param borrow_token: Symbol or address of token to borrow from Aave..
         :param initial_collateral_amount: Amount of collateral token to supply to Aave
         :param multiplier: Leverage multiplier. Total loop collateral will be calculated as `multiplier` x `initial_collateral_amount`
         :param max_slippage_percent: Maximum allowed slippage for token swaps in percentage
         :param loan_to_value: Loan To Value percentage of the loop
+        :param estimate_gas: Determines whether to estimate gas costs for transactions, also verifying that the transaction can be successfully executed.
+        :param signed_authorization: EIP-7702 authorization. Required when `is_account_abstraction` is False.
+        :param emode_category: Aave E-Mode category ID to set before executing the loop. If not provided, E-Mode will not be changed.
+        :param is_account_abstraction: Whether to use account abstraction for the transaction.
+        :param account_owner: The owner address of the smart account (Safe). Required when `is_account_abstraction` is True. This address will be used as the 'from' address when building the execTransaction call.
         :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
@@ -683,8 +656,9 @@ class TransactionBundler(BaseSDK):
         request = models.AaveLoopRequest(
             chain=chain,
             sender=sender,
+            estimate_gas=estimate_gas,
             signed_authorization=utils.get_pydantic_model(
-                signed_authorization, models.SignedAuthorization
+                signed_authorization, OptionalNullable[models.SignedAuthorization]
             ),
             collateral_token=collateral_token,
             borrow_token=borrow_token,
@@ -692,11 +666,14 @@ class TransactionBundler(BaseSDK):
             multiplier=multiplier,
             max_slippage_percent=max_slippage_percent,
             loan_to_value=loan_to_value,
+            emode_category=emode_category,
+            is_account_abstraction=is_account_abstraction,
+            account_owner=account_owner,
         )
 
         req = self._build_request_async(
             method="POST",
-            path="/v0/transaction_bundler/aave/loop",
+            path="/v1/transaction_bundler/aave/loop",
             base_url=base_url,
             url_variables=url_variables,
             request=request,
@@ -710,6 +687,7 @@ class TransactionBundler(BaseSDK):
             get_serialized_body=lambda: utils.serialize_request_body(
                 request, False, False, "json", models.AaveLoopRequest
             ),
+            allow_empty_value=None,
             timeout_ms=timeout_ms,
         )
 
@@ -725,8 +703,8 @@ class TransactionBundler(BaseSDK):
             hook_ctx=HookContext(
                 config=self.sdk_configuration,
                 base_url=base_url or "",
-                operation_id="transaction_bundler_aave_loop",
-                oauth2_scopes=[],
+                operation_id="v1_transaction_bundler_aave_loop",
+                oauth2_scopes=None,
                 security_source=self.sdk_configuration.security,
             ),
             request=req,
@@ -736,30 +714,19 @@ class TransactionBundler(BaseSDK):
 
         response_data: Any = None
         if utils.match_response(http_res, "200", "application/json"):
-            return utils.unmarshal_json(
-                http_res.text, models.UnsignedMulticallTransaction
+            return unmarshal_json_response(
+                models.ResponseV1TransactionBundlerAaveLoop, 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)