compass_api_sdk 0.8.3__py3-none-any.whl → 0.9.1__py3-none-any.whl

compass_api_sdk/models/uniswapmintliquidityprovisionparams.py

@@ -10,10 +10,12 @@ from compass_api_sdk.types import (
     UNSET,
     UNSET_SENTINEL,
 )
+from compass_api_sdk.utils import validate_const
 import pydantic
-from pydantic import ConfigDict, model_serializer
-from typing import Any, Dict, Union
-from typing_extensions import NotRequired, TypeAliasType, TypedDict
+from pydantic import model_serializer
+from pydantic.functional_validators import AfterValidator
+from typing import Literal, Optional, Union
+from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict
 
 
 UniswapMintLiquidityProvisionParamsAmount0DesiredTypedDict = TypeAliasType(
@@ -94,16 +96,12 @@ class UniswapMintLiquidityProvisionParamsTypedDict(TypedDict):
     r"""The minimum amount of the first token to deposit"""
     amount1_min: UniswapMintLiquidityProvisionParamsAmount1MinTypedDict
     r"""The minimum amount of the second token to deposit"""
+    action_type: Literal["UNISWAP_MINT_LIQUIDITY_PROVISION"]
     recipient: NotRequired[Nullable[str]]
     r"""The address that will receive the LP tokens"""
 
 
 class UniswapMintLiquidityProvisionParams(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True, arbitrary_types_allowed=True, extra="allow"
-    )
-    __pydantic_extra__: Dict[str, Any] = pydantic.Field(init=False)
-
     token0: TokenEnum
     r"""A class representing the token.
 
@@ -142,20 +140,20 @@ class UniswapMintLiquidityProvisionParams(BaseModel):
     amount1_min: UniswapMintLiquidityProvisionParamsAmount1Min
     r"""The minimum amount of the second token to deposit"""
 
+    ACTION_TYPE: Annotated[
+        Annotated[
+            Optional[Literal["UNISWAP_MINT_LIQUIDITY_PROVISION"]],
+            AfterValidator(validate_const("UNISWAP_MINT_LIQUIDITY_PROVISION")),
+        ],
+        pydantic.Field(alias="action_type"),
+    ] = "UNISWAP_MINT_LIQUIDITY_PROVISION"
+
     recipient: OptionalNullable[str] = UNSET
     r"""The address that will receive the LP tokens"""
 
-    @property
-    def additional_properties(self):
-        return self.__pydantic_extra__
-
-    @additional_properties.setter
-    def additional_properties(self, value):
-        self.__pydantic_extra__ = value  # pyright: ignore[reportIncompatibleVariableOverride]
-
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = ["recipient"]
+        optional_fields = ["action_type", "recipient"]
         nullable_fields = ["recipient"]
         null_default_fields = []
 
@@ -181,7 +179,4 @@ class UniswapMintLiquidityProvisionParams(BaseModel):
             ):
                 m[k] = val
 
-        for k, v in serialized.items():
-            m[k] = v
-
         return m

compass_api_sdk/models/uniswapmintliquidityprovisionrequest.py

@@ -11,10 +11,12 @@ from compass_api_sdk.types import (
     UNSET,
     UNSET_SENTINEL,
 )
+from compass_api_sdk.utils import validate_const
 import pydantic
-from pydantic import ConfigDict, model_serializer
-from typing import Any, Dict, Union
-from typing_extensions import NotRequired, TypeAliasType, TypedDict
+from pydantic import model_serializer
+from pydantic.functional_validators import AfterValidator
+from typing import Literal, Optional, Union
+from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict
 
 
 UniswapMintLiquidityProvisionRequestAmount0DesiredTypedDict = TypeAliasType(
@@ -101,6 +103,7 @@ class UniswapMintLiquidityProvisionRequestTypedDict(TypedDict):
     r"""The chain to use."""
     sender: str
     r"""The address of the transaction sender."""
+    action_type: Literal["UNISWAP_MINT_LIQUIDITY_PROVISION"]
     recipient: NotRequired[Nullable[str]]
     r"""The address that will receive the LP tokens"""
 
@@ -108,11 +111,6 @@ class UniswapMintLiquidityProvisionRequestTypedDict(TypedDict):
 class UniswapMintLiquidityProvisionRequest(BaseModel):
     r"""Request model for minting a new liquidity position."""
 
-    model_config = ConfigDict(
-        populate_by_name=True, arbitrary_types_allowed=True, extra="allow"
-    )
-    __pydantic_extra__: Dict[str, Any] = pydantic.Field(init=False)
-
     token0: TokenEnum
     r"""A class representing the token.
 
@@ -157,20 +155,20 @@ class UniswapMintLiquidityProvisionRequest(BaseModel):
     sender: str
     r"""The address of the transaction sender."""
 
+    ACTION_TYPE: Annotated[
+        Annotated[
+            Optional[Literal["UNISWAP_MINT_LIQUIDITY_PROVISION"]],
+            AfterValidator(validate_const("UNISWAP_MINT_LIQUIDITY_PROVISION")),
+        ],
+        pydantic.Field(alias="action_type"),
+    ] = "UNISWAP_MINT_LIQUIDITY_PROVISION"
+
     recipient: OptionalNullable[str] = UNSET
     r"""The address that will receive the LP tokens"""
 
-    @property
-    def additional_properties(self):
-        return self.__pydantic_extra__
-
-    @additional_properties.setter
-    def additional_properties(self, value):
-        self.__pydantic_extra__ = value  # pyright: ignore[reportIncompatibleVariableOverride]
-
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
-        optional_fields = ["recipient"]
+        optional_fields = ["action_type", "recipient"]
         nullable_fields = ["recipient"]
         null_default_fields = []
 
@@ -196,7 +194,4 @@ class UniswapMintLiquidityProvisionRequest(BaseModel):
             ):
                 m[k] = val
 
-        for k, v in serialized.items():
-            m[k] = v
-
         return m

compass_api_sdk/models/uniswapsellexactlyparams.py

@@ -4,10 +4,11 @@ from __future__ import annotations
 from .feeenum import FeeEnum
 from .token_enum import TokenEnum
 from compass_api_sdk.types import BaseModel
+from compass_api_sdk.utils import validate_const
 import pydantic
-from pydantic import ConfigDict
-from typing import Any, Dict, Optional, Union
-from typing_extensions import NotRequired, TypeAliasType, TypedDict
+from pydantic.functional_validators import AfterValidator
+from typing import Literal, Optional, Union
+from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict
 
 
 UniswapSellExactlyParamsAmountTypedDict = TypeAliasType(
@@ -46,6 +47,7 @@ class UniswapSellExactlyParamsTypedDict(TypedDict):
     r"""The amount of the token to swap from"""
     max_slippage_percent: float
     r"""The maximum slippage allowed in percent. e.g. `1` means `1 %` slippage allowed."""
+    action_type: Literal["UNISWAP_SELL_EXACTLY"]
     wrap_eth: NotRequired[bool]
     r"""Whether to wrap ETH to WETH, only use when swapping WETH into something"""
 
@@ -53,11 +55,6 @@ class UniswapSellExactlyParamsTypedDict(TypedDict):
 class UniswapSellExactlyParams(BaseModel):
     r"""Parameters model for selling exactly an amount of tokens."""
 
-    model_config = ConfigDict(
-        populate_by_name=True, arbitrary_types_allowed=True, extra="allow"
-    )
-    __pydantic_extra__: Dict[str, Any] = pydantic.Field(init=False)
-
     token_in: TokenEnum
     r"""A class representing the token.
 
@@ -84,13 +81,13 @@ class UniswapSellExactlyParams(BaseModel):
     max_slippage_percent: float
     r"""The maximum slippage allowed in percent. e.g. `1` means `1 %` slippage allowed."""
 
+    ACTION_TYPE: Annotated[
+        Annotated[
+            Optional[Literal["UNISWAP_SELL_EXACTLY"]],
+            AfterValidator(validate_const("UNISWAP_SELL_EXACTLY")),
+        ],
+        pydantic.Field(alias="action_type"),
+    ] = "UNISWAP_SELL_EXACTLY"
+
     wrap_eth: Optional[bool] = False
     r"""Whether to wrap ETH to WETH, only use when swapping WETH into something"""
-
-    @property
-    def additional_properties(self):
-        return self.__pydantic_extra__
-
-    @additional_properties.setter
-    def additional_properties(self, value):
-        self.__pydantic_extra__ = value  # pyright: ignore[reportIncompatibleVariableOverride]

compass_api_sdk/models/uniswapsellexactlyrequest.py

@@ -5,10 +5,11 @@ from .chain import Chain
 from .feeenum import FeeEnum
 from .token_enum import TokenEnum
 from compass_api_sdk.types import BaseModel
+from compass_api_sdk.utils import validate_const
 import pydantic
-from pydantic import ConfigDict
-from typing import Any, Dict, Optional, Union
-from typing_extensions import NotRequired, TypeAliasType, TypedDict
+from pydantic.functional_validators import AfterValidator
+from typing import Literal, Optional, Union
+from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict
 
 
 UniswapSellExactlyRequestAmountTypedDict = TypeAliasType(
@@ -51,6 +52,7 @@ class UniswapSellExactlyRequestTypedDict(TypedDict):
     r"""The chain to use."""
     sender: str
     r"""The address of the transaction sender."""
+    action_type: Literal["UNISWAP_SELL_EXACTLY"]
     wrap_eth: NotRequired[bool]
     r"""Whether to wrap ETH to WETH, only use when swapping WETH into something"""
 
@@ -58,11 +60,6 @@ class UniswapSellExactlyRequestTypedDict(TypedDict):
 class UniswapSellExactlyRequest(BaseModel):
     r"""Request model for selling exactly an amount of tokens."""
 
-    model_config = ConfigDict(
-        populate_by_name=True, arbitrary_types_allowed=True, extra="allow"
-    )
-    __pydantic_extra__: Dict[str, Any] = pydantic.Field(init=False)
-
     token_in: TokenEnum
     r"""A class representing the token.
 
@@ -95,13 +92,13 @@ class UniswapSellExactlyRequest(BaseModel):
     sender: str
     r"""The address of the transaction sender."""
 
+    ACTION_TYPE: Annotated[
+        Annotated[
+            Optional[Literal["UNISWAP_SELL_EXACTLY"]],
+            AfterValidator(validate_const("UNISWAP_SELL_EXACTLY")),
+        ],
+        pydantic.Field(alias="action_type"),
+    ] = "UNISWAP_SELL_EXACTLY"
+
     wrap_eth: Optional[bool] = False
     r"""Whether to wrap ETH to WETH, only use when swapping WETH into something"""
-
-    @property
-    def additional_properties(self):
-        return self.__pydantic_extra__
-
-    @additional_properties.setter
-    def additional_properties(self, value):
-        self.__pydantic_extra__ = value  # pyright: ignore[reportIncompatibleVariableOverride]

compass_api_sdk/models/uniswapwithdrawliquidityprovisionparams.py

@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 from compass_api_sdk.types import BaseModel
+from compass_api_sdk.utils import validate_const
 import pydantic
-from pydantic import ConfigDict
-from typing import Any, Dict, Union
-from typing_extensions import TypeAliasType, TypedDict
+from pydantic.functional_validators import AfterValidator
+from typing import Literal, Optional, Union
+from typing_extensions import Annotated, TypeAliasType, TypedDict
 
 
 UniswapWithdrawLiquidityProvisionParamsPercentageForWithdrawalTypedDict = TypeAliasType(
@@ -34,6 +35,7 @@ class UniswapWithdrawLiquidityProvisionParamsTypedDict(TypedDict):
         UniswapWithdrawLiquidityProvisionParamsPercentageForWithdrawalTypedDict
     )
     r"""How much liquidity to take out in percentage."""
+    action_type: Literal["UNISWAP_WITHDRAW_LIQUIDITY_PROVISION"]
 
 
 class UniswapWithdrawLiquidityProvisionParams(BaseModel):
@@ -43,11 +45,6 @@ class UniswapWithdrawLiquidityProvisionParams(BaseModel):
     First, we call decrease liquidity then collect the tokens owed to the user.
     """
 
-    model_config = ConfigDict(
-        populate_by_name=True, arbitrary_types_allowed=True, extra="allow"
-    )
-    __pydantic_extra__: Dict[str, Any] = pydantic.Field(init=False)
-
     token_id: int
     r"""Token ID of the NFT representing the liquidity provisioned position."""
 
@@ -56,10 +53,10 @@ class UniswapWithdrawLiquidityProvisionParams(BaseModel):
     )
     r"""How much liquidity to take out in percentage."""
 
-    @property
-    def additional_properties(self):
-        return self.__pydantic_extra__
-
-    @additional_properties.setter
-    def additional_properties(self, value):
-        self.__pydantic_extra__ = value  # pyright: ignore[reportIncompatibleVariableOverride]
+    ACTION_TYPE: Annotated[
+        Annotated[
+            Optional[Literal["UNISWAP_WITHDRAW_LIQUIDITY_PROVISION"]],
+            AfterValidator(validate_const("UNISWAP_WITHDRAW_LIQUIDITY_PROVISION")),
+        ],
+        pydantic.Field(alias="action_type"),
+    ] = "UNISWAP_WITHDRAW_LIQUIDITY_PROVISION"

compass_api_sdk/models/uniswapwithdrawliquidityprovisionrequest.py

@@ -3,10 +3,11 @@
 from __future__ import annotations
 from .chain import Chain
 from compass_api_sdk.types import BaseModel
+from compass_api_sdk.utils import validate_const
 import pydantic
-from pydantic import ConfigDict
-from typing import Any, Dict, Union
-from typing_extensions import TypeAliasType, TypedDict
+from pydantic.functional_validators import AfterValidator
+from typing import Literal, Optional, Union
+from typing_extensions import Annotated, TypeAliasType, TypedDict
 
 
 UniswapWithdrawLiquidityProvisionRequestPercentageForWithdrawalTypedDict = (
@@ -35,14 +36,10 @@ class UniswapWithdrawLiquidityProvisionRequestTypedDict(TypedDict):
     r"""The chain to use."""
     sender: str
     r"""The address of the transaction sender."""
+    action_type: Literal["UNISWAP_WITHDRAW_LIQUIDITY_PROVISION"]
 
 
 class UniswapWithdrawLiquidityProvisionRequest(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True, arbitrary_types_allowed=True, extra="allow"
-    )
-    __pydantic_extra__: Dict[str, Any] = pydantic.Field(init=False)
-
     token_id: int
     r"""Token ID of the NFT representing the liquidity provisioned position."""
 
@@ -57,10 +54,10 @@ class UniswapWithdrawLiquidityProvisionRequest(BaseModel):
     sender: str
     r"""The address of the transaction sender."""
 
-    @property
-    def additional_properties(self):
-        return self.__pydantic_extra__
-
-    @additional_properties.setter
-    def additional_properties(self, value):
-        self.__pydantic_extra__ = value  # pyright: ignore[reportIncompatibleVariableOverride]
+    ACTION_TYPE: Annotated[
+        Annotated[
+            Optional[Literal["UNISWAP_WITHDRAW_LIQUIDITY_PROVISION"]],
+            AfterValidator(validate_const("UNISWAP_WITHDRAW_LIQUIDITY_PROVISION")),
+        ],
+        pydantic.Field(alias="action_type"),
+    ] = "UNISWAP_WITHDRAW_LIQUIDITY_PROVISION"

compass_api_sdk/models/unwrapwethparams.py

@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 from compass_api_sdk.types import BaseModel
+from compass_api_sdk.utils import validate_const
 import pydantic
-from pydantic import ConfigDict
-from typing import Any, Dict, Union
-from typing_extensions import TypeAliasType, TypedDict
+from pydantic.functional_validators import AfterValidator
+from typing import Literal, Optional, Union
+from typing_extensions import Annotated, TypeAliasType, TypedDict
 
 
 UnwrapWethParamsAmountTypedDict = TypeAliasType(
@@ -23,23 +24,19 @@ class UnwrapWethParamsTypedDict(TypedDict):
 
     amount: UnwrapWethParamsAmountTypedDict
     r"""The amount of WETH to unwrap."""
+    action_type: Literal["UNWRAP_WETH"]
 
 
 class UnwrapWethParams(BaseModel):
     r"""Parameters model for unwrapping WETH back to native ETH."""
 
-    model_config = ConfigDict(
-        populate_by_name=True, arbitrary_types_allowed=True, extra="allow"
-    )
-    __pydantic_extra__: Dict[str, Any] = pydantic.Field(init=False)
-
     amount: UnwrapWethParamsAmount
     r"""The amount of WETH to unwrap."""
 
-    @property
-    def additional_properties(self):
-        return self.__pydantic_extra__
-
-    @additional_properties.setter
-    def additional_properties(self, value):
-        self.__pydantic_extra__ = value  # pyright: ignore[reportIncompatibleVariableOverride]
+    ACTION_TYPE: Annotated[
+        Annotated[
+            Optional[Literal["UNWRAP_WETH"]],
+            AfterValidator(validate_const("UNWRAP_WETH")),
+        ],
+        pydantic.Field(alias="action_type"),
+    ] = "UNWRAP_WETH"

compass_api_sdk/models/unwrapwethrequest.py

@@ -3,10 +3,11 @@
 from __future__ import annotations
 from .chain import Chain
 from compass_api_sdk.types import BaseModel
+from compass_api_sdk.utils import validate_const
 import pydantic
-from pydantic import ConfigDict
-from typing import Any, Dict, Union
-from typing_extensions import TypeAliasType, TypedDict
+from pydantic.functional_validators import AfterValidator
+from typing import Literal, Optional, Union
+from typing_extensions import Annotated, TypeAliasType, TypedDict
 
 
 UnwrapWethRequestAmountTypedDict = TypeAliasType(
@@ -28,16 +29,12 @@ class UnwrapWethRequestTypedDict(TypedDict):
     r"""The chain to use."""
     sender: str
     r"""The address of the transaction sender."""
+    action_type: Literal["UNWRAP_WETH"]
 
 
 class UnwrapWethRequest(BaseModel):
     r"""Request model for unwrapping WETH back to native ETH."""
 
-    model_config = ConfigDict(
-        populate_by_name=True, arbitrary_types_allowed=True, extra="allow"
-    )
-    __pydantic_extra__: Dict[str, Any] = pydantic.Field(init=False)
-
     amount: UnwrapWethRequestAmount
     r"""The amount of WETH to unwrap."""
 
@@ -47,10 +44,10 @@ class UnwrapWethRequest(BaseModel):
     sender: str
     r"""The address of the transaction sender."""
 
-    @property
-    def additional_properties(self):
-        return self.__pydantic_extra__
-
-    @additional_properties.setter
-    def additional_properties(self, value):
-        self.__pydantic_extra__ = value  # pyright: ignore[reportIncompatibleVariableOverride]
+    ACTION_TYPE: Annotated[
+        Annotated[
+            Optional[Literal["UNWRAP_WETH"]],
+            AfterValidator(validate_const("UNWRAP_WETH")),
+        ],
+        pydantic.Field(alias="action_type"),
+    ] = "UNWRAP_WETH"

compass_api_sdk/models/useroperation.py

@@ -45,7 +45,6 @@ from .morphowithdrawcollateralparams import (
     MorphoWithdrawCollateralParamsTypedDict,
 )
 from .morphowithdrawparams import MorphoWithdrawParams, MorphoWithdrawParamsTypedDict
-from .multicallactiontype import MulticallActionType
 from .pendlebuyptparams import PendleBuyPtParams, PendleBuyPtParamsTypedDict
 from .pendlebuyytparams import PendleBuyYtParams, PendleBuyYtParamsTypedDict
 from .pendlesellptparams import PendleSellPtParams, PendleSellPtParamsTypedDict
@@ -81,111 +80,113 @@ from .uniswapwithdrawliquidityprovisionparams import (
 from .unwrapwethparams import UnwrapWethParams, UnwrapWethParamsTypedDict
 from .wrapethparams import WrapEthParams, WrapEthParamsTypedDict
 from compass_api_sdk.types import BaseModel
-import pydantic
-from pydantic import ConfigDict
-from typing import Any, Dict, Union
-from typing_extensions import TypeAliasType, TypedDict
+from compass_api_sdk.utils import get_discriminator
+from pydantic import Discriminator, Tag
+from typing import Union
+from typing_extensions import Annotated, TypeAliasType, TypedDict
 
 
 BodyTypedDict = TypeAliasType(
     "BodyTypedDict",
     Union[
-        WrapEthParamsTypedDict,
         UnwrapWethParamsTypedDict,
-        PendleBuyYtParamsTypedDict,
+        WrapEthParamsTypedDict,
+        SkyWithdrawParamsTypedDict,
+        MorphoSetVaultAllowanceParamsTypedDict,
+        PendleSellYtParamsTypedDict,
         UniswapWithdrawLiquidityProvisionParamsTypedDict,
+        PendleBuyYtParamsTypedDict,
+        SkySellParamsTypedDict,
         AerodromeSlipstreamWithdrawLiquidityProvisionParamsTypedDict,
-        PendleSellYtParamsTypedDict,
+        PendleBuyPtParamsTypedDict,
         SkyDepositParamsTypedDict,
         PendleSellPtParamsTypedDict,
-        PendleBuyPtParamsTypedDict,
-        SkyWithdrawParamsTypedDict,
-        MorphoSetVaultAllowanceParamsTypedDict,
         SkyBuyParamsTypedDict,
-        SkySellParamsTypedDict,
-        MorphoWithdrawParamsTypedDict,
         MorphoDepositParamsTypedDict,
+        IncreaseAllowanceParamsTypedDict,
+        MorphoWithdrawParamsTypedDict,
+        AaveWithdrawParamsTypedDict,
         TokenTransferErc20ParamsTypedDict,
         AaveSupplyParamsTypedDict,
-        AaveWithdrawParamsTypedDict,
-        IncreaseAllowanceParamsTypedDict,
+        MorphoBorrowParamsTypedDict,
+        MorphoSupplyCollateralParamsTypedDict,
         MorphoRepayParamsTypedDict,
         MorphoWithdrawCollateralParamsTypedDict,
         AaveRepayParamsTypedDict,
-        MorphoBorrowParamsTypedDict,
         AaveBorrowParamsTypedDict,
-        MorphoSupplyCollateralParamsTypedDict,
+        UniswapIncreaseLiquidityProvisionParamsTypedDict,
+        AerodromeSlipstreamIncreaseLiquidityProvisionParamsTypedDict,
         AerodromeSlipstreamBuyExactlyParamsTypedDict,
         AerodromeSlipstreamSellExactlyParamsTypedDict,
-        AerodromeSlipstreamIncreaseLiquidityProvisionParamsTypedDict,
-        UniswapIncreaseLiquidityProvisionParamsTypedDict,
         UniswapBuyExactlyParamsTypedDict,
         UniswapSellExactlyParamsTypedDict,
-        UniswapMintLiquidityProvisionParamsTypedDict,
         AerodromeSlipstreamMintLiquidityProvisionParamsTypedDict,
+        UniswapMintLiquidityProvisionParamsTypedDict,
     ],
 )
 
 
-Body = TypeAliasType(
-    "Body",
+Body = Annotated[
     Union[
-        WrapEthParams,
-        UnwrapWethParams,
-        PendleBuyYtParams,
-        UniswapWithdrawLiquidityProvisionParams,
-        AerodromeSlipstreamWithdrawLiquidityProvisionParams,
-        PendleSellYtParams,
-        SkyDepositParams,
-        PendleSellPtParams,
-        PendleBuyPtParams,
-        SkyWithdrawParams,
-        MorphoSetVaultAllowanceParams,
-        SkyBuyParams,
-        SkySellParams,
-        MorphoWithdrawParams,
-        MorphoDepositParams,
-        TokenTransferErc20Params,
-        AaveSupplyParams,
-        AaveWithdrawParams,
-        IncreaseAllowanceParams,
-        MorphoRepayParams,
-        MorphoWithdrawCollateralParams,
-        AaveRepayParams,
-        MorphoBorrowParams,
-        AaveBorrowParams,
-        MorphoSupplyCollateralParams,
-        AerodromeSlipstreamBuyExactlyParams,
-        AerodromeSlipstreamSellExactlyParams,
-        AerodromeSlipstreamIncreaseLiquidityProvisionParams,
-        UniswapIncreaseLiquidityProvisionParams,
-        UniswapBuyExactlyParams,
-        UniswapSellExactlyParams,
-        UniswapMintLiquidityProvisionParams,
-        AerodromeSlipstreamMintLiquidityProvisionParams,
+        Annotated[AaveBorrowParams, Tag("AAVE_BORROW")],
+        Annotated[AaveRepayParams, Tag("AAVE_REPAY")],
+        Annotated[AaveSupplyParams, Tag("AAVE_SUPPLY")],
+        Annotated[AaveWithdrawParams, Tag("AAVE_WITHDRAW")],
+        Annotated[
+            AerodromeSlipstreamBuyExactlyParams, Tag("AERODROME_SLIPSTREAM_BUY_EXACTLY")
+        ],
+        Annotated[
+            AerodromeSlipstreamIncreaseLiquidityProvisionParams,
+            Tag("AERODROME_SLIPSTREAM_INCREASE_LIQUIDITY"),
+        ],
+        Annotated[
+            AerodromeSlipstreamMintLiquidityProvisionParams,
+            Tag("AERODROME_SLIPSTREAM_MINT_LIQUIDITY"),
+        ],
+        Annotated[
+            AerodromeSlipstreamSellExactlyParams,
+            Tag("AERODROME_SLIPSTREAM_SELL_EXACTLY"),
+        ],
+        Annotated[
+            AerodromeSlipstreamWithdrawLiquidityProvisionParams,
+            Tag("AERODROME_SLIPSTREAM_WITHDRAW_LIQUIDITY"),
+        ],
+        Annotated[IncreaseAllowanceParams, Tag("ALLOWANCE_INCREASE")],
+        Annotated[MorphoBorrowParams, Tag("MORPHO_BORROW")],
+        Annotated[MorphoDepositParams, Tag("MORPHO_DEPOSIT")],
+        Annotated[MorphoRepayParams, Tag("MORPHO_REPAY")],
+        Annotated[MorphoSetVaultAllowanceParams, Tag("MORPHO_SET_VAULT_ALLOWANCE")],
+        Annotated[MorphoSupplyCollateralParams, Tag("MORPHO_SUPPLY_COLLATERAL")],
+        Annotated[MorphoWithdrawParams, Tag("MORPHO_WITHDRAW")],
+        Annotated[MorphoWithdrawCollateralParams, Tag("MORPHO_WITHDRAW_COLLATERAL")],
+        Annotated[PendleBuyPtParams, Tag("PENDLE_BUY_PT")],
+        Annotated[PendleBuyYtParams, Tag("PENDLE_BUY_YT")],
+        Annotated[PendleSellPtParams, Tag("PENDLE_SELL_PT")],
+        Annotated[PendleSellYtParams, Tag("PENDLE_SELL_YT")],
+        Annotated[SkyBuyParams, Tag("SKY_BUY")],
+        Annotated[SkyDepositParams, Tag("SKY_DEPOSIT")],
+        Annotated[SkySellParams, Tag("SKY_SELL")],
+        Annotated[SkyWithdrawParams, Tag("SKY_WITHDRAW")],
+        Annotated[TokenTransferErc20Params, Tag("TRANSFER_ERC20")],
+        Annotated[
+            UniswapIncreaseLiquidityProvisionParams, Tag("UNISWAP_ADD_LIQUIDITY")
+        ],
+        Annotated[UniswapBuyExactlyParams, Tag("UNISWAP_BUY_EXACTLY")],
+        Annotated[UniswapMintLiquidityProvisionParams, Tag("UNISWAP_MINT_LIQUIDITY")],
+        Annotated[UniswapSellExactlyParams, Tag("UNISWAP_SELL_EXACTLY")],
+        Annotated[
+            UniswapWithdrawLiquidityProvisionParams, Tag("UNISWAP_WITHDRAW_LIQUIDITY")
+        ],
+        Annotated[UnwrapWethParams, Tag("UNWRAP_WETH")],
+        Annotated[WrapEthParams, Tag("WRAP_ETH")],
     ],
-)
+    Discriminator(lambda m: get_discriminator(m, "action_type", "action_type")),
+]
 
 
 class UserOperationTypedDict(TypedDict):
-    action_type: MulticallActionType
     body: BodyTypedDict
 
 
 class UserOperation(BaseModel):
-    model_config = ConfigDict(
-        populate_by_name=True, arbitrary_types_allowed=True, extra="allow"
-    )
-    __pydantic_extra__: Dict[str, Any] = pydantic.Field(init=False)
-
-    action_type: MulticallActionType
-
     body: Body
-
-    @property
-    def additional_properties(self):
-        return self.__pydantic_extra__
-
-    @additional_properties.setter
-    def additional_properties(self, value):
-        self.__pydantic_extra__ = value  # pyright: ignore[reportIncompatibleVariableOverride]