bug fix (#38)

* bug fix

* delete duplicated stubExchangeAccount

* add coincurve to dependence

* add sync init_num_seq

* Regen

* fix type hints

* change secure_channel to async

* merge master push

* update denoms

Co-authored-by: nhannamsiu <[email protected]>

Author: DrunkenRandomWalker

README.md

@@ -4,11 +4,11 @@
 
 **Ubuntu**
 ```bash
-sudo apt install python3.X-dev
+sudo apt install python3.X-dev autoconf automake build-essential libffi-dev libtool pkg-config
 ```
 **Fedora**
 ```bash
-sudo dnf install python3-devel
+sudo dnf install python3-devel autoconf automake gcc gcc-c++ libffi-devel libtool make pkgconfig
 ```
 
 **macOS**

pyinjective/async_client.py

@@ -63,14 +63,13 @@ def __init__(
         self.exchange_channel = (
             grpc.aio.insecure_channel(network.grpc_exchange_endpoint)
             if insecure
-            else grpc.secure_channel(
+            else grpc.aio.secure_channel(
                 network.grpc_endpoint,
                 credentials or grpc.ssl_channel_credentials(),
                 )
         )
         self.stubMeta = exchange_meta_rpc_grpc.InjectiveMetaRPCStub(self.exchange_channel)
         self.stubExchangeAccount = exchange_accounts_rpc_grpc.InjectiveAccountsRPCStub(self.exchange_channel)
-        self.stubExchangeAccount = exchange_accounts_rpc_grpc.InjectiveAccountsRPCStub(self.exchange_channel)
         self.stubOracle = oracle_rpc_grpc.InjectiveOracleRPCStub(self.exchange_channel)
         self.stubInsurance = insurance_rpc_grpc.InjectiveInsuranceRPCStub(self.exchange_channel)
         self.stubSpotExchange = spot_exchange_rpc_grpc.InjectiveSpotExchangeRPCStub(self.exchange_channel)
@@ -256,7 +255,7 @@ async def get_spot_subaccount_trades(self, subaccount_id: str, market_id: str =
     # DerivativeRPC
 
     async def get_derivative_market(self, market_id: str):
-        req = spot_exchange_rpc_pb.MarketRequest(market_id=market_id)
+        req = derivative_exchange_rpc_pb.MarketRequest(market_id=market_id)
         return await self.stubDerivativeExchange.Market(req)
 
     async def get_derivative_markets(self, market_status: str = '', quote_denom: str = ''):

pyinjective/client.py

@@ -376,7 +376,7 @@ def get_spot_subaccount_trades(
     # DerivativeRPC
 
     def get_derivative_market(self, market_id: str):
-        req = spot_exchange_rpc_pb.MarketRequest(market_id=market_id)
+        req = derivative_exchange_rpc_pb.MarketRequest(market_id=market_id)
         return self.stubDerivativeExchange.Market(req)
 
     def get_derivative_markets(self, market_status: str = "", quote_denom: str = ""):

pyinjective/constant.py

@@ -31,7 +31,6 @@ def __init__(
 
     @classmethod
     def load_market(cls, network, market_id):
-        config = None
         if network == 'devnet':
             config = devnet_config
         elif network == 'testnet':
@@ -49,7 +48,6 @@ def load_market(cls, network, market_id):
 
     @classmethod
     def load_peggy_denom(cls, network, symbol):
-        config = None
         if network == 'devnet':
             config = devnet_config
         elif network == 'testnet':
@@ -62,12 +60,12 @@ def load_peggy_denom(cls, network, symbol):
 class Network:
     def __init__(
         self,
-        lcd_endpoint: str = None,
-        grpc_endpoint: str = None,
-        grpc_exchange_endpoint: str = None,
-        chain_id: str = None,
-        fee_denom: str = None,
-        env: str = None
+        lcd_endpoint: str ,
+        grpc_endpoint: str ,
+        grpc_exchange_endpoint: str ,
+        chain_id: str ,
+        fee_denom: str ,
+        env: str 
     ):
         self.lcd_endpoint = lcd_endpoint
         self.grpc_endpoint = grpc_endpoint

pyinjective/denoms_devnet.ini

@@ -79,6 +79,15 @@ min_display_price_tick_size = 0.001
 min_quantity_tick_size = 1000
 min_display_quantity_tick_size = 0.001
 
+[0x0511ddc4e6586f3bfe1acb2dd905f8b8a82c97e1edaef654b12ca7e6031ca0fa]
+description = 'Devnet Spot ATOM/USDT'
+base = 0
+quote = 6
+min_price_tick_size = 1000000000
+min_display_price_tick_size = 1000.0
+min_quantity_tick_size = 1000000000000000
+min_display_quantity_tick_size = 1000000000000000.0
+
 [0x4ca0f92fc28be0c9761326016b5a1a2177dd6375558365116b5bdda9abc229ce]
 description = 'Devnet Derivative BTC/USDT PERP'
 base = 0

pyinjective/wallet.py

@@ -4,6 +4,7 @@
 import bech32
 import aiohttp
 import json
+import requests
 from typing import Tuple
 from bech32 import bech32_encode, bech32_decode, convertbits
 from bip32 import BIP32
@@ -262,7 +263,7 @@ def get_subaccount_id(self, index: int) -> str:
         id = index.to_bytes(12, byteorder='big').hex()
         return '0x' + self.addr.hex() + id
 
-    async def init_num_seq(self, lcd_endpoint: str) -> "Address":
+    async def async_init_num_seq(self, lcd_endpoint: str) -> "Address":
         async with aiohttp.ClientSession() as session:
             async with session.request(
                 'GET', lcd_endpoint + '/cosmos/auth/v1beta1/accounts/' + self.to_acc_bech32(),
@@ -278,6 +279,17 @@ async def init_num_seq(self, lcd_endpoint: str) -> "Address":
                 self.sequence = int(acc['sequence'])
                 return self
 
+    def init_num_seq(self, lcd_endpoint: str)-> "Address":
+        response = requests.get(f"{lcd_endpoint}/cosmos/auth/v1beta1/accounts/{self.to_acc_bech32()}", 
+                headers={'Accept-Encoding': 'application/json'})
+        if response.status_code != 200:
+            raise ValueError("HTTP response status", response.status_code)
+        resp = json.loads(response.text)
+        acc = resp['account']['base_account']
+        self.number = int(acc['account_number'])
+        self.sequence = int(acc['sequence'])
+        return self
+
     def get_sequence(self):
         current_seq = self.sequence
         self.sequence += 1

setup.py

@@ -30,6 +30,7 @@
     "pysha3",
     "protobuf",
     "bip32",
+    "coincurve",
 ]
 
 # The rest you shouldn't have to touch too much :)