Skip to content

Commit 995c825

Browse files
achilleas-kalachilleas-kal
authored
Merge pull request #185 from InjectiveLabs/f/lb_config_and_relative_import
F/lb config and relative import
2 parents 95f5eee + acf5430 commit 995c825

File tree

3 files changed

+39
-29
lines changed

3 files changed

+39
-29
lines changed

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ Note that the [sync client](https://github.com/InjectiveLabs/sdk-python/blob/mas
7878

7979

8080
### Changelogs
81+
**0.6.0.6**
82+
* Set default testnet endpoints to K8S
83+
* Remove LB config for testnet
84+
* Fix relative imports in composer
85+
* Add AccountPortfolio & StreamAccountPortfolio
86+
8187
**0.6.0.5**
8288
* Add new testnet endpoints
8389
* Re-gen mainnet denoms

‎pyinjective/async_client.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ def __init__(
9696
self.cookie_type = None
9797
self.expiration_format = None
9898
self.load_balancer = load_balancer
99+
self.network = network
100+
101+
if self.network.string() == "testnet":
102+
self.load_balancer = False
99103

100104
if self.load_balancer is False:
101105
self.cookie_type = "grpc-cookie"

‎pyinjective/composer.py‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from .proto.cosmos.bank.v1beta1 import tx_pb2 as cosmos_bank_tx_pb
1313

1414
from .proto.injective.exchange.v1beta1 import tx_pb2 as injective_exchange_tx_pb
15-
from .proto.injective.exchange.v1beta1 import exchange_pb2 as injective_exchange_pb
15+
from pyinjective.proto.injective.exchange.v1beta1 import exchange_pb2 as injective_dot_exchange_dot_v1beta1_dot_exchange__pb2
1616
from .proto.injective.types.v1beta1 import tx_response_pb2 as tx_response_pb
1717

1818
from .proto.injective.auction.v1beta1 import tx_pb2 as injective_auction_tx_pb
@@ -47,21 +47,21 @@ def get_order_mask(self, **kwargs):
4747
order_mask = 0
4848

4949
if kwargs.get("is_conditional"):
50-
order_mask += injective_exchange_pb.OrderMask.CONDITIONAL
50+
order_mask += injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderMask.CONDITIONAL
5151
else:
52-
order_mask += injective_exchange_pb.OrderMask.REGULAR
52+
order_mask += injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderMask.REGULAR
5353

5454
if kwargs.get("order_direction") == "buy":
55-
order_mask += injective_exchange_pb.OrderMask.DIRECTION_BUY_OR_HIGHER
55+
order_mask += injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderMask.DIRECTION_BUY_OR_HIGHER
5656

5757
elif kwargs.get("order_direction") == "sell":
58-
order_mask += injective_exchange_pb.OrderMask.DIRECTION_SELL_OR_LOWER
58+
order_mask += injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderMask.DIRECTION_SELL_OR_LOWER
5959

6060
if kwargs.get("order_type") == "market":
61-
order_mask += injective_exchange_pb.OrderMask.TYPE_MARKET
61+
order_mask += injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderMask.TYPE_MARKET
6262

6363
elif kwargs.get("order_type") == "limit":
64-
order_mask += injective_exchange_pb.OrderMask.TYPE_LIMIT
64+
order_mask += injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderMask.TYPE_LIMIT
6565

6666
if order_mask == 0:
6767
order_mask = 1
@@ -98,20 +98,20 @@ def SpotOrder(
9898
trigger_price = spot_price_to_backend(0, denom)
9999

100100
if kwargs.get("is_buy") and not kwargs.get("is_po"):
101-
order_type = injective_exchange_pb.OrderType.BUY
101+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.BUY
102102

103103
elif not kwargs.get("is_buy") and not kwargs.get("is_po"):
104-
order_type = injective_exchange_pb.OrderType.SELL
104+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.SELL
105105

106106
elif kwargs.get("is_buy") and kwargs.get("is_po"):
107-
order_type = injective_exchange_pb.OrderType.BUY_PO
107+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.BUY_PO
108108

109109
elif not kwargs.get("is_buy") and kwargs.get("is_po"):
110-
order_type = injective_exchange_pb.OrderType.SELL_PO
110+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.SELL_PO
111111

112-
return injective_exchange_pb.SpotOrder(
112+
return injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.SpotOrder(
113113
market_id=market_id,
114-
order_info=injective_exchange_pb.OrderInfo(
114+
order_info=injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderInfo(
115115
subaccount_id=subaccount_id,
116116
fee_recipient=fee_recipient,
117117
price=str(price),
@@ -152,32 +152,32 @@ def DerivativeOrder(
152152
quantity = derivative_quantity_to_backend(quantity, denom)
153153

154154
if kwargs.get("is_buy") and not kwargs.get("is_po"):
155-
order_type = injective_exchange_pb.OrderType.BUY
155+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.BUY
156156

157157
elif not kwargs.get("is_buy") and not kwargs.get("is_po"):
158-
order_type = injective_exchange_pb.OrderType.SELL
158+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.SELL
159159

160160
elif kwargs.get("is_buy") and kwargs.get("is_po"):
161-
order_type = injective_exchange_pb.OrderType.BUY_PO
161+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.BUY_PO
162162

163163
elif not kwargs.get("is_buy") and kwargs.get("is_po"):
164-
order_type = injective_exchange_pb.OrderType.SELL_PO
164+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.SELL_PO
165165

166166
elif kwargs.get("stop_buy"):
167-
order_type = injective_exchange_pb.OrderType.STOP_BUY
167+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.STOP_BUY
168168

169169
elif kwargs.get("stop_sell"):
170-
order_type = injective_exchange_pb.OrderType.STOP_SEll
170+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.STOP_SEll
171171

172172
elif kwargs.get("take_buy"):
173-
order_type = injective_exchange_pb.OrderType.TAKE_BUY
173+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.TAKE_BUY
174174

175175
elif kwargs.get("take_sell"):
176-
order_type = injective_exchange_pb.OrderType.TAKE_SELL
176+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.TAKE_SELL
177177

178-
return injective_exchange_pb.DerivativeOrder(
178+
return injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.DerivativeOrder(
179179
market_id=market_id,
180-
order_info=injective_exchange_pb.OrderInfo(
180+
order_info=injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderInfo(
181181
subaccount_id=subaccount_id,
182182
fee_recipient=fee_recipient,
183183
price=str(price),
@@ -223,20 +223,20 @@ def BinaryOptionsOrder(
223223
quantity = binary_options_quantity_to_backend(quantity, denom)
224224

225225
if kwargs.get("is_buy") and not kwargs.get("is_po"):
226-
order_type = injective_exchange_pb.OrderType.BUY
226+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.BUY
227227

228228
elif not kwargs.get("is_buy") and not kwargs.get("is_po"):
229-
order_type = injective_exchange_pb.OrderType.SELL
229+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.SELL
230230

231231
elif kwargs.get("is_buy") and kwargs.get("is_po"):
232-
order_type = injective_exchange_pb.OrderType.BUY_PO
232+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.BUY_PO
233233

234234
elif not kwargs.get("is_buy") and kwargs.get("is_po"):
235-
order_type = injective_exchange_pb.OrderType.SELL_PO
235+
order_type = injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderType.SELL_PO
236236

237-
return injective_exchange_pb.DerivativeOrder(
237+
return injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.DerivativeOrder(
238238
market_id=market_id,
239-
order_info=injective_exchange_pb.OrderInfo(
239+
order_info=injective_dot_exchange_dot_v1beta1_dot_exchange__pb2.OrderInfo(
240240
subaccount_id=subaccount_id,
241241
fee_recipient=fee_recipient,
242242
price=str(price),

0 commit comments

Comments
 (0)