Merge pull request #44 from domikedos/main

add new methods and create test for them

Author: nessshon

pytonapi/methods/__init__.py

@@ -9,6 +9,7 @@
 from .liteserver import LiteserverMethod
 from .multisig import MultisigMethod
 from .nft import NftMethod
+from .purchases import PurchasesMethod
 from .rates import RatesMethod
 from .sse import SSEMethod
 from .staking import StakingMethod

pytonapi/methods/blockchain.py

@@ -45,6 +45,18 @@ async def get_block_data(self, block_id: str) -> BlockchainBlock:
 
         return BlockchainBlock(**response)
 
+    async def get_block_boc(self, block_id: str) -> str:
+        """
+        Get block data.
+
+        :param block_id: block ID (string), example: "(-1,8000000000000000,4234234)"
+        :return: :class:`BlockchainBlock`
+        """
+        method = f"v2/blockchain/blocks/{block_id}/boc"
+        response = await self._get(method=method)
+
+        return response["error"] # api returns raw string so the result stores in error
+
     async def get_block(self, masterchain_seqno: int) -> BlockchainBlockShards:
         """
         Get blockchain block shards.

pytonapi/methods/liteserver.py

@@ -79,15 +79,18 @@ async def get_raw_state(self, block_id: str) -> RawBlockState:
 
         return RawBlockState(**response)
 
-    async def get_raw_header(self, block_id: str) -> RawBlockHeader:
+    async def get_raw_header(self, block_id: str, mode: int) -> RawBlockHeader:
         """
         Get raw blockchain block header.
 
         :param block_id: block ID:  (workchain,shard,seqno,root_hash,file_hash)
+        :param mode: mode
         :return: :class:`RawBlockHeader`
         """
+
         method = f"v2/liteserver/get_block_header/{block_id}"
-        response = await self._get(method=method)
+        params = {"mode": mode}
+        response = await self._get(method=method, params=params)
 
         return RawBlockHeader(**response)
 
@@ -195,34 +198,36 @@ async def get_raw_list_block_transaction(
         :param lt: lt
         :return: :class:`RawListBlockTransactions`
         """
-        method = f"v2/liteserver/get_block_transactions/{block_id}"
+        method = f"v2/liteserver/list_block_transactions/{block_id}"
         params = {
             "mode": mode,
-            "count": count,
-            "account_id": account_id,
-            "lt": lt
+            "count": count
         }
+        if account_id:
+            params["account_id"] = account_id
+        if lt:
+            params["lt"] = lt
         response = await self._get(method=method, params=params)
 
         return RawListBlockTransactions(**response)
 
     async def get_block_proof(
             self,
-            know_block: str,
+            known_block: str,
             mode: int = 0,
             target_block: Optional[str] = None,
     ) -> RawBlockProof:
         """
         Get raw block proof.
 
-        :param know_block: know block: (workchain,shard,seqno,root_hash,file_hash)
+        :param known_block: know block: (workchain,shard,seqno,root_hash,file_hash)
         :param mode: mode 0
         :param target_block: target block: (workchain,shard,seqno,root_hash,file_hash)
         :return: :class:`RawBlockProof`
         """
-        method = f"v2/liteserver/get_block_proof/{know_block}"
+        method = f"v2/liteserver/get_block_proof"
         params = {
-            "know_block": know_block,
+            "known_block": known_block,
             "mode": mode,
         }
         if target_block:
@@ -267,7 +272,7 @@ async def get_out_msg_queue_size(self) -> OutMsgQueueSize:
 
         :return: :class:`OutMsgQueueSize` size
         """
-        method = "v2/liteserver/get_out_msg_queue_size"
+        method = "v2/liteserver/get_out_msg_queue_sizes"
         response = await self._get(method=method)
 
         return OutMsgQueueSize(**response)

pytonapi/methods/multisig.py

@@ -1,5 +1,5 @@
 from pytonapi.base import AsyncTonapiClientBase
-from pytonapi.schema.multisig import Multisig
+from pytonapi.schema.multisig import Multisig, MultisigOrder
 
 
 class MultisigMethod(AsyncTonapiClientBase):
@@ -15,3 +15,15 @@ async def get_account_info(self, account_id: str) -> Multisig:
         response = await self._get(method=method)
 
         return Multisig(**response)
+
+    async def get_order_info(self, account_id: str) -> MultisigOrder:
+        """
+        Get multisig order info.
+
+        :param account_id: account ID
+        :return: :class:`MultisigOrder`
+        """
+        method = f"v2/multisig/order/{account_id}"
+        response = await self._get(method=method)
+
+        return MultisigOrder(**response)

pytonapi/methods/purchases.py

@@ -0,0 +1,29 @@
+from typing import Optional
+
+from pytonapi.base import AsyncTonapiClientBase
+from pytonapi.schema.purchases import Purchases
+
+
+class PurchasesMethod(AsyncTonapiClientBase):
+
+    async def get_purchases_history(
+            self,
+            account_id: str,
+            limit: int = 100,
+            before_lt: Optional[int] = None
+    ) -> Purchases:
+        """
+        Get history of purchases.
+
+        :param account_id: account ID
+        :param before_lt: omit this parameter to get last invoices
+        :param limit: Default value : 100
+        :return: :class:`Purchases`
+        """
+        method = f"v2/purchases/{account_id}/history"
+        params = {"limit": limit}
+        if before_lt:
+            params["before_lt"] = before_lt
+        response = await self._get(method=method, params=params)
+
+        return Purchases(**response)

pytonapi/methods/wallet.py

@@ -1,7 +1,7 @@
 from typing import Dict, Any, Union
 
 from pytonapi.base import AsyncTonapiClientBase
-from pytonapi.schema.accounts import Accounts
+from pytonapi.schema.accounts import Accounts, Account
 from pytonapi.schema.events import MessageConsequences
 from pytonapi.schema.wallet import Wallet
 

pytonapi/schema/__init__.py

@@ -4,9 +4,12 @@
 from pytonapi.schema import domains
 from pytonapi.schema import events
 from pytonapi.schema import extra_currency
+from pytonapi.schema import gasless
 from pytonapi.schema import jettons
 from pytonapi.schema import liteserver
+from pytonapi.schema import multisig
 from pytonapi.schema import nft
+from pytonapi.schema import purchases
 from pytonapi.schema import rates
 from pytonapi.schema import staking
 from pytonapi.schema import storage

pytonapi/schema/multisig.py

@@ -14,6 +14,10 @@ class Risk(BaseModel):
     jettons: List[JettonQuantity]
     nfts: List[NftItem]
 
+class ChangingParameters(BaseModel):
+    threshold: int
+    signers: List[Address]
+    proposers: str
 
 class MultisigOrder(BaseModel):
     address: Address
@@ -22,8 +26,11 @@ class MultisigOrder(BaseModel):
     sent_for_execution: bool
     signers: List[Address]
     approvals_num: int
-    expiration_data: int
+    expiration_date: int
     risk: Risk
+    creation_date: int
+    signed_by: List[Address]
+    multisig_address: Address
 
 
 class Multisig(BaseModel):
@@ -32,7 +39,7 @@ class Multisig(BaseModel):
     threshold: int
     signers: List[Address]
     proposers: List[Address]
-    orders: MultisigOrder
+    orders: List[MultisigOrder]
 
 
 class Multisigs(BaseModel):

pytonapi/schema/purchases.py

@@ -0,0 +1,35 @@
+from typing import List, Optional
+
+from pydantic import BaseModel
+
+from pytonapi.schema.accounts import AccountAddress
+
+class Metadata(BaseModel):
+    encrypted_binary: str
+    decryption_key: Optional[str] = None
+
+
+class CurrencyAmount(BaseModel):
+    currency_type: str
+    value: str
+    decimals: int
+    token_name: str
+    verification: str
+    image: str
+    jetton: Optional[str] = None
+
+
+class Purchase(BaseModel):
+    event_id: str
+    invoice_id: str
+    source: AccountAddress
+    destination: AccountAddress
+    lt: int
+    utime: int
+    amount: CurrencyAmount
+    metadata: Metadata
+
+
+class Purchases(BaseModel):
+    purchases: List[Purchase]
+    next_from: int

pytonapi/schema/wallet.py

@@ -6,7 +6,6 @@
 
 
 class WalletStats(BaseModel):
-    ton_balance: int
     nfts_count: int
     jettons_count: int
     multisig_count: int
@@ -20,8 +19,15 @@ class WalletPlugin(BaseModel):
 
 class Wallet(BaseModel):
     address: Address
+    is_wallet: bool
+    balance: int
     stats: WalletStats
+    status: str
+    last_activity: int
     plugins: List[WalletPlugin]
     name: Optional[str] = None
     icon: Optional[str] = None
     is_suspended: Optional[bool] = None
+    signature_disabled: bool
+    interfaces: List[str]
+    last_lt: int