Merge pull request #157 from InjectiveLabs/f/add_get_account

chore: fix get_account with EthAccount type and cookie

Author: achilleas-kal

examples/chain_client/1_MsgSend.py

@@ -35,7 +35,8 @@ async def main() -> None:
     # load account
     priv_key = PrivateKey.from_hex("f9db9bf330e23cb7839039e944adef6e9df447b90b503d5b4464c90bea9022f3")
     pub_key = priv_key.to_public_key()
-    address = await pub_key.to_address().async_init_num_seq(network.lcd_endpoint)
+    address = pub_key.to_address()
+    account = await client.get_account(address.to_acc_bech32())
 
     # prepare tx msg
     msg = composer.MsgSend(
@@ -49,8 +50,8 @@ async def main() -> None:
     tx = (
         Transaction()
         .with_messages(msg)
-        .with_sequence(address.get_sequence())
-        .with_account_num(address.get_number())
+        .with_sequence(client.get_sequence())
+        .with_account_num(client.get_number())
         .with_chain_id(network.chain_id)
     )
     sim_sign_doc = tx.get_sign_doc(pub_key)

examples/chain_client/39_Account.py

@@ -0,0 +1,16 @@
+import asyncio
+import logging
+
+from pyinjective.async_client import AsyncClient
+from pyinjective.constant import Network
+
+async def main() -> None:
+    network = Network.testnet()
+    client = AsyncClient(network, insecure=False)
+    address = "inj1knhahceyp57j5x7xh69p7utegnnnfgxavmahjr"
+    acc = await client.get_account(address=address)
+    print(acc)
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.INFO)
+    asyncio.get_event_loop().run_until_complete(main())

pyinjective/async_client.py

@@ -58,43 +58,50 @@
     injective_auction_rpc_pb2_grpc as auction_rpc_grpc,
 )
 
+from proto.injective.types.v1beta1 import (
+    account_pb2
+)
+
 from .constant import Network
 
 DEFAULT_TIMEOUTHEIGHT_SYNC_INTERVAL = 20  # seconds
 DEFAULT_TIMEOUTHEIGHT = 30  # blocks
 DEFAULT_SESSION_RENEWAL_OFFSET = 120  # seconds
 DEFAULT_BLOCK_TIME = 2  # seconds
 
-
 logging.basicConfig(format="%(levelname)s:%(message)s", level=logging.INFO)
 
 
 class AsyncClient:
     def __init__(
-        self,
-        network: Network,
-        insecure: bool = False,
-        load_balancer: bool = False,
-        credentials = grpc.ssl_channel_credentials(),
-        chain_cookie_location = ".chain_cookie"
+            self,
+            network: Network,
+            insecure: bool = False,
+            load_balancer: bool = False,
+            credentials=grpc.ssl_channel_credentials(),
+            chain_cookie_location=".chain_cookie",
     ):
 
         # use append mode to create file if not exist
         self.chain_cookie_location = chain_cookie_location
         cookie_file = open(chain_cookie_location, "a+")
         cookie_file.close()
-        
+
+        self.addr = ""
+        self.number = 0
+        self.sequence = 0
+
         self.cookie_type = None
         self.expiration_format = None
         self.load_balancer = load_balancer
 
         if self.load_balancer is False:
-          self.cookie_type = "grpc-cookie"
-          self.expiration_format = "20{}"
+            self.cookie_type = "grpc-cookie"
+            self.expiration_format = "20{}"
 
         else:
-          self.cookie_type = "GCLB"
-          self.expiration_format = "{}"
+            self.cookie_type = "GCLB"
+            self.expiration_format = "{}"
 
         # chain stubs
         self.chain_channel = (
@@ -161,6 +168,14 @@ def __init__(
             start=True,
         )
 
+    def get_sequence(self):
+        current_seq = self.sequence
+        self.sequence += 1
+        return current_seq
+
+    def get_number(self):
+        return self.number
+
     async def get_tx(self, tx_hash):
         return await self.stubTx.GetTx(tx_service.GetTxRequest(hash=tx_hash))
 
@@ -199,9 +214,9 @@ async def renew_cookie(self, existing_cookie, type):
         # format cookie date into RFC1123 standard
         cookie = SimpleCookie()
         cookie.load(existing_cookie)
-        
+
         expires_at = cookie.get(f"{self.cookie_type}").get("expires")
-        expires_at = expires_at.replace("-"," ")
+        expires_at = expires_at.replace("-", " ")
         yyyy = f"{self.expiration_format}".format(expires_at[12:14])
         expires_at = expires_at[:12] + yyyy + expires_at[14:]
 
@@ -270,16 +285,19 @@ async def get_latest_block(self) -> tendermint_query.GetLatestBlockResponse:
         req = tendermint_query.GetLatestBlockRequest()
         return await self.stubCosmosTendermint.GetLatestBlock(req)
 
-    async def get_account(self, address: str) -> Optional[auth_type.BaseAccount]:
+    async def get_account(self, address: str) -> Optional[account_pb2.EthAccount]:
         try:
-            account_any = await self.stubAuth.Account(
-                auth_query.QueryAccountRequest(address=address)
-            ).account
-            account = auth_type.BaseAccount()
+            metadata = await self.load_cookie(type="chain")
+            account_any = (await self.stubAuth.Account(
+                auth_query.QueryAccountRequest.__call__(address=address), metadata=metadata
+            )).account
+            account = account_pb2.EthAccount()
             if account_any.Is(account.DESCRIPTOR):
                 account_any.Unpack(account)
-                return account
-        except:
+                self.number = int(account.base_account.account_number)
+                self.sequence = int(account.base_account.sequence)
+        except Exception as e:
+            logging.debug("error while fetching sequence and number{}".format(e))
             return None
 
     async def get_request_id_by_tx_hash(self, tx_hash: bytes) -> List[int]:
@@ -302,7 +320,7 @@ async def get_request_id_by_tx_hash(self, tx_hash: bytes) -> List[int]:
         return request_ids
 
     async def simulate_tx(
-        self, tx_byte: bytes
+            self, tx_byte: bytes
     ) -> Tuple[Union[abci_type.SimulationResponse, grpc.RpcError], bool]:
         try:
             req = tx_service.SimulateRequest(tx_bytes=tx_byte)
@@ -538,19 +556,19 @@ async def get_rewards(self, **kwargs):
     # OracleRPC
 
     async def stream_oracle_prices(
-        self, base_symbol: str, quote_symbol: str, oracle_type: str
+            self, base_symbol: str, quote_symbol: str, oracle_type: str
     ):
         req = oracle_rpc_pb.StreamPricesRequest(
             base_symbol=base_symbol, quote_symbol=quote_symbol, oracle_type=oracle_type
         )
         return self.stubOracle.StreamPrices(req)
 
     async def get_oracle_prices(
-        self,
-        base_symbol: str,
-        quote_symbol: str,
-        oracle_type: str,
-        oracle_scale_factor: int,
+            self,
+            base_symbol: str,
+            quote_symbol: str,
+            oracle_type: str,
+            oracle_scale_factor: int,
     ):
         req = oracle_rpc_pb.PriceRequest(
             base_symbol=base_symbol,