py-near 1.1.4__py3-none-any.whl → 1.1.7__py3-none-any.whl

py_near/account.py

@@ -1,6 +1,9 @@
 import asyncio
+import base64
 import collections
+import hashlib
 import json
+import logging
 from typing import List, Union, Dict, Optional
 
 import base58
@@ -13,7 +16,7 @@ from py_near import utils
 from py_near.dapps.ft.async_client import FT
 from py_near.dapps.phone.async_client import Phone
 from py_near.dapps.staking.async_client import Staking
-from py_near.exceptions.exceptions import parse_error
+from py_near.exceptions.provider import RpcTimeoutError
 from py_near.models import (
     TransactionResult,
     ViewFunctionResult,
@@ -100,7 +103,7 @@ class Account(object):
         ]
         self._latest_block_hash_ts = utils.timestamp()
 
-    async def _sign_and_submit_tx(
+    async def sign_and_submit_tx(
         self, receiver_id, actions: List[Action], nowait=False
     ) -> Union[TransactionResult, str]:
         """
@@ -120,6 +123,14 @@ class Account(object):
             await self._update_last_block_hash()
 
             block_hash = base58.b58decode(self._latest_block_hash.encode("utf8"))
+            trx_hash = transactions.calc_trx_hash(
+                self.account_id,
+                pk,
+                receiver_id,
+                access_key.nonce + 1,
+                actions,
+                block_hash,
+            )
             serialized_tx = transactions.sign_and_serialize_transaction(
                 self.account_id,
                 pk,
@@ -128,20 +139,20 @@ class Account(object):
                 actions,
                 block_hash,
             )
+
             if nowait:
                 return await self._provider.send_tx(serialized_tx)
-            result = await self._provider.send_tx_and_wait(serialized_tx)
-
-            if "Failure" in result["status"]:
-                if isinstance(result["status"]["Failure"]["ActionError"]["kind"], str):
-                    error_type = result["status"]["Failure"]["ActionError"]["kind"]
-                    raise parse_error(error_type, {})
-
-                error_type, args = list(
-                    result["status"]["Failure"]["ActionError"]["kind"].items()
-                )[0]
-                raise parse_error(error_type, args)
-            return TransactionResult(**result)
+            try:
+                result = await self._provider.send_tx_and_wait(serialized_tx)
+                return TransactionResult(**result)
+            except RpcTimeoutError:
+                for _ in range(constants.TIMEOUT_WAIT_RPC // 3):
+                    await asyncio.sleep(3)
+                    result = await self._provider.get_tx(trx_hash, receiver_id)
+                    if result:
+                        return result
+                raise RpcTimeoutError("Transaction not found")
+
         except Exception as e:
             raise e
         finally:
@@ -204,7 +215,7 @@ class Account(object):
         :param nowait: if nowait is True, return transaction hash, else wait execution
         :return: transaction hash or TransactionResult
         """
-        return await self._sign_and_submit_tx(
+        return await self.sign_and_submit_tx(
             account_id, [transactions.create_transfer_action(amount)], nowait
         )
 
@@ -227,10 +238,14 @@ class Account(object):
         :param nowait: if nowait is True, return transaction hash, else wait execution
         :return: transaction hash or TransactionResult
         """
-        args = json.dumps(args).encode("utf8")
-        return await self._sign_and_submit_tx(
+        ser_args = json.dumps(args).encode("utf8")
+        return await self.sign_and_submit_tx(
             contract_id,
-            [transactions.create_function_call_action(method_name, args, gas, amount)],
+            [
+                transactions.create_function_call_action(
+                    method_name, ser_args, gas, amount
+                )
+            ],
             nowait,
         )
 
@@ -255,7 +270,7 @@ class Account(object):
             transactions.create_full_access_key_action(public_key),
             transactions.create_transfer_action(initial_balance),
         ]
-        return await self._sign_and_submit_tx(account_id, actions, nowait)
+        return await self.sign_and_submit_tx(account_id, actions, nowait)
 
     async def add_public_key(
         self,
@@ -281,7 +296,7 @@ class Account(object):
                 public_key, allowance, receiver_id, method_names
             ),
         ]
-        return await self._sign_and_submit_tx(self.account_id, actions, nowait)
+        return await self.sign_and_submit_tx(self.account_id, actions, nowait)
 
     async def add_full_access_public_key(
         self, public_key: Union[str, bytes], nowait=False
@@ -295,7 +310,7 @@ class Account(object):
         actions = [
             transactions.create_full_access_key_action(public_key),
         ]
-        return await self._sign_and_submit_tx(self.account_id, actions, nowait)
+        return await self.sign_and_submit_tx(self.account_id, actions, nowait)
 
     async def delete_public_key(self, public_key: Union[str, bytes], nowait=False):
         """
@@ -307,7 +322,7 @@ class Account(object):
         actions = [
             transactions.create_delete_access_key_action(public_key),
         ]
-        return await self._sign_and_submit_tx(self.account_id, actions, nowait)
+        return await self.sign_and_submit_tx(self.account_id, actions, nowait)
 
     async def call_delegate_transaction(
         self,
@@ -323,9 +338,7 @@ 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)
 
     async def deploy_contract(self, contract_code: bytes, nowait=False):
         """
@@ -334,7 +347,7 @@ class Account(object):
         :param nowait: if nowait is True, return transaction hash, else wait execution
         :return: transaction hash or TransactionResult
         """
-        return await self._sign_and_submit_tx(
+        return await self.sign_and_submit_tx(
             self.account_id,
             [transactions.create_deploy_contract_action(contract_code)],
             nowait,
@@ -348,7 +361,7 @@ class Account(object):
         :param nowait: if nowait is True, return transaction hash, else wait execution
         :return: transaction hash or TransactionResult
         """
-        return await self._sign_and_submit_tx(
+        return await self.sign_and_submit_tx(
             self.account_id,
             [transactions.create_staking_action(public_key, amount)],
             nowait,
@@ -389,14 +402,14 @@ class Account(object):
         await self._update_last_block_hash()
 
         private_key = ed25519.SigningKey(pk)
-        public_key = private_key.get_verifying_key()
+        verifying_key = private_key.get_verifying_key()
         return DelegateActionModel(
             sender_id=self.account_id,
             receiver_id=receiver_id,
             actions=actions,
             nonce=access_key.nonce + 1,
             max_block_height=self._latest_block_height + 1000,
-            public_key=base58.b58encode(public_key.to_bytes()).decode("utf-8"),
+            public_key=base58.b58encode(verifying_key.to_bytes()).decode("utf-8"),
         )
 
     def sign_delegate_transaction(

py_near/dapps/fts.py

@@ -11,6 +11,7 @@ class FTS:
     USDTe = FtModel("dac17f958d2ee523a2206206994597c13d831ec7.factory.bridge.near", 6)
     DAIe = FtModel("6b175474e89094c44da98b954eedeac495271d0f.factory.bridge.near", 18)
     USDCe = FtModel("a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.factory.bridge.near", 6)
+    USDC = FtModel("17208628f84f5d6ad33f0da3bbbeb27ffcb398eac501a31bd6ad2011e36133a1", 6)
     AURORA = FtModel("aaaaaa20d9e0e2461697782ef11675f668207961.factory.bridge.near", 18)
     WBTCe = FtModel("2260fac5e5542a773aa44fbcfedf7c193bc2c599.factory.bridge.near", 8)
     ETH = FtModel("aurora", 18)

py_near/exceptions/exceptions.py

@@ -1,13 +1,17 @@
 import json
 from dataclasses import dataclass
 
+from py_near.exceptions.provider import LackBalanceForState
+
 
 class RpcNotAvailableError(Exception):
     pass
 
 
 class ActionErrorKind(Exception):
-    pass
+    def __init__(self, **kargs):
+        for arg, value in kargs.items():
+            setattr(self, arg, value)
 
 
 @dataclass
@@ -170,6 +174,7 @@ class NewReceiptValidationError(ActionErrorKind):
 
     pass
 
+
 class DelegateActionExpired(ActionErrorKind):
     """
     Error occurs when a new `DelegateActionExpired` created by the `FunctionCall` action fails
@@ -193,7 +198,8 @@ _ERROR_TYPE_TO_EXCEPTION = {
     "FunctionCallError": FunctionCallError,
     "ExecutionError": ExecutionError,
     "NewReceiptValidationError": NewReceiptValidationError,
-    "'DelegateActionExpired'": DelegateActionExpired,
+    "DelegateActionExpired": DelegateActionExpired,
+    "LackBalanceForState": LackBalanceForState,
 }
 
 

py_near/providers.py

@@ -2,7 +2,7 @@ import base64
 import json
 
 import aiohttp
-from aiohttp import ClientResponseError, ClientConnectorError
+from aiohttp import ClientResponseError, ClientConnectorError, ServerDisconnectedError
 from loguru import logger
 
 from py_near.constants import TIMEOUT_WAIT_RPC
@@ -72,6 +72,7 @@ class JsonProvider(object):
                 RpcTimeoutError,
                 ClientResponseError,
                 ClientConnectorError,
+                ServerDisconnectedError,
                 ConnectionError,
             ) as e:
                 logger.error(f"Rpc error: {e}")

py_near/transactions.py

@@ -49,6 +49,33 @@ def sign_and_serialize_transaction(
     return base64.b64encode(signed_trx).decode("utf-8")
 
 
+def calc_trx_hash(
+    account_id,
+    private_key,
+    receiver_id,
+    nonce,
+    actions: List[Action],
+    block_hash: bytes,
+) -> str:
+    if isinstance(private_key, str):
+        pk = base58.b58decode(private_key.replace("ed25519:", ""))
+    else:
+        pk = private_key
+    private_key = ed25519.SigningKey(pk)
+
+    transaction = Transaction(
+        account_id,
+        private_key.get_verifying_key().to_bytes(),
+        nonce,
+        receiver_id,
+        block_hash,
+        actions,
+    )
+
+    signed_trx = bytes(bytearray(transaction.get_hash()))
+    return base58.b58encode(signed_trx).decode("utf-8")
+
+
 def create_create_account_action():
     return CreateAccountAction()
 

{py_near-1.1.4.dist-info → py_near-1.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-near
-Version: 1.1.4
+Version: 1.1.7
 Summary: Pretty simple and fully asynchronous framework for working with NEAR blockchain
 Author: pvolnov
 Author-email: petr@herewallet.app
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: aiohttp (>=3.7.4,<4.0.0)
 Requires-Dist: ed25519 (>=1.5,<2.0)
-Requires-Dist: py-near-primitives (>=0.2.2,<0.3.0)
+Requires-Dist: py-near-primitives (>=0.2.1,<0.3.0)
 Description-Content-Type: text/markdown
 
 # py-near

{py_near-1.1.4.dist-info → py_near-1.1.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 py_near/__init__.py,sha256=t5fAxjaU8dN8xpQR2vz0ZGhfTkdVy2RCbkhJhZFglk4,50
-py_near/account.py,sha256=MBpGKu6O7fKmx7faj-Y0opAEEzHecrW4Fy99K9p3Ncc,16398
+py_near/account.py,sha256=FYnGZK1rLhxE-hSzYThK0yfpE_pYIvdmryxU650Xmvg,16648
 py_near/constants.py,sha256=inaWIuwmF1EB5JSB0ynnZY5rKY_QsxhF9KuCOhPsM6k,164
 py_near/dapps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_near/dapps/core.py,sha256=LtN9aW2gw2mvEdhzQcQJIidtjv-XL1xjb0LK8DzqtqE,231
@@ -7,7 +7,7 @@ py_near/dapps/ft/__init__.py,sha256=hx8qh4yEs37Ul_JhDWn8LHd-9lzsaATivxKOJPaUqTE,
 py_near/dapps/ft/async_client.py,sha256=Oir5EQOGueq0lsNn0ybe_1uvMnmV5K1m_mHFuFWIUu4,6717
 py_near/dapps/ft/exceptions.py,sha256=UjXLFsDQX0vDGS9CGO7HE9XpLD0vovFNUzCb11WKAtc,92
 py_near/dapps/ft/models.py,sha256=_URS8nXZvfuxjU7Ov2E-nteBak5qKtPKN3bLOR7sC9k,186
-py_near/dapps/fts.py,sha256=hyhTY6-l6dhTwBhxa4RP_TRlM3qXBAvdP2wVvNyT4As,856
+py_near/dapps/fts.py,sha256=ViMoQx0h-sgVTozr-JZk3hUGdGxsVP3oP3sAY8i8g5Q,946
 py_near/dapps/keypom/__init__.py,sha256=6fWGxsVr_lb_wTf_MHrbwBl1fgf78b5ezmsVa3JeFjI,32
 py_near/dapps/keypom/async_client.py,sha256=DS594S00xhcyvVtD1W0PjmtmT3YhvXTZZ3hskbn1-1w,1422
 py_near/dapps/keypom/exceptions.py,sha256=pGz0w1Ubh2A1aHEWvUX4dVaCcO9r2Y-h2JwhBY5KJbU,45
@@ -21,13 +21,13 @@ py_near/dapps/staking/async_client.py,sha256=TYudiPwF4tQ03rZuWNL-PUQ2kKpx06BxWWm
 py_near/dapps/staking/exceptions.py,sha256=UjXLFsDQX0vDGS9CGO7HE9XpLD0vovFNUzCb11WKAtc,92
 py_near/dapps/staking/models.py,sha256=zC5M_pc1oMqHq4GaYif1uwFbW6acD2BsiA9rbyiaUTs,124
 py_near/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-py_near/exceptions/exceptions.py,sha256=8gFkZpro3c-QrCUJmUSrgg3mCAMUl3VAf0UQPUkV2Tg,4839
+py_near/exceptions/exceptions.py,sha256=5iOeRpoVy63hPF6PC-wQkj7k4PHsn2NtxTTl9Jkp88M,5050
 py_near/exceptions/provider.py,sha256=NU_sGBVmxJbDOANl35ADxZe9fpHLvwFBk_BQNiLMhgw,7642
 py_near/models.py,sha256=QKQxL1wkTKZ4MWb5dprJZYalzrvd7bHSXC3WeBujuWE,9426
-py_near/providers.py,sha256=8ZpZU3UC7UEcaiC1unkKDHbfOSd8scEGTmoeoZhAAXE,8328
-py_near/transactions.py,sha256=B1_KB48te-WP2SECvFwCMHym9epJfiNBUX6tVSZXTmQ,2566
+py_near/providers.py,sha256=gI_xYFr_3xMleyDkI_3LpkcW4-yaDy5QSRzZKe3FkNM,8394
+py_near/transactions.py,sha256=QAXegv2JpKISk92NaChtIH6-QPHrcWbrwdKH_lH4TsU,3186
 py_near/utils.py,sha256=FirRH93ydH1cwjn0-sNrZeIn3BRD6QHedrP2VkAdJ6g,126
-py_near-1.1.4.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
-py_near-1.1.4.dist-info/METADATA,sha256=5DgNLRG7PgA5iEx_ItXSUUnWfkfyKxCtrsr5i7UT4UU,4661
-py_near-1.1.4.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-py_near-1.1.4.dist-info/RECORD,,
+py_near-1.1.7.dist-info/LICENSE,sha256=I_GOA9xJ35FiL-KnYXZJdATkbO2KcV2dK2enRGVxzKM,1023
+py_near-1.1.7.dist-info/METADATA,sha256=4DKDgC8HX6ayN73Ni8l7RqAyKye1lHdUrmPLKUpbWBU,4661
+py_near-1.1.7.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+py_near-1.1.7.dist-info/RECORD,,