Instantiate composer with network enum to pick correct metadata ini

Author: nhannamsiu

MANIFEST.in

@@ -1,2 +1,2 @@
 recursive-include pyinjective/proto *.py
-include pyinjective/denoms.ini
+recursive-include pyinjective *.ini

pyinjective/composer.py

@@ -8,23 +8,24 @@
 from .utils import *
 
 class Composer:
-    @staticmethod
-    def Coin(amount: int, denom: str):
+    def __init__(self, network: str):
+        self.network =  network
+
+    def Coin(self, amount: int, denom: str):
         return cosmos_base_coin_pb.Coin(
             amount=amount,
             denom=denom
         )
 
-    @staticmethod
-    def OrderData(market_id: str, subaccount_id: str, order_hash: str):
+    def OrderData(self, market_id: str, subaccount_id: str, order_hash: str):
         return injective_exchange_tx_pb.OrderData(
             market_id=market_id,
             subaccount_id=subaccount_id,
             order_hash=order_hash
         )
 
-    @staticmethod
     def SpotOrder(
+        self,
         market_id: str,
         subaccount_id: str,
         fee_recipient: str,
@@ -33,7 +34,7 @@ def SpotOrder(
         isBuy: bool
     ):
         # load denom metadata
-        denom =  Denoms.load_market(market_id)
+        denom =  Denoms.load_market(self.network, market_id)
         print('loaded market metadata for', denom.description)
 
         # prepare values
@@ -54,8 +55,8 @@ def SpotOrder(
             trigger_price=trigger_price
         )
 
-    @staticmethod
     def DerivativeOrder(
+        self,
         market_id: str,
         subaccount_id: str,
         fee_recipient: str,
@@ -65,7 +66,7 @@ def DerivativeOrder(
         isBuy: bool
     ):
         # load denom metadata
-        denom =  Denoms.load_market(market_id)
+        denom =  Denoms.load_market(self.network, market_id)
         print('loaded market metadata for', denom.description)
 
         # prepare values
@@ -89,24 +90,22 @@ def DerivativeOrder(
         )
 
 
-    @staticmethod
-    def MsgSend(from_address: str, to_address: str, amount: int, denom: str):
+    def MsgSend(self, from_address: str, to_address: str, amount: int, denom: str):
         return cosmos_bank_tx_pb.MsgSend(
             from_address=from_address,
             to_address=to_address,
-            amount=[Composer.Coin(amount=str(amount),denom=denom)]
+            amount=[self.Coin(amount=str(amount),denom=denom)]
         )
 
-    @staticmethod
-    def MsgDeposit(sender: str, subaccount_id: str, amount: int, denom: str):
+    def MsgDeposit(self, sender: str, subaccount_id: str, amount: int, denom: str):
         return injective_exchange_tx_pb.MsgDeposit(
             sender=sender,
             subaccount_id=subaccount_id,
-            amount=Composer.Coin(amount=str(amount),denom=denom)
+            amount=self.Coin(amount=str(amount),denom=denom)
         )
 
-    @staticmethod
     def MsgCreateSpotLimitOrder(
+        self,
         market_id: str,
         sender: str,
         subaccount_id: str,
@@ -117,7 +116,7 @@ def MsgCreateSpotLimitOrder(
     ):
         return injective_exchange_tx_pb.MsgCreateSpotLimitOrder(
             sender=sender,
-            order=Composer.SpotOrder(
+            order=self.SpotOrder(
                 market_id=market_id,
                 subaccount_id=subaccount_id,
                 fee_recipient=fee_recipient,
@@ -127,8 +126,8 @@ def MsgCreateSpotLimitOrder(
             )
         )
 
-    @staticmethod
     def MsgCreateSpotMarketOrder(
+        self,
         market_id: str,
         sender: str,
         subaccount_id: str,
@@ -139,7 +138,7 @@ def MsgCreateSpotMarketOrder(
     ):
         return injective_exchange_tx_pb.MsgCreateSpotMarketOrder(
             sender=sender,
-            order=Composer.SpotOrder(
+            order=self.SpotOrder(
                 market_id=market_id,
                 subaccount_id=subaccount_id,
                 fee_recipient=fee_recipient,
@@ -149,8 +148,8 @@ def MsgCreateSpotMarketOrder(
             )
         )
 
-    @staticmethod
     def MsgCancelSpotOrder(
+        self,
         market_id: str,
         sender: str,
         subaccount_id: str,
@@ -163,8 +162,8 @@ def MsgCancelSpotOrder(
             order_hash=order_hash
         )
 
-    @staticmethod
     def MsgBatchCreateSpotLimitOrders(
+        self,
         sender: str,
         orders: list
     ):
@@ -173,8 +172,8 @@ def MsgBatchCreateSpotLimitOrders(
             orders=orders
         )
 
-    @staticmethod
     def MsgBatchCancelSpotOrders(
+        self,
         sender: str,
         data: list
     ):
@@ -183,8 +182,8 @@ def MsgBatchCancelSpotOrders(
             data=data
         )
 
-    @staticmethod
     def MsgCreateDerivativeLimitOrder(
+        self,
         market_id: str,
         sender: str,
         subaccount_id: str,
@@ -196,7 +195,7 @@ def MsgCreateDerivativeLimitOrder(
     ):
         return injective_exchange_tx_pb.MsgCreateDerivativeLimitOrder(
             sender=sender,
-            order=Composer.DerivativeOrder(
+            order=self.DerivativeOrder(
                 market_id=market_id,
                 subaccount_id=subaccount_id,
                 fee_recipient=fee_recipient,
@@ -207,8 +206,8 @@ def MsgCreateDerivativeLimitOrder(
             )
         )
 
-    @staticmethod
     def MsgCreateDerivativeMarketOrder(
+        self,
         market_id: str,
         sender: str,
         subaccount_id: str,
@@ -220,7 +219,7 @@ def MsgCreateDerivativeMarketOrder(
     ):
         return injective_exchange_tx_pb.MsgCreateDerivativeMarketOrder(
             sender=sender,
-            order=Composer.DerivativeOrder(
+            order=self.DerivativeOrder(
                 market_id=market_id,
                 subaccount_id=subaccount_id,
                 fee_recipient=fee_recipient,
@@ -231,8 +230,8 @@ def MsgCreateDerivativeMarketOrder(
             )
         )
 
-    @staticmethod
     def MsgCancelDerivativeOrder(
+        self,
         market_id: str,
         sender: str,
         subaccount_id: str,
@@ -245,8 +244,8 @@ def MsgCancelDerivativeOrder(
             order_hash=order_hash
         )
 
-    @staticmethod
     def MsgBatchCreateDerivativeLimitOrders(
+        self,
         sender: str,
         orders: list
     ):
@@ -255,8 +254,8 @@ def MsgBatchCreateDerivativeLimitOrders(
             orders=orders
         )
 
-    @staticmethod
     def MsgBatchCancelDerivativeOrders(
+        self,
         sender: str,
         data: list
     ):

pyinjective/constant.py

@@ -5,8 +5,11 @@
 MAX_DATA_SIZE = 256
 MAX_MEMO_CHARACTERS = 256
 
-config = ConfigParser()
-config.read(os.path.join(os.path.dirname(__file__), 'denoms.ini'))
+testnet_config = ConfigParser()
+testnet_config.read(os.path.join(os.path.dirname(__file__), 'testnet_denoms.ini'))
+
+mainnet_config = ConfigParser()
+mainnet_config.read(os.path.join(os.path.dirname(__file__), 'mainnet_denoms.ini'))
 
 class Denoms:
     def __init__(
@@ -24,7 +27,13 @@ def __init__(
         self.min_quantity_tick_size = min_quantity_tick_size
 
     @classmethod
-    def load_market(cls, market_id):
+    def load_market(cls, network, market_id):
+        config = None
+        if network == 'testnet':
+            config = testnet_config
+        if network == 'mainnet':
+            config =mainnet_config
+
         return cls(
             description=config._sections[market_id]['description'],
             base=int(config._sections[market_id]['base']),
@@ -40,13 +49,15 @@ def __init__(
         grpc_endpoint: str = None,
         grpc_exchange_endpoint: str = None,
         chain_id: str = None,
-        fee_denom: str = None
+        fee_denom: str = None,
+        env: str = None
     ):
         self.lcd_endpoint = lcd_endpoint
         self.grpc_endpoint = grpc_endpoint
         self.grpc_exchange_endpoint = grpc_exchange_endpoint
         self.chain_id = chain_id
         self.fee_denom = fee_denom
+        self.env = env
 
     @classmethod
     def local(cls):
@@ -55,7 +66,8 @@ def local(cls):
             grpc_endpoint='localhost:9900',
             grpc_exchange_endpoint='localhost:9110',
             chain_id='injective-1',
-            fee_denom='inj'
+            fee_denom='inj',
+            env = 'local'
         )
 
     @classmethod
@@ -65,7 +77,8 @@ def testnet(cls):
             grpc_endpoint='testnet-sentry0.injective.network:9900',
             grpc_exchange_endpoint='testnet-sentry0.injective.network:9910',
             chain_id='injective-888',
-            fee_denom='inj'
+            fee_denom='inj',
+            env = 'testnet'
         )
 
     @classmethod
@@ -75,5 +88,9 @@ def mainnet(cls):
             grpc_endpoint='sentry0.injective.network:9900',
             grpc_exchange_endpoint='sentry0.injective.network:9910',
             chain_id='injective-1',
-            fee_denom='inj'
+            fee_denom='inj',
+            env = 'mainnet'
         )
+
+    def string(self):
+        return self.env

pyinjective/fetch_metadata.py

@@ -9,54 +9,65 @@
 
 from pyinjective.constant import Network
 
-network = Network.testnet()
-
 metadata_template = """[{}]
-description = '{} {}'
+description = '{} {} {}'
 base = {}
 quote = {}
 min_price_tick_size = {}
 min_quantity_tick_size = {}
 
 """
 
-denom_output = ''
+testnet_denom_output = ''
+mainnet_denom_output = ''
 
-async def main() -> None:
-    global denom_output
+async def fetch_denom(network) -> str:
+    denom_output = ''
+
+    # fetch meta data for spot markets
     async with grpc.aio.insecure_channel(network.grpc_exchange_endpoint) as channel:
         spot_exchange_rpc = spot_exchange_rpc_grpc.InjectiveSpotExchangeRPCStub(channel)
         status = "active"
         mresp = await spot_exchange_rpc.Markets(spot_exchange_rpc_pb.MarketsRequest(market_status=status))
         for market in mresp.markets:
             config = metadata_template.format(
                 market.market_id,
-                'Spot', market.ticker,
+                network.string().capitalize(), 'Spot', market.ticker,
                 market.base_token_meta.decimals,
                 market.quote_token_meta.decimals,
                 market.min_price_tick_size,
                 market.min_quantity_tick_size
             )
             denom_output += config
 
-
+    # fetch meta data for derivative markets
     async with grpc.aio.insecure_channel(network.grpc_exchange_endpoint) as channel:
         derivative_exchange_rpc = derivative_exchange_rpc_grpc.InjectiveDerivativeExchangeRPCStub(channel)
         status = "active"
         mresp = await derivative_exchange_rpc.Markets(derivative_exchange_rpc_pb.MarketsRequest(market_status=status))
         for market in mresp.markets:
             config = metadata_template.format(
                 market.market_id,
-                'Derivative', market.ticker,
+                network.string().capitalize(), 'Derivative', market.ticker,
                 18,
                 market.quote_token_meta.decimals,
                 market.min_price_tick_size,
                 market.min_quantity_tick_size
             )
             denom_output += config
 
-    with open("./pyinjective/denoms.ini", "w") as text_file:
-        text_file.write(denom_output)
+    return denom_output
+
+async def main() -> None:
+    testnet = Network.testnet()
+    data = await fetch_denom(testnet)
+    with open("./pyinjective/testnet_denoms.ini", "w") as text_file:
+        text_file.write(data)
+
+    mainnet = Network.mainnet()
+    data = await fetch_denom(mainnet)
+    with open("./pyinjective/mainnet_denoms.ini", "w") as text_file:
+        text_file.write(data)
 
 if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)