tonutils 2.0.1b6__py3-none-any.whl → 2.0.1b8__py3-none-any.whl

tonutils/clients/http/provider/toncenter.py

@@ -1,7 +1,6 @@
 import typing as t
 
 import aiohttp
-from pydantic import BaseModel
 
 from tonutils.clients.http.provider.base import HttpProvider
 from tonutils.clients.http.provider.models import (
@@ -10,7 +9,7 @@ from tonutils.clients.http.provider.models import (
     GetAddressInformationResult,
     GetTransactionsResult,
     RunGetMethodPayload,
-    RunGetMethodResul,
+    RunGetMethodResult,
 )
 from tonutils.types import NetworkGlobalID, RetryPolicy
 
@@ -37,6 +36,7 @@ class ToncenterHttpProvider(HttpProvider):
         }
         base_url = base_url or urls[network]
         headers = {**(headers or {}), **({"X-Api-Key": api_key} if api_key else {})}
+
         super().__init__(
             base_url=base_url,
             session=session,
@@ -48,10 +48,6 @@ class ToncenterHttpProvider(HttpProvider):
             retry_policy=retry_policy,
         )
 
-    @staticmethod
-    def _model(model: t.Type[BaseModel], data: t.Any) -> t.Any:
-        return model.model_validate(data)
-
     async def send_boc(
         self,
         payload: SendBocPayload,
@@ -116,9 +112,9 @@ class ToncenterHttpProvider(HttpProvider):
     async def run_get_method(
         self,
         payload: RunGetMethodPayload,
-    ) -> RunGetMethodResul:
+    ) -> RunGetMethodResult:
         return self._model(
-            RunGetMethodResul,
+            RunGetMethodResult,
             await self.send_http_request(
                 "POST",
                 "/runGetMethod",

tonutils/clients/protocol.py

@@ -6,7 +6,7 @@ from pytoniq_core import Cell, Transaction
 
 from tonutils.types import (
     AddressLike,
-    ContractStateInfo,
+    ContractInfo,
     DNSCategory,
     NetworkGlobalID,
     ClientType,
@@ -40,19 +40,19 @@ class ClientProtocol(t.Protocol):
         """Underlying provider or transport backend."""
 
     @property
-    def is_connected(self) -> bool:
+    def connected(self) -> bool:
         """Whether the client is connected and ready for requests."""
 
-    async def send_boc(self, boc: str) -> None:
+    async def send_message(self, boc: str) -> None:
         """Send an external message to the blockchain."""
 
-    async def get_blockchain_config(self) -> t.Dict[int, t.Any]:
+    async def get_config(self) -> t.Dict[int, t.Any]:
         """Fetch global blockchain configuration."""
 
-    async def get_contract_info(
+    async def get_info(
         self,
         address: AddressLike,
-    ) -> ContractStateInfo:
+    ) -> ContractInfo:
         """Fetch basic contract state information."""
 
     async def get_transactions(

tonutils/contracts/__init__.py

@@ -127,6 +127,8 @@ from .vanity import (
 from .versions import ContractVersion
 from .wallet import (
     BaseMessageBuilder,
+    BaseWalletData,
+    BaseWalletParams,
     EncryptedTextCommentBody,
     ExternalMessage,
     InternalMessage,
@@ -194,6 +196,7 @@ __all__ = [
     "ALLOWED_DNS_ZONES",
     "BaseContract",
     "BaseMessageBuilder",
+    "BaseWalletData",
     "ChangeDNSRecordBody",
     "CONTRACT_CODES",
     "ContractProtocol",

tonutils/contracts/base.py

@@ -13,7 +13,7 @@ from tonutils.exceptions import (
     StateNotLoadedError,
     ProviderResponseError,
 )
-from tonutils.types import AddressLike, ContractState, ContractStateInfo, WorkchainID
+from tonutils.types import AddressLike, ContractInfo, ContractState, WorkchainID
 from tonutils.utils import to_cell
 
 _R = t.TypeVar("_R")
@@ -61,7 +61,7 @@ class BaseContract(ContractProtocol[_D]):
         client: ClientProtocol,
         address: Address,
         state_init: t.Optional[StateInit] = None,
-        state_info: t.Optional[ContractStateInfo] = None,
+        info: t.Optional[ContractInfo] = None,
     ) -> None:
         """
         Initialize base contract wrapper.
@@ -69,12 +69,12 @@ class BaseContract(ContractProtocol[_D]):
         :param client: TON client for blockchain interactions
         :param address: Contract address on the blockchain
         :param state_init: Optional known StateInit (code and data)
-        :param state_info: Optional preloaded on-chain contract state
+        :param info: Optional preloaded on-chain contract state
         """
         self._client = client
         self._address = address
         self._state_init = state_init
-        self._state_info = state_info
+        self._info = info
 
     @property
     def client(self) -> ClientProtocol:
@@ -91,17 +91,6 @@ class BaseContract(ContractProtocol[_D]):
         """Locally known StateInit for this contract, if any."""
         return self._state_init
 
-    @property
-    def state_info(self) -> ContractStateInfo:
-        """
-        Cached snapshot of the contract state.
-
-        :return: Contract state information
-        """
-        if self._state_info is None:
-            raise StateNotLoadedError(self, missing="state_info")
-        return t.cast(ContractStateInfo, self._state_info)
-
     @property
     def state_data(self) -> _D:
         """
@@ -113,11 +102,22 @@ class BaseContract(ContractProtocol[_D]):
         """
         if not hasattr(self, "_data_model") or self._data_model is None:
             raise ContractError(self, "No `_data_model` defined for contract class.")
-        if not (self._state_info and self._state_info.data):
+        if not (self._info and self._info.data):
             raise StateNotLoadedError(self, missing="state_data")
-        cs = self._state_info.data.begin_parse()
+        cs = self._info.data.begin_parse()
         return self._data_model.deserialize(cs)
 
+    @property
+    def info(self) -> ContractInfo:
+        """
+        Cached snapshot of the contract state info.
+
+        :return: Contract state information
+        """
+        if self._info is None:
+            raise StateNotLoadedError(self, missing="info")
+        return t.cast(ContractInfo, self._info)
+
     @property
     def balance(self) -> int:
         """
@@ -125,7 +125,7 @@ class BaseContract(ContractProtocol[_D]):
 
         :return: Balance from the latest known state
         """
-        return self.state_info.balance
+        return self.info.balance
 
     @property
     def state(self) -> ContractState:
@@ -134,7 +134,7 @@ class BaseContract(ContractProtocol[_D]):
 
         :return: One of ContractState enum values (ACTIVE, FROZEN, UNINIT, NONEXIST)
         """
-        return self.state_info.state
+        return self.info.state
 
     @property
     def is_active(self) -> bool:
@@ -179,7 +179,7 @@ class BaseContract(ContractProtocol[_D]):
 
         :return: Transaction LT or None if unknown
         """
-        return self.state_info.last_transaction_lt
+        return self.info.last_transaction_lt
 
     @property
     def last_transaction_hash(self) -> t.Optional[str]:
@@ -188,7 +188,7 @@ class BaseContract(ContractProtocol[_D]):
 
         :return: Transaction hash as hex string or None if unknown
         """
-        return self.state_info.last_transaction_hash
+        return self.info.last_transaction_hash
 
     @property
     def code(self) -> t.Optional[Cell]:
@@ -197,7 +197,7 @@ class BaseContract(ContractProtocol[_D]):
 
         :return: Code cell or None if not available
         """
-        return self.state_info.code
+        return self.info.code
 
     @property
     def data(self) -> t.Optional[Cell]:
@@ -206,36 +206,36 @@ class BaseContract(ContractProtocol[_D]):
 
         :return: Data cell or None if not available
         """
-        return self.state_info.data
+        return self.info.data
 
     @classmethod
-    async def _load_state_info(
+    async def _load_info(
         cls,
         client: ClientProtocol,
         address: Address,
-    ) -> ContractStateInfo:
+    ) -> ContractInfo:
         """
         Fetch contract state from the blockchain.
 
         If the request fails (except rate limits), sets state to default empty state.
         """
         try:
-            return await client.get_contract_info(address)
+            return await client.get_info(address)
         except ProviderResponseError as e:
             if e.code in {429, 228, 5556}:  # rate limit exceed
                 raise
-            return ContractStateInfo()
+            return ContractInfo()
         except (Exception,):
-            return ContractStateInfo()
+            return ContractInfo()
 
     async def refresh(self) -> None:
         """
         Refresh contract state from the blockchain.
 
-        Fetches current contract information and updates the cached state_info.
+        Fetches current contract information and updates the cached info.
         If the request fails (except rate limits), sets state to default empty state.
         """
-        self._state_info = await self._load_state_info(self.client, self.address)
+        self._info = await self._load_info(self.client, self.address)
 
     @classmethod
     def from_state_init(
@@ -323,8 +323,8 @@ class BaseContract(ContractProtocol[_D]):
         if not load_state:
             return cls(client, address)
 
-        state_info = await cls._load_state_info(client, address)
-        return cls(client, address, state_info=state_info)
+        info = await cls._load_info(client, address)
+        return cls(client, address, info=info)
 
     def __repr__(self) -> str:
         return f"< Contract {self.__class__.__name__} address: {self.address} >"

tonutils/contracts/protocol.py

@@ -5,7 +5,7 @@ import typing as t
 from pytoniq_core import Address, Cell, StateInit
 
 from tonutils.clients.protocol import ClientProtocol
-from tonutils.types import AddressLike, ContractState, ContractStateInfo, WorkchainID
+from tonutils.types import AddressLike, ContractInfo, ContractState, WorkchainID
 
 if t.TYPE_CHECKING:
     from tonutils.contracts.versions import ContractVersion
@@ -48,21 +48,21 @@ class ContractProtocol(t.Protocol[_D]):
         """Locally known StateInit for this contract, if any."""
 
     @property
-    def state_info(self) -> ContractStateInfo:
+    def state_data(self) -> _D:
         """
-        Cached snapshot of the contract state.
+        Decoded on-chain data in typed form.
 
-        Implementations usually update this via refresh() or in constructors
-        that read on-chain data.
+        Implementations must decode the current data cell from info
+        using the associated _data_model.
         """
 
     @property
-    def state_data(self) -> _D:
+    def info(self) -> ContractInfo:
         """
-        Decoded on-chain data in typed form.
+        Cached snapshot of the contract state info.
 
-        Implementations must decode the current data cell from state_info
-        using the associated _data_model.
+        Implementations usually update this via refresh() or in constructors
+        that read on-chain data.
         """
 
     @property

tonutils/contracts/telegram/tlb.py

@@ -296,7 +296,7 @@ class TeleItemContent(TlbScheme):
         """
         Initialize item content.
 
-        :param nft_content: Off-chain NFT metadata (image, description, etc)
+        :param nft_content: Off-chain NFT metadata (image, description, etc.)
         :param dns: DNS records for the username/domain
         :param token_info: Token name and domain information
         """

tonutils/contracts/wallet/__init__.py

@@ -34,6 +34,7 @@ from .methods import (
     seqno_get_method,
 )
 from .params import (
+    BaseWalletParams,
     WalletHighloadV2Params,
     WalletHighloadV3Params,
     WalletPreprocessedV2Params,
@@ -46,6 +47,7 @@ from .params import (
 )
 from .protocol import WalletProtocol
 from .tlb import (
+    BaseWalletData,
     EncryptedTextCommentBody,
     OutActionSendMsg,
     TextCommentBody,
@@ -81,6 +83,8 @@ __all__ = [
     "VALID_MNEMONIC_LENGTHS",
     "BaseMessageBuilder",
     "BaseWallet",
+    "BaseWalletData",
+    "BaseWalletParams",
     "EncryptedTextCommentBody",
     "ExternalMessage",
     "InternalMessage",

tonutils/contracts/wallet/base.py

@@ -22,7 +22,7 @@ from tonutils.contracts.wallet.tlb import BaseWalletData
 from tonutils.exceptions import ContractError
 from tonutils.types import (
     AddressLike,
-    ContractStateInfo,
+    ContractInfo,
     SendMode,
     PublicKey,
     PrivateKey,
@@ -61,7 +61,7 @@ class BaseWallet(BaseContract, WalletProtocol[_D, _C, _P], abc.ABC):
         client: ClientProtocol,
         address: Address,
         state_init: t.Optional[StateInit] = None,
-        state_info: t.Optional[ContractStateInfo] = None,
+        info: t.Optional[ContractInfo] = None,
         config: t.Optional[_C] = None,
         private_key: t.Optional[PrivateKey] = None,
     ) -> None:
@@ -71,7 +71,7 @@ class BaseWallet(BaseContract, WalletProtocol[_D, _C, _P], abc.ABC):
         :param client: TON client for blockchain interactions
         :param address: Wallet address on the blockchain
         :param state_init: Optional StateInit (code and data)
-        :param state_info: Optional preloaded contract state
+        :param info: Optional preloaded contract state
         :param config: Optional wallet configuration
         :param private_key: Optional private key for signing transactions
         """
@@ -82,7 +82,7 @@ class BaseWallet(BaseContract, WalletProtocol[_D, _C, _P], abc.ABC):
         if private_key is not None:
             self._private_key = private_key
             self._public_key = private_key.public_key
-        super().__init__(client, address, state_init, state_info)
+        super().__init__(client, address, state_init, info)
 
     @property
     def state_data(self) -> _D:
@@ -295,7 +295,7 @@ class BaseWallet(BaseContract, WalletProtocol[_D, _C, _P], abc.ABC):
         :return: Signed external message that was sent
         """
         external_msg = await self.build_external_message(messages, params)
-        await self.client.send_boc(external_msg.as_hex)
+        await self.client.send_message(external_msg.as_hex)
         return external_msg
 
     async def transfer_message(

tonutils/contracts/wallet/tlb.py

@@ -203,7 +203,7 @@ class WalletV5SubwalletID:
         subwallet_number: int = 0,
         workchain: WorkchainID = WorkchainID.BASECHAIN,
         version: int = 0,
-        network_global_id: NetworkGlobalID = NetworkGlobalID.MAINNET,
+        network: NetworkGlobalID = NetworkGlobalID.MAINNET,
     ) -> None:
         """
         Initialize Wallet v5 subwallet ID.
@@ -211,19 +211,19 @@ class WalletV5SubwalletID:
         :param subwallet_number: Subwallet number (0-32767)
         :param workchain: Target workchain (default: BASECHAIN)
         :param version: Wallet version identifier (default: 0)
-        :param network_global_id: Network identifier (default: MAINNET)
+        :param network: Network identifier (default: MAINNET)
         """
         self.subwallet_number = subwallet_number
         self.workchain = workchain
         self.version = version
-        self.network_global_id = network_global_id
+        self.network = network
 
     def pack(self) -> int:
         """
         Pack subwallet ID components into 32-bit integer.
 
         Format: (1 << 31) | (workchain << 23) | (version << 15) | subwallet_number
-        XORed with network_global_id for network isolation.
+        XORed with network for network isolation.
 
         :return: Packed 32-bit subwallet ID
         """
@@ -232,22 +232,22 @@ class WalletV5SubwalletID:
         ctx |= (self.workchain & 0xFF) << 23
         ctx |= (self.version & 0xFF) << 15
         ctx |= self.subwallet_number & 0x7FFF
-        return ctx ^ (self.network_global_id & 0xFFFFFFFF)
+        return ctx ^ (self.network & 0xFFFFFFFF)
 
     @classmethod
     def unpack(
         cls,
         value: int,
-        network_global_id: NetworkGlobalID,
+        network: NetworkGlobalID,
     ) -> WalletV5SubwalletID:
         """
         Unpack 32-bit integer into subwallet ID components.
 
         :param value: Packed 32-bit subwallet ID
-        :param network_global_id: Network identifier for XOR decoding
+        :param network: Network identifier for XOR decoding
         :return: Unpacked WalletV5SubwalletID instance
         """
-        ctx = (value ^ network_global_id) & 0xFFFFFFFF
+        ctx = (value ^ network) & 0xFFFFFFFF
 
         subwallet_number = ctx & 0x7FFF
         version = (ctx >> 15) & 0xFF
@@ -258,7 +258,7 @@ class WalletV5SubwalletID:
             subwallet_number=subwallet_number,
             workchain=WorkchainID(workchain),
             version=version,
-            network_global_id=network_global_id,
+            network=network,
         )
 
     def __repr__(self) -> str:
@@ -298,7 +298,7 @@ class WalletV5BetaData(BaseWalletData):
 
         :param builder: Cell builder to store to
         """
-        builder.store_int(self.subwallet_id.network_global_id, 32)
+        builder.store_int(self.subwallet_id.network, 32)
         builder.store_int(self.subwallet_id.workchain, 8)
         builder.store_uint(self.subwallet_id.version, 8)
         builder.store_uint(self.subwallet_id.subwallet_number, 32)
@@ -328,7 +328,7 @@ class WalletV5BetaData(BaseWalletData):
         :return: Loaded WalletV5SubwalletID
         """
         return WalletV5SubwalletID(
-            network_global_id=NetworkGlobalID(cs.load_int(32)),
+            network=NetworkGlobalID(cs.load_int(32)),
             workchain=WorkchainID(cs.load_int(8)),
             version=cs.load_uint(8),
             subwallet_number=cs.load_uint(32),
@@ -398,20 +398,22 @@ class WalletV5Data(BaseWalletData):
         return cell.end_cell()
 
     @classmethod
-    def deserialize(cls, cs: Slice, network_global_id: NetworkGlobalID) -> WalletV5Data:
+    def deserialize(
+        cls,
+        cs: Slice,
+        network: NetworkGlobalID = NetworkGlobalID.MAINNET,
+    ) -> WalletV5Data:
         """
         Deserialize wallet data from Cell slice.
 
         :param cs: Cell slice to deserialize from
-        :param network_global_id: Network ID for unpacking subwallet_id
+        :param network: Network ID for unpacking subwallet_id
         :return: Deserialized WalletV5Data instance
         """
         return cls(
             is_signature_allowed=cs.load_bool(),
             seqno=cs.load_uint(32),
-            subwallet_id=WalletV5SubwalletID.unpack(
-                cs.load_uint(32), network_global_id
-            ),
+            subwallet_id=WalletV5SubwalletID.unpack(cs.load_uint(32), network),
             public_key=PublicKey(cs.load_bytes(32)),
             plugins=cs.load_maybe_ref(),
         )

tonutils/contracts/wallet/versions/v5.py

@@ -63,7 +63,7 @@ class _WalletV5(
         cls._validate_config_type(config)
 
         if config.subwallet_id is None:
-            config.subwallet_id = WalletV5SubwalletID(network_global_id=client.network)
+            config.subwallet_id = WalletV5SubwalletID(network=client.network)
 
         return super().from_private_key(client, private_key, workchain, config)
 
@@ -163,7 +163,7 @@ class WalletV5Beta(
 
         cell = begin_cell()
         cell.store_uint(params.op_code, 32)
-        cell.store_int(subwallet_id.network_global_id, 32)
+        cell.store_int(subwallet_id.network, 32)
         cell.store_int(subwallet_id.workchain, 8)
         cell.store_uint(subwallet_id.version, 8)
         cell.store_uint(subwallet_id.subwallet_number, 32)
@@ -219,14 +219,14 @@ class WalletV5R1(
 
         :return: Typed wallet data
         """
-        if not (self._state_info and self._state_info.data):
+        if not (self._info and self._info.data):
             raise StateNotLoadedError(self, missing="state_data")
 
-        network_global_id = (
+        network = (
             NetworkGlobalID.TESTNET if self.client.network else NetworkGlobalID.MAINNET
         )
-        cs = self._state_info.data.begin_parse()
-        return self._data_model.deserialize(cs, network_global_id)
+        cs = self._info.data.begin_parse()
+        return self._data_model.deserialize(cs, network)
 
     async def _build_msg_cell(
         self,