tonutils 0.6.0a1__py3-none-any.whl → 1.0.0a2__py3-none-any.whl

tonutils/contracts/wallet/versions/hw.py

@@ -120,18 +120,18 @@ class WalletHighloadV3R1(
             rest = self._build_msg_to_send(messages[msgs_per_pack:], params)
             messages = messages[:msgs_per_pack] + [rest]
 
-        actions_cell, value = Cell.empty(), 0
+        actions_cell, amount = Cell.empty(), 0
         for msg in messages:
             action = OutActionSendMsg(msg)
             action_cell = begin_cell()
             action_cell.store_ref(actions_cell)
             action_cell.store_cell(action.serialize())
             actions_cell = action_cell.end_cell()
-            value += msg.message.info.value.grams
+            amount += msg.message.info.value.grams
 
-        value = params.value_to_send if params.value_to_send is not None else value
+        amount = params.value_to_send if params.value_to_send is not None else amount
         body = self._build_internal_transfer(actions_cell, params)
-        return build_internal_wallet_msg(self.address, params.send_mode, value, body)
+        return build_internal_wallet_msg(self.address, params.send_mode, amount, body)
 
     async def _build_msg_cell(
         self,

tonutils/protocols/contract.py

@@ -22,7 +22,10 @@ TContract = t.TypeVar("TContract")
 class ContractProtocol(t.Protocol[D]):
     _data_model: t.Type[D]
 
-    VERSION: t.ClassVar[BaseContractVersion]
+    VERSION: t.ClassVar[t.Union[BaseContractVersion, str]]
+
+    @classmethod
+    def get_default_code(cls) -> Cell: ...
 
     @property
     def client(self) -> ClientProtocol: ...

tonutils/protocols/wallet.py

@@ -85,7 +85,7 @@ class WalletProtocol(ContractProtocol, t.Protocol[D, C, P]):
     async def transfer(
         self: TWallet,
         destination: AddressLike,
-        value: int,
+        amount: int,
         body: t.Optional[t.Union[Cell, str]] = None,
         state_init: t.Optional[StateInit] = None,
         send_mode: t.Optional[t.Union[SendMode, int]] = None,

tonutils/types/__init__.py

@@ -23,12 +23,14 @@ from .configs import (
     WalletV5Config,
 )
 from .contract import (
+    BaseContractVersion,
     ContractStateInfo,
     ContractState,
-    BaseContractVersion,
-    WalletVersion,
+    JettonMasterVersion,
+    JettonWalletVersion,
     NFTItemVersion,
     NFTCollectionVersion,
+    WalletVersion,
 )
 from .keystructs import (
     KeyLike,
@@ -62,23 +64,40 @@ from .stack import (
 from .tlb import (
     BaseContractData,
     BaseWalletData,
+    ContentLike,
+    JettonBurnBody,
+    JettonDropAdminBody,
+    JettonChangeAdminBody,
+    JettonChangeContentBody,
+    JettonMintBody,
+    JettonMasterStandardData,
+    JettonMasterStablecoinData,
+    JettonInternalTransferBody,
+    JettonStandardChangeAdminBody,
+    JettonStandardChangeContentBody,
+    JettonStandardMintBody,
+    JettonTopUpBody,
+    JettonTransferBody,
+    JettonWalletStandardData,
+    JettonWalletStablecoinData,
+    JettonWalletStablecoinV2Data,
     NFTCollectionContent,
     NFTCollectionData,
-    NFTCollectionEditableChangeContent,
-    NFTCollectionEditableChangeOwner,
-    NFTCollectionMintItem,
-    NFTCollectionBatchMintItem,
+    NFTCollectionChangeContentBody,
+    NFTCollectionChangeOwnerBody,
+    NFTCollectionMintItemBody,
+    NFTCollectionBatchMintItemBody,
     NFTItemEditableData,
-    NFTItemEditableEditContent,
+    NFTEditContentBody,
     NFTItemEditableMintRef,
-    NFTItemEditableTransferEditorship,
+    NFTTransferEditorshipBody,
     NFTItemStandardData,
     NFTItemStandardMintRef,
     NFTItemSoulboundData,
-    NFTItemSoulboundDestory,
-    NFTItemSoulboundRevoke,
+    NFTDestoryBody,
+    NFTRevokeBody,
     NFTItemSoulboundMintRef,
-    NFTItemTransfer,
+    NFTTransferBody,
     EncryptedTextComment,
     OffchainContent,
     OffchainCommonContent,
@@ -99,7 +118,6 @@ from .tlb import (
     WalletV5SubwalletID,
 )
 
-
 __all__ = [
     "DEFAULT_SUBWALLET_ID",
     "AddressLike",
@@ -112,7 +130,25 @@ __all__ = [
     "BaseWalletParams",
     "ContractStateInfo",
     "ContractState",
+    "ContentLike",
     "EncryptedTextComment",
+    "JettonBurnBody",
+    "JettonDropAdminBody",
+    "JettonChangeAdminBody",
+    "JettonChangeContentBody",
+    "JettonMintBody",
+    "JettonMasterStandardData",
+    "JettonMasterStablecoinData",
+    "JettonInternalTransferBody",
+    "JettonStandardChangeAdminBody",
+    "JettonStandardChangeContentBody",
+    "JettonStandardMintBody",
+    "JettonTopUpBody",
+    "JettonTransferBody",
+    "JettonWalletStandardData",
+    "JettonWalletStablecoinData",
+    "JettonWalletStablecoinV2Data",
+    "JettonWalletVersion",
     "MetadataPrefix",
     "NetworkGlobalID",
     "NFTCollectionVersion",
@@ -120,21 +156,21 @@ __all__ = [
     "NumberLike",
     "NFTCollectionContent",
     "NFTCollectionData",
-    "NFTCollectionEditableChangeContent",
-    "NFTCollectionEditableChangeOwner",
-    "NFTCollectionMintItem",
-    "NFTCollectionBatchMintItem",
+    "NFTCollectionChangeContentBody",
+    "NFTCollectionChangeOwnerBody",
+    "NFTCollectionMintItemBody",
+    "NFTCollectionBatchMintItemBody",
     "NFTItemEditableData",
-    "NFTItemEditableEditContent",
+    "NFTEditContentBody",
     "NFTItemEditableMintRef",
-    "NFTItemEditableTransferEditorship",
+    "NFTTransferEditorshipBody",
     "NFTItemStandardData",
     "NFTItemStandardMintRef",
     "NFTItemSoulboundData",
-    "NFTItemSoulboundDestory",
-    "NFTItemSoulboundRevoke",
+    "NFTDestoryBody",
+    "NFTRevokeBody",
     "NFTItemSoulboundMintRef",
-    "NFTItemTransfer",
+    "NFTTransferBody",
     "OffchainContent",
     "OffchainCommonContent",
     "OffchainItemContent",
@@ -181,7 +217,7 @@ __all__ = [
     "WalletV5Config",
     "WalletV5Data",
     "WalletV5Params",
-    "WorkchainID",
-    "WalletVersion",
     "WalletV5SubwalletID",
+    "WalletVersion",
+    "WorkchainID",
 ]

tonutils/types/contract.py

@@ -77,3 +77,15 @@ class NFTItemVersion(BaseContractVersion):
 class NFTItemSingleVersion(BaseContractVersion):
     NFTItemEditableSingle = "nft_item_editable_single"
     NFTItemSoulboundSingle = "nft_item_soulbound_single"
+
+
+class JettonMasterVersion(BaseContractVersion):
+    JettonMasterStandard = "jetton_master_standard"
+    JettonMasterStablecoin = "jetton_master_stablecoin"
+    JettonMasterStablecoinV2 = "jetton_master_stablecoin_v2"
+
+
+class JettonWalletVersion(BaseContractVersion):
+    JettonWalletStandard = "jetton_wallet_standard"
+    JettonWalletStablecoin = "jetton_wallet_stablecoin"
+    JettonWalletStablecoinV2 = "jetton_wallet_stablecoin_v2"

tonutils/types/messages.py

@@ -9,15 +9,17 @@ from pytoniq_core import (
 )
 
 from ..types.common import AddressLike, SendMode
+from ..types.tlb.jetton import JettonTransferBody
+from ..types.tlb.nft import NFTTransferBody
 from ..types.tlb.text import TextComment
 from ..utils.value_utils import to_nano
 
 if t.TYPE_CHECKING:
     from ..protocols import WalletProtocol
 
-    W = t.TypeVar("W", bound=WalletProtocol)
+    Wallet = WalletProtocol
 else:
-    W = t.TypeVar("W")
+    Wallet = t.Any
 
 
 class BaseTransferMessage(abc.ABC):
@@ -25,28 +27,30 @@ class BaseTransferMessage(abc.ABC):
     @abc.abstractmethod
     async def to_wallet_msg(
         self,
-        wallet: W,
+        wallet: Wallet,
     ) -> WalletMessage: ...
 
+    def __repr__(self) -> str:
+        parts = " ".join(f"{k}: {v!r}" for k, v in vars(self).items())
+        return f"< {self.__class__.__name__} {parts} >"
+
 
 class TransferMessage(BaseTransferMessage):
 
     def __init__(
         self,
         destination: AddressLike,
-        value: int,
+        amount: int,
         body: t.Optional[t.Union[Cell, str]] = None,
         state_init: t.Optional[StateInit] = None,
         send_mode: t.Optional[t.Union[SendMode, int]] = None,
         bounce: t.Optional[bool] = None,
     ) -> None:
-        if isinstance(destination, str):
-            destination = Address(destination)
         if isinstance(body, str):
             body = TextComment(body).serialize()
 
         self.destination = destination
-        self.value = value
+        self.amount = amount
         self.body = body
         self.state_init = state_init
         self.send_mode = send_mode
@@ -54,13 +58,13 @@ class TransferMessage(BaseTransferMessage):
 
     async def to_wallet_msg(
         self,
-        wallet: W,
+        wallet: Wallet,
     ) -> WalletMessage:
         from ..utils.msg_builders import build_internal_wallet_msg
 
         return build_internal_wallet_msg(
             dest=self.destination,
-            value=self.value,
+            value=self.amount,
             body=self.body,
             state_init=self.state_init,
             send_mode=self.send_mode,
@@ -75,31 +79,46 @@ class TransferNFTMessage(BaseTransferMessage):
         destination: AddressLike,
         nft_address: AddressLike,
         response_address: t.Optional[AddressLike] = None,
+        custom_payload: t.Optional[t.Union[Cell]] = None,
+        forward_amount: int = 1,
         forward_payload: t.Optional[t.Union[Cell, str]] = None,
-        forward_amount: t.Union[int, float] = 1,
-        value: t.Union[int, float] = to_nano(0.05),
+        total_amount: int = to_nano(0.05),
         send_mode: t.Optional[t.Union[SendMode, int]] = None,
         bounce: t.Optional[bool] = None,
     ) -> None:
-        if isinstance(nft_address, str):
-            nft_address = Address(nft_address)
         if isinstance(forward_payload, str):
             forward_payload = TextComment(forward_payload).serialize()
 
-        self.destination = destination
+        self.destination_address = destination
         self.nft_address = nft_address
         self.response_address = response_address
-        self.forward_payload = forward_payload
+        self.custom_payload = custom_payload
         self.forward_amount = forward_amount
-        self.value = value
+        self.forward_payload = forward_payload
+        self.total_amount = total_amount
         self.send_mode = send_mode
         self.bounce = bounce
 
     async def to_wallet_msg(
         self,
-        wallet: W,
+        wallet: Wallet,
     ) -> WalletMessage:
-        raise NotImplementedError
+        from ..utils.msg_builders import build_internal_wallet_msg
+
+        body = NFTTransferBody(
+            destination_address=self.destination_address,
+            response_address=self.response_address or wallet.address,
+            custom_payload=self.custom_payload,
+            forward_amount=self.forward_amount,
+            forward_payload=self.forward_payload,
+        )
+        return build_internal_wallet_msg(
+            dest=self.nft_address,
+            send_mode=self.send_mode,
+            value=self.total_amount,
+            body=body.serialize(),
+            bounce=self.bounce,
+        )
 
 
 class TransferJettonMessage(BaseTransferMessage):
@@ -107,36 +126,62 @@ class TransferJettonMessage(BaseTransferMessage):
     def __init__(
         self,
         destination: AddressLike,
+        jetton_amount: int,
         jetton_master_address: AddressLike,
-        jetton_amount: t.Union[int, float],
-        jetton_decimals: int = 9,
         jetton_wallet_address: t.Optional[AddressLike] = None,
+        response_address: t.Optional[AddressLike] = None,
+        custom_payload: t.Optional[Cell] = None,
+        forward_amount: int = 1,
         forward_payload: t.Optional[t.Union[Cell, str]] = None,
-        forward_amount: t.Union[int, float] = 1,
-        value: t.Union[int, float] = to_nano(0.05),
+        total_amount: int = to_nano(0.05),
         send_mode: t.Optional[t.Union[SendMode, int]] = None,
         bounce: t.Optional[bool] = None,
     ) -> None:
-        if isinstance(jetton_master_address, str):
-            jetton_master_address = Address(jetton_master_address)
-        if isinstance(jetton_wallet_address, str):
-            jetton_wallet_address = Address(jetton_wallet_address)
         if isinstance(forward_payload, str):
             forward_payload = TextComment(forward_payload).serialize()
 
-        self.destination = destination
-        self.jetton_master_address = jetton_master_address
+        self.destination_address = destination
         self.jetton_amount = jetton_amount
-        self.jetton_decimals = jetton_decimals
+        self.jetton_master_address = jetton_master_address
         self.jetton_wallet_address = jetton_wallet_address
-        self.forward_payload = forward_payload
+        self.response_address = response_address
+        self.custom_payload = custom_payload
         self.forward_amount = forward_amount
-        self.value = value
+        self.forward_payload = forward_payload
+        self.total_amount = total_amount
         self.send_mode = send_mode
         self.bounce = bounce
 
+    async def _get_jetton_wallet_address(self, wallet: Wallet) -> Address:
+        from ..contracts import JettonMasterGetMethods
+
+        return await JettonMasterGetMethods.get_wallet_address(
+            client=wallet.client,
+            address=self.jetton_master_address,
+            owner_address=wallet.address,
+        )
+
     async def to_wallet_msg(
         self,
-        wallet: W,
+        wallet: Wallet,
     ) -> WalletMessage:
-        raise NotImplementedError
+        from ..utils.msg_builders import build_internal_wallet_msg
+
+        if self.jetton_wallet_address is None:
+            self.jetton_wallet_address = await self._get_jetton_wallet_address(wallet)
+
+        body = JettonTransferBody(
+            jetton_amount=self.jetton_amount,
+            destination_address=self.destination_address,
+            response_address=self.response_address or wallet.address,
+            custom_payload=self.custom_payload,
+            forward_amount=self.forward_amount,
+            forward_payload=self.forward_payload,
+        )
+        return build_internal_wallet_msg(
+            dest=self.jetton_wallet_address,
+            send_mode=self.send_mode,
+            value=self.total_amount,
+            body=body.serialize(),
+            bounce=self.bounce,
+        )

tonutils/types/opcodes.py

@@ -8,8 +8,20 @@ class OpCode(int, Enum):
     OUT_ACTION_SEND_MSG = 0x0EC3C86D
     INTERNAL_TRANSFER = 0xAE42E5A4
 
-    NFT_ITEM_TRANSFER = 0x5FCC3D14
-    NFT_ITEM_EDIT_CONTENT = 0x1A0B9D51
-    NFT_ITEM_TRANSFER_EDITORSHIP = 0x1C04412A
-    NFT_ITEM_DESTORY = 0x1F04537A
-    NFT_ITEM_REVOKE = 0x6F89F5E3
+    NFT_TRANSFER = 0x5FCC3D14
+    NFT_EDIT_CONTENT = 0x1A0B9D51
+    NFT_TRANSFER_EDITORSHIP = 0x1C04412A
+    NFT_DESTORY = 0x1F04537A
+    NFT_REVOKE = 0x6F89F5E3
+
+    JETTON_TRANSFER = 0xF8A7EA5
+    JETTON_INTERNAL_TRANSFER = 0x178D4519
+    JETTON_BURN = 0x595F07BC
+    JETTON_PROVIDE_WALLET_ADDRESS = 0x2C76B973
+    JETTON_MINT = 0x642B7D07
+    JETTON_CHANGE_ADMIN = 0x6501F354
+    JETTON_CLAIM_ADMIN = 0xFB88E119
+    JETTON_DROP_ADMIN = 0x7431F221
+    JETTON_UPGRADE = 0x2508D66A
+    JETTON_TOP_UP = 0xD372158C
+    JETTON_CHANGE_METADATA_URI = 0xCB862902

tonutils/types/params.py

@@ -74,7 +74,7 @@ class WalletHighloadV3Params(BaseWalletParams):
 
     def __post_init__(self) -> None:
         if self.created_at is None:
-            self.created_at = int(time.time() - 30)
+            self.created_at = int(time.time() - 60)
         if self.query_id is None:
             self.query_id = (self.created_at % (1 << 23)) & 0xFFFFFFFF
 

tonutils/types/tlb/__init__.py

@@ -1,27 +1,46 @@
 from .content import (
+    ContentLike,
     OffchainContent,
     OnchainContent,
 )
 from .contract import BaseContractData
+from .jetton import (
+    JettonBurnBody,
+    JettonDropAdminBody,
+    JettonChangeAdminBody,
+    JettonChangeContentBody,
+    JettonMintBody,
+    JettonMasterStandardData,
+    JettonMasterStablecoinData,
+    JettonInternalTransferBody,
+    JettonStandardChangeAdminBody,
+    JettonStandardChangeContentBody,
+    JettonStandardMintBody,
+    JettonTopUpBody,
+    JettonTransferBody,
+    JettonWalletStandardData,
+    JettonWalletStablecoinData,
+    JettonWalletStablecoinV2Data,
+)
 from .msg import OutActionSendMsg
 from .nft import (
     NFTCollectionContent,
     NFTCollectionData,
-    NFTCollectionEditableChangeContent,
-    NFTCollectionEditableChangeOwner,
-    NFTCollectionMintItem,
-    NFTCollectionBatchMintItem,
+    NFTCollectionChangeContentBody,
+    NFTCollectionChangeOwnerBody,
+    NFTCollectionMintItemBody,
+    NFTCollectionBatchMintItemBody,
     NFTItemEditableData,
-    NFTItemEditableEditContent,
+    NFTEditContentBody,
     NFTItemEditableMintRef,
-    NFTItemEditableTransferEditorship,
+    NFTTransferEditorshipBody,
     NFTItemStandardData,
     NFTItemStandardMintRef,
     NFTItemSoulboundData,
-    NFTItemSoulboundDestory,
-    NFTItemSoulboundRevoke,
+    NFTDestoryBody,
+    NFTRevokeBody,
     NFTItemSoulboundMintRef,
-    NFTItemTransfer,
+    NFTTransferBody,
     OffchainContent,
     OffchainCommonContent,
     OffchainItemContent,
@@ -48,25 +67,41 @@ from .wallet import (
 __all__ = [
     "BaseContractData",
     "BaseWalletData",
-    "NFTCollectionContent",
+    "ContentLike",
     "EncryptedTextComment",
+    "JettonBurnBody",
+    "JettonDropAdminBody",
+    "JettonChangeAdminBody",
+    "JettonChangeContentBody",
+    "JettonMintBody",
+    "JettonMasterStandardData",
+    "JettonMasterStablecoinData",
+    "JettonInternalTransferBody",
+    "JettonStandardChangeAdminBody",
+    "JettonStandardChangeContentBody",
+    "JettonStandardMintBody",
+    "JettonTopUpBody",
+    "JettonTransferBody",
+    "JettonWalletStandardData",
+    "JettonWalletStablecoinData",
+    "JettonWalletStablecoinV2Data",
     "NFTCollectionContent",
     "NFTCollectionData",
-    "NFTCollectionEditableChangeContent",
-    "NFTCollectionEditableChangeOwner",
-    "NFTCollectionMintItem",
-    "NFTCollectionBatchMintItem",
+    "NFTCollectionChangeContentBody",
+    "NFTCollectionChangeOwnerBody",
+    "NFTCollectionMintItemBody",
+    "NFTCollectionBatchMintItemBody",
     "NFTItemEditableData",
-    "NFTItemEditableEditContent",
+    "NFTEditContentBody",
     "NFTItemEditableMintRef",
-    "NFTItemEditableTransferEditorship",
+    "NFTTransferEditorshipBody",
     "NFTItemStandardData",
     "NFTItemStandardMintRef",
     "NFTItemSoulboundData",
-    "NFTItemSoulboundDestory",
-    "NFTItemSoulboundRevoke",
+    "NFTDestoryBody",
+    "NFTRevokeBody",
     "NFTItemSoulboundMintRef",
-    "NFTItemTransfer",
+    "NFTTransferBody",
     "OffchainContent",
     "OffchainCommonContent",
     "OffchainItemContent",

tonutils/types/tlb/content.py

@@ -154,3 +154,6 @@ class OffchainItemContent(TlbScheme):
         cell = begin_cell()
         cell.store_snake_string(self.prefix_uri)
         return cell.end_cell()
+
+
+ContentLike = t.Union[OnchainContent, OffchainContent]