py-near 1.1.31__tar.gz → 1.1.33__tar.gz

{py_near-1.1.31 → py_near-1.1.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-near
-Version: 1.1.31
+Version: 1.1.33
 Summary: Pretty simple and fully asynchronous framework for working with NEAR blockchain
 Author: pvolnov
 Author-email: petr@herewallet.app

{py_near-1.1.31 → py_near-1.1.33}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "py-near"
-version = "1.1.31"
+version = "1.1.33"
 description="Pretty simple and fully asynchronous framework for working with NEAR blockchain"
 authors = ["pvolnov <petr@herewallet.app>"]
 readme = "README.md"
@@ -22,7 +22,7 @@ base58 = "^2.1.1"
 
 [project]
 name = "py-near"
-version = "1.1.31"
+version = "1.1.33"
 description = "Pretty simple and fully asynchronous framework for working with NEAR blockchaink"
 authors = [ {name = "pvolnov", email = "petr@herewallet.app"} ]
 requires-python = ">=3.7"

{py_near-1.1.31 → py_near-1.1.33}/src/py_near/account.py

@@ -108,7 +108,7 @@ class Account(object):
         self._latest_block_hash_ts = utils.timestamp()
 
     async def sign_and_submit_tx(
-        self, receiver_id, actions: List[Action], nowait=False
+        self, receiver_id, actions: List[Action], nowait=False, included=False
     ) -> Union[TransactionResult, str]:
         """
         Sign transaction and send it to blockchain
@@ -116,6 +116,7 @@ class Account(object):
         :param actions: list of actions
         :param nowait: if nowait is True, return transaction hash, else wait execution
         confirm and return TransactionResult
+        :param included: if included is True, return transaction hash, else wait execution
         :return: transaction hash or TransactionResult
         """
         if not self._signers:
@@ -149,7 +150,10 @@ class Account(object):
         )
 
         try:
-            if nowait:
+            if included:
+                await self._provider.send_tx_included(serialized_tx)
+                return trx_hash
+            elif nowait:
                 return await self._provider.send_tx(serialized_tx)
             return await self._provider.send_tx_and_wait(
                 serialized_tx, trx_hash=trx_hash, receiver_id=receiver_id
@@ -211,17 +215,18 @@ class Account(object):
         return await self._provider.get_account(self.account_id)
 
     async def send_money(
-        self, account_id: str, amount: int, nowait: bool = False
+        self, account_id: str, amount: int, nowait: bool = False, included=False
     ) -> TransactionResult:
         """
         Send money to account_id
         :param account_id: receiver account id
         :param amount: amount in yoctoNEAR
         :param nowait: if nowait is True, return transaction hash, else wait execution
+        :param included: if included is True, return transaction hash, else wait execution
         :return: transaction hash or TransactionResult
         """
         return await self.sign_and_submit_tx(
-            account_id, [transactions.create_transfer_action(amount)], nowait
+            account_id, [transactions.create_transfer_action(amount)], nowait, included
         )
 
     async def function_call(
@@ -232,6 +237,7 @@ class Account(object):
         gas: int = constants.DEFAULT_ATTACHED_GAS,
         amount: int = 0,
         nowait: bool = False,
+        included=False,
     ):
         """
         Call function on smart contract
@@ -241,6 +247,7 @@ class Account(object):
         :param gas: amount of attachment gas. Default is 200000000000000
         :param amount: amount of attachment NEAR, Default is 0
         :param nowait: if nowait is True, return transaction hash, else wait execution
+        :param included: if included is True, return transaction hash, else wait execution
         :return: transaction hash or TransactionResult
         """
         ser_args = json.dumps(args).encode("utf8")
@@ -252,6 +259,7 @@ class Account(object):
                 )
             ],
             nowait,
+            included,
         )
 
     async def create_account(
@@ -334,6 +342,7 @@ class Account(object):
         delegate_action: Union[DelegateAction, DelegateActionModel],
         signature: Union[bytes, str],
         nowait=False,
+        included=False,
     ):
         if isinstance(signature, str):
             signature = base58.b58decode(signature.replace("ed25519:", ""))
@@ -343,7 +352,9 @@ class Account(object):
         actions = [
             transactions.create_signed_delegate(delegate_action, signature),
         ]
-        return await self.sign_and_submit_tx(delegate_action.sender_id, actions, nowait)
+        return await self.sign_and_submit_tx(
+            delegate_action.sender_id, actions, nowait, included
+        )
 
     async def deploy_contract(self, contract_code: bytes, nowait=False):
         """

{py_near-1.1.31 → py_near-1.1.33}/src/py_near/providers.py

@@ -194,6 +194,22 @@ class JsonProvider(object):
             broadcast=self.allow_broadcast,
         )
 
+    async def send_tx_included(
+        self, signed_tx: str, timeout: int = constants.TIMEOUT_WAIT_RPC
+    ):
+        """
+        Send a signed transaction to the network and return the hash of the transaction
+        :param signed_tx: base64 encoded signed transaction, str.
+        :param timeout: rpc request timeout
+        :return:
+        """
+        return await self.json_rpc(
+            "send_tx",
+            {"signed_tx_base64": signed_tx, "wait_until": "INCLUDED_FINAL"},
+            timeout=timeout,
+            broadcast=self.allow_broadcast,
+        )
+
     async def wait_for_trx(self, trx_hash, receiver_id) -> TransactionResult:
         for _ in range(6):
             await asyncio.sleep(5)