Merge pull request #146 from InjectiveLabs/f/add_load_balancer

F/add load balancer

Author: achilleas-kal

README.md

@@ -78,6 +78,11 @@ Note that the [sync client](https://github.com/InjectiveLabs/sdk-python/blob/mas
 
 
 ### Changelogs
+
+**0.5.8.2**
+* Add global load balancer
+* Refactor secure client initialization
+
 **0.5.7.9**
 * Add support for conditional orders & order mask
 * Add support for custom network
@@ -127,36 +132,6 @@ Note that the [sync client](https://github.com/InjectiveLabs/sdk-python/blob/mas
 * Add multi-subaccount support in local order hash calculation
 * Re-gen ini files
 
-**0.5.6.8**
-* Add skip & limit params to Exchange API methods
-* Add more methods in ExplorerRPC
-* Add bank balance chain queries
-* Remove LB endpoint and keep K8S as default
-* Refactored local order hash computation
-* Re-gen ini files
-
-**0.5.6.6**
-* Add PO orders in local order hash computation function
-* Add automatic timeout height in transactions
-* Add automatic session renewal for K8S
-* Add MsgDelegate and MsgWithdrawDelegatorReward in the composer
-* Add typed authz support in the composer
-* Decouple SendToCosmos from the composer and remove web3 dependency
-* Re-gen ini files
-
-
-**0.5.6.5**
-* Add MsgRelayPriceFeedPrice in the composer
-* Add Post-only orders in the composer
-* Add OrderbooksRequest in the clients
-* Add support for multiple markets in StreamTrades and StreamPosition
-* Add support for multiple subaccounts in StreamTrades and StreamPosition
-* Add K8S endpoint to mainnet network options
-* Add MsgRegisterAsDMM to the composer
-* Add functions to close chain/exchange channels
-* Re-gen ini files
-
-
 
 ## License
 

pyinjective/async_client.py

@@ -73,7 +73,8 @@ def __init__(
         self,
         network: Network,
         insecure: bool = False,
-        credentials: grpc.ChannelCredentials = None,
+        load_balancer: bool = False,
+        credentials = grpc.ssl_channel_credentials(),
         chain_cookie_location = ".chain_cookie"
     ):
 
@@ -82,16 +83,17 @@ def __init__(
         cookie_file = open(chain_cookie_location, "a+")
         cookie_file.close()
 
-        # load root CA cert
-        if not insecure:
-            if network.env == 'testnet':
-                if credentials is None:
-                    with open(os.path.join(os.path.dirname(__file__), 'cert/testnet.crt'), 'rb') as f:
-                        credentials = grpc.ssl_channel_credentials(f.read())
-            if network.env == 'mainnet':
-                if credentials is None:
-                    with open(os.path.join(os.path.dirname(__file__), 'cert/mainnet.crt'), 'rb') as f:
-                        credentials = grpc.ssl_channel_credentials(f.read())
+        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{}"
+
+        else:
+          self.cookie_type = "GCLB"
+          self.expiration_format = "{}"
 
         # chain stubs
         self.chain_channel = (
@@ -183,9 +185,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("grpc-cookie").get("expires")
+        expires_at = cookie.get(f"{self.cookie_type}").get("expires")
         expires_at = expires_at.replace("-"," ")
-        yyyy = "20{}".format(expires_at[12:14])
+        yyyy = f"{self.expiration_format}".format(expires_at[12:14])
         expires_at = expires_at[:12] + yyyy + expires_at[14:]
 
         # parse expire field to unix timestamp

pyinjective/cert/mainnet.crt

@@ -106,6 +106,7 @@ def testnet(cls):
     def mainnet(cls, node='k8s'):
         nodes = [
             'k8s',
+            'lb',
             'sentry0',  # us, prod
             'sentry1',  # us, prod
             'sentry2',  # us, staging
@@ -115,10 +116,15 @@ def mainnet(cls, node='k8s'):
             raise ValueError('Must be one of {}'.format(nodes))
 
         if node == 'k8s':
-            lcd_endpoint='https://k8s.mainnet.lcd.injective.network'
-            tm_websocket_endpoint='wss://k8s.mainnet.tm.injective.network/websocket'
+            lcd_endpoint='https://k8s.mainnet.lcd.injective.network:443'
+            tm_websocket_endpoint='wss://k8s.mainnet.tm.injective.network:443/websocket'
             grpc_endpoint='k8s.mainnet.chain.grpc.injective.network:443'
             grpc_exchange_endpoint='k8s.mainnet.exchange.grpc.injective.network:443'
+        elif node == 'lb':
+          lcd_endpoint = 'https://k8s.global.mainnet.lcd.injective.network:443'
+          tm_websocket_endpoint = 'wss://k8s.global.mainnet.tm.injective.network:443/websocket'
+          grpc_endpoint = 'k8s.global.mainnet.chain.grpc.injective.network:443'
+          grpc_exchange_endpoint = 'k8s.global.mainnet.exchange.grpc.injective.network:443'
         else:
             lcd_endpoint='https://lcd.injective.network'
             tm_websocket_endpoint=f'ws://{node}.injective.network:26657/websocket'