From bc266daaaa910c34b81259d8bba0bf2b646c7829 Mon Sep 17 00:00:00 2001 From: abel Date: Wed, 6 Sep 2023 00:31:41 -0300 Subject: [PATCH] (feat) Made lb bare-metal node the default for mainnet. Fixed an issue with the cookies manager configuration for testnet sentry node. Moved secure/insecure connection configuration to the Network class --- README.md | 4 + examples/chain_client/0_LocalOrderHash.py | 3 +- .../13_MsgIncreasePositionMargin.py | 2 +- examples/chain_client/15_MsgWithdraw.py | 2 +- .../chain_client/16_MsgSubaccountTransfer.py | 2 +- .../chain_client/17_MsgBatchUpdateOrders.py | 2 +- examples/chain_client/18_MsgBid.py | 2 +- examples/chain_client/19_MsgGrant.py | 2 +- examples/chain_client/1_MsgSend.py | 2 +- examples/chain_client/20_MsgExec.py | 2 +- examples/chain_client/21_MsgRevoke.py | 2 +- examples/chain_client/22_MsgSendToEth.py | 2 +- .../chain_client/23_MsgRelayPriceFeedPrice.py | 2 +- examples/chain_client/24_MsgRewardsOptOut.py | 2 +- examples/chain_client/25_MsgDelegate.py | 2 +- .../26_MsgWithdrawDelegatorReward.py | 2 +- examples/chain_client/27_Grants.py | 2 +- examples/chain_client/28_BankBalances.py | 2 +- examples/chain_client/29_BankBalance.py | 2 +- examples/chain_client/2_MsgDeposit.py | 4 +- examples/chain_client/30_ExternalTransfer.py | 2 +- .../31_MsgCreateBinaryOptionsLimitOrder.py | 2 +- .../32_MsgCreateBinaryOptionsMarketOrder.py | 2 +- .../33_MsgCancelBinaryOptionsOrder.py | 2 +- .../34_MsgAdminUpdateBinaryOptionsMarket.py | 2 +- .../35_MsgInstantBinaryOptionsMarketLaunch.py | 2 +- .../chain_client/36_MsgRelayProviderPrices.py | 2 +- examples/chain_client/37_GetTx.py | 2 +- examples/chain_client/39_Account.py | 2 +- .../chain_client/3_MsgCreateSpotLimitOrder.py | 2 +- .../chain_client/40_MsgExecuteContract.py | 2 +- .../chain_client/41_MsgCreateInsuranceFund.py | 2 +- examples/chain_client/42_MsgUnderwrite.py | 2 +- .../chain_client/43_MsgRequestRedemption.py | 2 +- .../chain_client/44_MessageBroadcaster.py | 1 - ...45_MessageBroadcasterWithGranteeAccount.py | 3 +- .../46_MessageBroadcasterWithoutSimulation.py | 1 - ...sterWithGranteeAccountWithoutSimulation.py | 3 +- .../4_MsgCreateSpotMarketOrder.py | 2 +- examples/chain_client/5_MsgCancelSpotOrder.py | 2 +- .../6_MsgCreateDerivativeLimitOrder.py | 2 +- .../7_MsgCreateDerivativeMarketOrder.py | 2 +- .../8_MsgCancelDerivativeOrder.py | 2 +- .../accounts_rpc/1_StreamSubaccountBalance.py | 2 +- .../accounts_rpc/2_SubaccountBalance.py | 2 +- .../accounts_rpc/3_SubaccountsList.py | 2 +- .../accounts_rpc/4_SubaccountBalancesList.py | 2 +- .../accounts_rpc/5_SubaccountHistory.py | 2 +- .../accounts_rpc/6_SubaccountOrderSummary.py | 2 +- .../accounts_rpc/7_OrderStates.py | 2 +- .../accounts_rpc/8_Portfolio.py | 2 +- .../exchange_client/accounts_rpc/9_Rewards.py | 2 +- .../exchange_client/auctions_rpc/1_Auction.py | 2 +- .../auctions_rpc/2_Auctions.py | 2 +- .../auctions_rpc/3_StreamBids.py | 2 +- .../10_StreamHistoricalOrders.py | 2 +- .../derivative_exchange_rpc/11_Trades.py | 2 +- .../12_StreamTrades.py | 2 +- .../13_SubaccountOrdersList.py | 2 +- .../14_SubaccountTradesList.py | 2 +- .../15_FundingPayments.py | 2 +- .../17_FundingRates.py | 2 +- .../derivative_exchange_rpc/18_Orderbooks.py | 2 +- .../19_Binary_Options_Markets.py | 2 +- .../derivative_exchange_rpc/1_Market.py | 2 +- .../20_Binary_Options_Market.py | 2 +- .../21_Historical_Orders.py | 2 +- .../22_OrderbooksV2.py | 2 +- .../derivative_exchange_rpc/2_Markets.py | 2 +- .../derivative_exchange_rpc/3_StreamMarket.py | 2 +- .../derivative_exchange_rpc/4_Orderbook.py | 2 +- .../5_StreamOrderbooks.py | 2 +- .../6_StreamOrderbookUpdate.py | 2 +- .../derivative_exchange_rpc/7_Positions.py | 2 +- .../9_StreamPositions.py | 2 +- .../explorer_rpc/10_GetIBCTransfers.py | 2 +- .../explorer_rpc/1_GetTxByHash.py | 2 +- .../explorer_rpc/2_AccountTxs.py | 2 +- .../exchange_client/explorer_rpc/3_Blocks.py | 2 +- .../exchange_client/explorer_rpc/4_Block.py | 2 +- .../explorer_rpc/5_TxsRequest.py | 2 +- .../explorer_rpc/6_StreamTxs.py | 2 +- .../explorer_rpc/7_StreamBlocks.py | 2 +- .../explorer_rpc/8_GetPeggyDeposits.py | 2 +- .../explorer_rpc/9_GetPeggyWithdrawals.py | 2 +- .../insurance_rpc/1_InsuranceFunds.py | 2 +- .../insurance_rpc/2_Redemptions.py | 2 +- examples/exchange_client/meta_rpc/1_Ping.py | 2 +- .../exchange_client/meta_rpc/2_Version.py | 2 +- examples/exchange_client/meta_rpc/3_Info.py | 2 +- .../meta_rpc/4_StreamKeepAlive.py | 2 +- .../oracle_rpc/1_StreamPrices.py | 2 +- .../exchange_client/oracle_rpc/2_Price.py | 2 +- .../oracle_rpc/3_OracleList.py | 2 +- .../portfolio_rpc/1_AccountPortfolio.py | 2 +- .../portfolio_rpc/2_StreamAccountPortfolio.py | 2 +- .../spot_exchange_rpc/10_StreamTrades.py | 2 +- .../11_SubaccountOrdersList.py | 2 +- .../12_SubaccountTradesList.py | 2 +- .../spot_exchange_rpc/13_StreamOrderbooks.py | 2 +- .../spot_exchange_rpc/14_Orderbooks.py | 2 +- .../spot_exchange_rpc/15_HistoricalOrders.py | 2 +- .../spot_exchange_rpc/1_Market.py | 2 +- .../spot_exchange_rpc/2_Markets.py | 2 +- .../spot_exchange_rpc/3_StreamMarkets.py | 2 +- .../spot_exchange_rpc/4_Orderbook.py | 2 +- .../spot_exchange_rpc/6_Trades.py | 2 +- .../7_StreamOrderbookSnapshot.py | 2 +- .../8_StreamOrderbookUpdate.py | 2 +- .../9_StreamHistoricalOrders.py | 2 +- pyinjective/async_client.py | 21 ++-- pyinjective/core/broadcaster.py | 12 +-- pyinjective/core/network.py | 99 +++++-------------- pyinjective/utils/fetch_metadata.py | 4 +- pyinjective/utils/metadata_validation.py | 4 +- setup.py | 2 +- ...essage_based_transaction_fee_calculator.py | 14 +-- 117 files changed, 163 insertions(+), 218 deletions(-) diff --git a/README.md b/README.md index f2475615..278b5f7b 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,10 @@ make tests ``` ### Changelogs +**0.8.1** +* Moved the configuration to use a secure or insecure connection inside the Network class. The AsyncClient's `insecure` parameter is no longer used for anything and will be removed in the future. +* Made the new load balanced bare-metal node the default one for mainnet (it is called `lb`). The legacy one (load balanced k8s node) is called `lb_k8s` + **0.8**(change before release) * Refactor Composer to be created with all the markets and tokens. The Composer now uses the real markets and tokens to convert human-readable values to chain format * The Composer can still be instantiated without markets and tokens. When markets and tokens are not provided the Composer loads the required information from the Denoms used in previous versions diff --git a/examples/chain_client/0_LocalOrderHash.py b/examples/chain_client/0_LocalOrderHash.py index 7ce7de68..0e20049b 100644 --- a/examples/chain_client/0_LocalOrderHash.py +++ b/examples/chain_client/0_LocalOrderHash.py @@ -1,6 +1,7 @@ import asyncio from pyinjective.async_client import AsyncClient +from pyinjective.composer import Composer from pyinjective.transaction import Transaction from pyinjective.core.network import Network from pyinjective.wallet import PrivateKey @@ -11,7 +12,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/13_MsgIncreasePositionMargin.py b/examples/chain_client/13_MsgIncreasePositionMargin.py index 2aa66a13..d5e1d7cd 100644 --- a/examples/chain_client/13_MsgIncreasePositionMargin.py +++ b/examples/chain_client/13_MsgIncreasePositionMargin.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/15_MsgWithdraw.py b/examples/chain_client/15_MsgWithdraw.py index 51baf733..fb585719 100644 --- a/examples/chain_client/15_MsgWithdraw.py +++ b/examples/chain_client/15_MsgWithdraw.py @@ -25,7 +25,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/16_MsgSubaccountTransfer.py b/examples/chain_client/16_MsgSubaccountTransfer.py index 80cb0ee5..e3dbde9b 100644 --- a/examples/chain_client/16_MsgSubaccountTransfer.py +++ b/examples/chain_client/16_MsgSubaccountTransfer.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/17_MsgBatchUpdateOrders.py b/examples/chain_client/17_MsgBatchUpdateOrders.py index 4ce2cc56..853b85ee 100644 --- a/examples/chain_client/17_MsgBatchUpdateOrders.py +++ b/examples/chain_client/17_MsgBatchUpdateOrders.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/18_MsgBid.py b/examples/chain_client/18_MsgBid.py index eba03940..001fde7c 100644 --- a/examples/chain_client/18_MsgBid.py +++ b/examples/chain_client/18_MsgBid.py @@ -10,7 +10,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/19_MsgGrant.py b/examples/chain_client/19_MsgGrant.py index 1d58a24b..17a8ffee 100644 --- a/examples/chain_client/19_MsgGrant.py +++ b/examples/chain_client/19_MsgGrant.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/1_MsgSend.py b/examples/chain_client/1_MsgSend.py index ad24b941..f4894b4d 100644 --- a/examples/chain_client/1_MsgSend.py +++ b/examples/chain_client/1_MsgSend.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/20_MsgExec.py b/examples/chain_client/20_MsgExec.py index 12f4526c..e0f6854e 100644 --- a/examples/chain_client/20_MsgExec.py +++ b/examples/chain_client/20_MsgExec.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/21_MsgRevoke.py b/examples/chain_client/21_MsgRevoke.py index db39f714..51b23f8b 100644 --- a/examples/chain_client/21_MsgRevoke.py +++ b/examples/chain_client/21_MsgRevoke.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/22_MsgSendToEth.py b/examples/chain_client/22_MsgSendToEth.py index afaf3030..aed1442f 100644 --- a/examples/chain_client/22_MsgSendToEth.py +++ b/examples/chain_client/22_MsgSendToEth.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/23_MsgRelayPriceFeedPrice.py b/examples/chain_client/23_MsgRelayPriceFeedPrice.py index e17f05a2..d0a96996 100644 --- a/examples/chain_client/23_MsgRelayPriceFeedPrice.py +++ b/examples/chain_client/23_MsgRelayPriceFeedPrice.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/24_MsgRewardsOptOut.py b/examples/chain_client/24_MsgRewardsOptOut.py index da4fc0fc..ef876c35 100644 --- a/examples/chain_client/24_MsgRewardsOptOut.py +++ b/examples/chain_client/24_MsgRewardsOptOut.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/25_MsgDelegate.py b/examples/chain_client/25_MsgDelegate.py index f2f25db6..7df4eb17 100644 --- a/examples/chain_client/25_MsgDelegate.py +++ b/examples/chain_client/25_MsgDelegate.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/26_MsgWithdrawDelegatorReward.py b/examples/chain_client/26_MsgWithdrawDelegatorReward.py index 99d87b62..2ee30e32 100644 --- a/examples/chain_client/26_MsgWithdrawDelegatorReward.py +++ b/examples/chain_client/26_MsgWithdrawDelegatorReward.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/27_Grants.py b/examples/chain_client/27_Grants.py index 2ff81236..e94ce9b8 100644 --- a/examples/chain_client/27_Grants.py +++ b/examples/chain_client/27_Grants.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) granter = "inj14au322k9munkmx5wrchz9q30juf5wjgz2cfqku" grantee = "inj1hkhdaj2a2clmq5jq6mspsggqs32vynpk228q3r" msg_type_url = "/injective.exchange.v1beta1.MsgCreateDerivativeLimitOrder" diff --git a/examples/chain_client/28_BankBalances.py b/examples/chain_client/28_BankBalances.py index 84424426..5a52939f 100644 --- a/examples/chain_client/28_BankBalances.py +++ b/examples/chain_client/28_BankBalances.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) address = "inj1cml96vmptgw99syqrrz8az79xer2pcgp0a885r" all_bank_balances = await client.get_bank_balances(address=address) print(all_bank_balances) diff --git a/examples/chain_client/29_BankBalance.py b/examples/chain_client/29_BankBalance.py index 1f38a02d..d5d2d533 100644 --- a/examples/chain_client/29_BankBalance.py +++ b/examples/chain_client/29_BankBalance.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) address = "inj1cml96vmptgw99syqrrz8az79xer2pcgp0a885r" denom = "inj" bank_balance = await client.get_bank_balance(address=address, denom=denom) diff --git a/examples/chain_client/2_MsgDeposit.py b/examples/chain_client/2_MsgDeposit.py index 709c0bf2..1484b1ed 100644 --- a/examples/chain_client/2_MsgDeposit.py +++ b/examples/chain_client/2_MsgDeposit.py @@ -8,10 +8,10 @@ async def main() -> None: # select network: local, testnet, mainnet - network = Network.testnet() + network = Network.testnet(node="sentry") # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/30_ExternalTransfer.py b/examples/chain_client/30_ExternalTransfer.py index ab2b9034..a973e4b2 100644 --- a/examples/chain_client/30_ExternalTransfer.py +++ b/examples/chain_client/30_ExternalTransfer.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/31_MsgCreateBinaryOptionsLimitOrder.py b/examples/chain_client/31_MsgCreateBinaryOptionsLimitOrder.py index dfa03aa3..25652212 100644 --- a/examples/chain_client/31_MsgCreateBinaryOptionsLimitOrder.py +++ b/examples/chain_client/31_MsgCreateBinaryOptionsLimitOrder.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/32_MsgCreateBinaryOptionsMarketOrder.py b/examples/chain_client/32_MsgCreateBinaryOptionsMarketOrder.py index 62030441..8bd5ae77 100644 --- a/examples/chain_client/32_MsgCreateBinaryOptionsMarketOrder.py +++ b/examples/chain_client/32_MsgCreateBinaryOptionsMarketOrder.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/33_MsgCancelBinaryOptionsOrder.py b/examples/chain_client/33_MsgCancelBinaryOptionsOrder.py index 557f1dd9..f3e534b7 100644 --- a/examples/chain_client/33_MsgCancelBinaryOptionsOrder.py +++ b/examples/chain_client/33_MsgCancelBinaryOptionsOrder.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/34_MsgAdminUpdateBinaryOptionsMarket.py b/examples/chain_client/34_MsgAdminUpdateBinaryOptionsMarket.py index 78e7e88e..073529ae 100644 --- a/examples/chain_client/34_MsgAdminUpdateBinaryOptionsMarket.py +++ b/examples/chain_client/34_MsgAdminUpdateBinaryOptionsMarket.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/35_MsgInstantBinaryOptionsMarketLaunch.py b/examples/chain_client/35_MsgInstantBinaryOptionsMarketLaunch.py index 99510b6b..35c30c39 100644 --- a/examples/chain_client/35_MsgInstantBinaryOptionsMarketLaunch.py +++ b/examples/chain_client/35_MsgInstantBinaryOptionsMarketLaunch.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/36_MsgRelayProviderPrices.py b/examples/chain_client/36_MsgRelayProviderPrices.py index 41cabe90..23c9ac94 100644 --- a/examples/chain_client/36_MsgRelayProviderPrices.py +++ b/examples/chain_client/36_MsgRelayProviderPrices.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/37_GetTx.py b/examples/chain_client/37_GetTx.py index d2eb72fa..77d13eb9 100644 --- a/examples/chain_client/37_GetTx.py +++ b/examples/chain_client/37_GetTx.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) tx_hash = "7746BC12EB82B4D59D036FBFF2F67BDCA6F62A20B3DBC25661707DD61D4DC1B7" tx_logs = await client.get_tx(tx_hash=tx_hash) print(tx_logs) diff --git a/examples/chain_client/39_Account.py b/examples/chain_client/39_Account.py index b30232ec..4089a5dd 100644 --- a/examples/chain_client/39_Account.py +++ b/examples/chain_client/39_Account.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) address = "inj1knhahceyp57j5x7xh69p7utegnnnfgxavmahjr" acc = await client.get_account(address=address) print(acc) diff --git a/examples/chain_client/3_MsgCreateSpotLimitOrder.py b/examples/chain_client/3_MsgCreateSpotLimitOrder.py index daba1a39..34466874 100644 --- a/examples/chain_client/3_MsgCreateSpotLimitOrder.py +++ b/examples/chain_client/3_MsgCreateSpotLimitOrder.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/40_MsgExecuteContract.py b/examples/chain_client/40_MsgExecuteContract.py index 949caa1d..cde8c480 100644 --- a/examples/chain_client/40_MsgExecuteContract.py +++ b/examples/chain_client/40_MsgExecuteContract.py @@ -12,7 +12,7 @@ async def main() -> None: # initialize grpc client # set custom cookie location (optional) - defaults to current dir - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/41_MsgCreateInsuranceFund.py b/examples/chain_client/41_MsgCreateInsuranceFund.py index 3fb0c5cc..89007e23 100644 --- a/examples/chain_client/41_MsgCreateInsuranceFund.py +++ b/examples/chain_client/41_MsgCreateInsuranceFund.py @@ -11,7 +11,7 @@ async def main() -> None: # initialize grpc client # set custom cookie location (optional) - defaults to current dir - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/42_MsgUnderwrite.py b/examples/chain_client/42_MsgUnderwrite.py index 79cfe5d7..7c143e51 100644 --- a/examples/chain_client/42_MsgUnderwrite.py +++ b/examples/chain_client/42_MsgUnderwrite.py @@ -11,7 +11,7 @@ async def main() -> None: # initialize grpc client # set custom cookie location (optional) - defaults to current dir - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/43_MsgRequestRedemption.py b/examples/chain_client/43_MsgRequestRedemption.py index 8d434368..a32add66 100644 --- a/examples/chain_client/43_MsgRequestRedemption.py +++ b/examples/chain_client/43_MsgRequestRedemption.py @@ -11,7 +11,7 @@ async def main() -> None: # initialize grpc client # set custom cookie location (optional) - defaults to current dir - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/44_MessageBroadcaster.py b/examples/chain_client/44_MessageBroadcaster.py index 10d157fc..4fbeb719 100644 --- a/examples/chain_client/44_MessageBroadcaster.py +++ b/examples/chain_client/44_MessageBroadcaster.py @@ -15,7 +15,6 @@ async def main() -> None: message_broadcaster = MsgBroadcasterWithPk.new_using_simulation( network=network, private_key=private_key_in_hexa, - use_secure_connection=True ) priv_key = PrivateKey.from_hex(private_key_in_hexa) diff --git a/examples/chain_client/45_MessageBroadcasterWithGranteeAccount.py b/examples/chain_client/45_MessageBroadcasterWithGranteeAccount.py index 81417a1e..dc017f3f 100644 --- a/examples/chain_client/45_MessageBroadcasterWithGranteeAccount.py +++ b/examples/chain_client/45_MessageBroadcasterWithGranteeAccount.py @@ -13,7 +13,7 @@ async def main() -> None: composer = ProtoMsgComposer(network=network.string()) # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) await client.sync_timeout_height() # load account @@ -25,7 +25,6 @@ async def main() -> None: message_broadcaster = MsgBroadcasterWithPk.new_for_grantee_account_using_simulation( network=network, grantee_private_key=private_key_in_hexa, - use_secure_connection=True ) # prepare tx msg diff --git a/examples/chain_client/46_MessageBroadcasterWithoutSimulation.py b/examples/chain_client/46_MessageBroadcasterWithoutSimulation.py index 4e062d63..dc804b24 100644 --- a/examples/chain_client/46_MessageBroadcasterWithoutSimulation.py +++ b/examples/chain_client/46_MessageBroadcasterWithoutSimulation.py @@ -15,7 +15,6 @@ async def main() -> None: message_broadcaster = MsgBroadcasterWithPk.new_without_simulation( network=network, private_key=private_key_in_hexa, - use_secure_connection=True ) priv_key = PrivateKey.from_hex(private_key_in_hexa) diff --git a/examples/chain_client/47_MessageBroadcasterWithGranteeAccountWithoutSimulation.py b/examples/chain_client/47_MessageBroadcasterWithGranteeAccountWithoutSimulation.py index 371f852d..4221d795 100644 --- a/examples/chain_client/47_MessageBroadcasterWithGranteeAccountWithoutSimulation.py +++ b/examples/chain_client/47_MessageBroadcasterWithGranteeAccountWithoutSimulation.py @@ -13,7 +13,7 @@ async def main() -> None: composer = ProtoMsgComposer(network=network.string()) # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) await client.sync_timeout_height() # load account @@ -25,7 +25,6 @@ async def main() -> None: message_broadcaster = MsgBroadcasterWithPk.new_for_grantee_account_without_simulation( network=network, grantee_private_key=private_key_in_hexa, - use_secure_connection=True ) # prepare tx msg diff --git a/examples/chain_client/4_MsgCreateSpotMarketOrder.py b/examples/chain_client/4_MsgCreateSpotMarketOrder.py index 827e653d..3185cafa 100644 --- a/examples/chain_client/4_MsgCreateSpotMarketOrder.py +++ b/examples/chain_client/4_MsgCreateSpotMarketOrder.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/5_MsgCancelSpotOrder.py b/examples/chain_client/5_MsgCancelSpotOrder.py index 602beb7a..93030ecd 100644 --- a/examples/chain_client/5_MsgCancelSpotOrder.py +++ b/examples/chain_client/5_MsgCancelSpotOrder.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/6_MsgCreateDerivativeLimitOrder.py b/examples/chain_client/6_MsgCreateDerivativeLimitOrder.py index dc175e20..add38833 100644 --- a/examples/chain_client/6_MsgCreateDerivativeLimitOrder.py +++ b/examples/chain_client/6_MsgCreateDerivativeLimitOrder.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/7_MsgCreateDerivativeMarketOrder.py b/examples/chain_client/7_MsgCreateDerivativeMarketOrder.py index 88a18eb8..f1e71b1c 100644 --- a/examples/chain_client/7_MsgCreateDerivativeMarketOrder.py +++ b/examples/chain_client/7_MsgCreateDerivativeMarketOrder.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/chain_client/8_MsgCancelDerivativeOrder.py b/examples/chain_client/8_MsgCancelDerivativeOrder.py index 3784bdc6..1ea9001c 100644 --- a/examples/chain_client/8_MsgCancelDerivativeOrder.py +++ b/examples/chain_client/8_MsgCancelDerivativeOrder.py @@ -11,7 +11,7 @@ async def main() -> None: network = Network.testnet() # initialize grpc client - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = await client.composer() await client.sync_timeout_height() diff --git a/examples/exchange_client/accounts_rpc/1_StreamSubaccountBalance.py b/examples/exchange_client/accounts_rpc/1_StreamSubaccountBalance.py index bc0017ba..25c6163c 100644 --- a/examples/exchange_client/accounts_rpc/1_StreamSubaccountBalance.py +++ b/examples/exchange_client/accounts_rpc/1_StreamSubaccountBalance.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) subaccount_id = "0xc7dca7c15c364865f77a4fb67ab11dc95502e6fe000000000000000000000001" denoms = ["inj", "peggy0x87aB3B4C8661e07D6372361211B96ed4Dc36B1B5"] subaccount = await client.stream_subaccount_balance( diff --git a/examples/exchange_client/accounts_rpc/2_SubaccountBalance.py b/examples/exchange_client/accounts_rpc/2_SubaccountBalance.py index eeabafd1..13a5bfba 100644 --- a/examples/exchange_client/accounts_rpc/2_SubaccountBalance.py +++ b/examples/exchange_client/accounts_rpc/2_SubaccountBalance.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) subaccount_id = "0xaf79152ac5df276d9a8e1e2e22822f9713474902000000000000000000000000" denom = "inj" balance = await client.get_subaccount_balance( diff --git a/examples/exchange_client/accounts_rpc/3_SubaccountsList.py b/examples/exchange_client/accounts_rpc/3_SubaccountsList.py index 54abf051..390200e1 100644 --- a/examples/exchange_client/accounts_rpc/3_SubaccountsList.py +++ b/examples/exchange_client/accounts_rpc/3_SubaccountsList.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) account_address = "inj1clw20s2uxeyxtam6f7m84vgae92s9eh7vygagt" subacc_list = await client.get_subaccount_list(account_address) print(subacc_list) diff --git a/examples/exchange_client/accounts_rpc/4_SubaccountBalancesList.py b/examples/exchange_client/accounts_rpc/4_SubaccountBalancesList.py index 49320cfa..1bb746b5 100644 --- a/examples/exchange_client/accounts_rpc/4_SubaccountBalancesList.py +++ b/examples/exchange_client/accounts_rpc/4_SubaccountBalancesList.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) subaccount = "0xaf79152ac5df276d9a8e1e2e22822f9713474902000000000000000000000000" denoms = ["inj", "peggy0x87aB3B4C8661e07D6372361211B96ed4Dc36B1B5"] subacc_balances_list = await client.get_subaccount_balances_list( diff --git a/examples/exchange_client/accounts_rpc/5_SubaccountHistory.py b/examples/exchange_client/accounts_rpc/5_SubaccountHistory.py index 93e75d89..fa871b7f 100644 --- a/examples/exchange_client/accounts_rpc/5_SubaccountHistory.py +++ b/examples/exchange_client/accounts_rpc/5_SubaccountHistory.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) subaccount = "0xaf79152ac5df276d9a8e1e2e22822f9713474902000000000000000000000000" denom = "inj" transfer_types = ["withdraw", "deposit"] diff --git a/examples/exchange_client/accounts_rpc/6_SubaccountOrderSummary.py b/examples/exchange_client/accounts_rpc/6_SubaccountOrderSummary.py index eb49ee05..606e75a3 100644 --- a/examples/exchange_client/accounts_rpc/6_SubaccountOrderSummary.py +++ b/examples/exchange_client/accounts_rpc/6_SubaccountOrderSummary.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) subaccount = "0xaf79152ac5df276d9a8e1e2e22822f9713474902000000000000000000000000" order_direction = "buy" market_id = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6" diff --git a/examples/exchange_client/accounts_rpc/7_OrderStates.py b/examples/exchange_client/accounts_rpc/7_OrderStates.py index 75747360..1c4117e8 100644 --- a/examples/exchange_client/accounts_rpc/7_OrderStates.py +++ b/examples/exchange_client/accounts_rpc/7_OrderStates.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) spot_order_hashes = ["0xce0d9b701f77cd6ddfda5dd3a4fe7b2d53ba83e5d6c054fb2e9e886200b7b7bb", "0x2e2245b5431638d76c6e0cc6268970418a1b1b7df60a8e94b8cf37eae6105542"] derivative_order_hashes = ["0x82113f3998999bdc3892feaab2c4e53ba06c5fe887a2d5f9763397240f24da50", "0xbb1f036001378cecb5fff1cc69303919985b5bf058c32f37d5aaf9b804c07a06"] orders = await client.get_order_states(spot_order_hashes=spot_order_hashes, derivative_order_hashes=derivative_order_hashes) diff --git a/examples/exchange_client/accounts_rpc/8_Portfolio.py b/examples/exchange_client/accounts_rpc/8_Portfolio.py index 3f6fdd48..04e709bc 100644 --- a/examples/exchange_client/accounts_rpc/8_Portfolio.py +++ b/examples/exchange_client/accounts_rpc/8_Portfolio.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) account_address = "inj14au322k9munkmx5wrchz9q30juf5wjgz2cfqku" portfolio = await client.get_portfolio(account_address=account_address) print(portfolio) diff --git a/examples/exchange_client/accounts_rpc/9_Rewards.py b/examples/exchange_client/accounts_rpc/9_Rewards.py index a3139ab2..687f3a1a 100644 --- a/examples/exchange_client/accounts_rpc/9_Rewards.py +++ b/examples/exchange_client/accounts_rpc/9_Rewards.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) # account_address = "inj14au322k9munkmx5wrchz9q30juf5wjgz2cfqku" epoch = -1 rewards = await client.get_rewards( diff --git a/examples/exchange_client/auctions_rpc/1_Auction.py b/examples/exchange_client/auctions_rpc/1_Auction.py index ec6a80ad..02307e00 100644 --- a/examples/exchange_client/auctions_rpc/1_Auction.py +++ b/examples/exchange_client/auctions_rpc/1_Auction.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) bid_round = 31 auction = await client.get_auction(bid_round=bid_round) print(auction) diff --git a/examples/exchange_client/auctions_rpc/2_Auctions.py b/examples/exchange_client/auctions_rpc/2_Auctions.py index 0fa3b5b4..5f161f5d 100644 --- a/examples/exchange_client/auctions_rpc/2_Auctions.py +++ b/examples/exchange_client/auctions_rpc/2_Auctions.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) auctions = await client.get_auctions() print(auctions) diff --git a/examples/exchange_client/auctions_rpc/3_StreamBids.py b/examples/exchange_client/auctions_rpc/3_StreamBids.py index 5078f981..3119670d 100644 --- a/examples/exchange_client/auctions_rpc/3_StreamBids.py +++ b/examples/exchange_client/auctions_rpc/3_StreamBids.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) bids = await client.stream_bids() async for bid in bids: print(bid) diff --git a/examples/exchange_client/derivative_exchange_rpc/10_StreamHistoricalOrders.py b/examples/exchange_client/derivative_exchange_rpc/10_StreamHistoricalOrders.py index 22081c71..429862d1 100644 --- a/examples/exchange_client/derivative_exchange_rpc/10_StreamHistoricalOrders.py +++ b/examples/exchange_client/derivative_exchange_rpc/10_StreamHistoricalOrders.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6" order_side = "sell" subaccount_id = "0xc6fe5d33615a1c52c08018c47e8bc53646a0e101000000000000000000000000" diff --git a/examples/exchange_client/derivative_exchange_rpc/11_Trades.py b/examples/exchange_client/derivative_exchange_rpc/11_Trades.py index 665e4651..f822babb 100644 --- a/examples/exchange_client/derivative_exchange_rpc/11_Trades.py +++ b/examples/exchange_client/derivative_exchange_rpc/11_Trades.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6" subaccount_id = "0xc6fe5d33615a1c52c08018c47e8bc53646a0e101000000000000000000000000" trades = await client.get_derivative_trades( diff --git a/examples/exchange_client/derivative_exchange_rpc/12_StreamTrades.py b/examples/exchange_client/derivative_exchange_rpc/12_StreamTrades.py index c6b6c48d..03136700 100644 --- a/examples/exchange_client/derivative_exchange_rpc/12_StreamTrades.py +++ b/examples/exchange_client/derivative_exchange_rpc/12_StreamTrades.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_ids = [ "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6", "0xd5e4b12b19ecf176e4e14b42944731c27677819d2ed93be4104ad7025529c7ff" diff --git a/examples/exchange_client/derivative_exchange_rpc/13_SubaccountOrdersList.py b/examples/exchange_client/derivative_exchange_rpc/13_SubaccountOrdersList.py index d899ba2f..62609850 100644 --- a/examples/exchange_client/derivative_exchange_rpc/13_SubaccountOrdersList.py +++ b/examples/exchange_client/derivative_exchange_rpc/13_SubaccountOrdersList.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) subaccount_id = "0xaf79152ac5df276d9a8e1e2e22822f9713474902000000000000000000000000" market_id = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6" skip = 1 diff --git a/examples/exchange_client/derivative_exchange_rpc/14_SubaccountTradesList.py b/examples/exchange_client/derivative_exchange_rpc/14_SubaccountTradesList.py index adf2cee5..d6b0bf81 100644 --- a/examples/exchange_client/derivative_exchange_rpc/14_SubaccountTradesList.py +++ b/examples/exchange_client/derivative_exchange_rpc/14_SubaccountTradesList.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) subaccount_id = "0xaf79152ac5df276d9a8e1e2e22822f9713474902000000000000000000000000" market_id = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6" execution_type = "market" diff --git a/examples/exchange_client/derivative_exchange_rpc/15_FundingPayments.py b/examples/exchange_client/derivative_exchange_rpc/15_FundingPayments.py index 0f15c537..4ff983c5 100644 --- a/examples/exchange_client/derivative_exchange_rpc/15_FundingPayments.py +++ b/examples/exchange_client/derivative_exchange_rpc/15_FundingPayments.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6" subaccount_id = "0xc6fe5d33615a1c52c08018c47e8bc53646a0e101000000000000000000000000" skip=0 diff --git a/examples/exchange_client/derivative_exchange_rpc/17_FundingRates.py b/examples/exchange_client/derivative_exchange_rpc/17_FundingRates.py index 04122a7c..47a14794 100644 --- a/examples/exchange_client/derivative_exchange_rpc/17_FundingRates.py +++ b/examples/exchange_client/derivative_exchange_rpc/17_FundingRates.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6" skip=0 limit=3 diff --git a/examples/exchange_client/derivative_exchange_rpc/18_Orderbooks.py b/examples/exchange_client/derivative_exchange_rpc/18_Orderbooks.py index cc1c8aca..d3583aff 100644 --- a/examples/exchange_client/derivative_exchange_rpc/18_Orderbooks.py +++ b/examples/exchange_client/derivative_exchange_rpc/18_Orderbooks.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_ids = [ "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6", "0xd5e4b12b19ecf176e4e14b42944731c27677819d2ed93be4104ad7025529c7ff" diff --git a/examples/exchange_client/derivative_exchange_rpc/19_Binary_Options_Markets.py b/examples/exchange_client/derivative_exchange_rpc/19_Binary_Options_Markets.py index 1fef009f..233dce5f 100644 --- a/examples/exchange_client/derivative_exchange_rpc/19_Binary_Options_Markets.py +++ b/examples/exchange_client/derivative_exchange_rpc/19_Binary_Options_Markets.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_status = "active" quote_denom = "peggy0xdAC17F958D2ee523a2206206994597C13D831ec7" market = await client.get_binary_options_markets( diff --git a/examples/exchange_client/derivative_exchange_rpc/1_Market.py b/examples/exchange_client/derivative_exchange_rpc/1_Market.py index d2c6e80b..520f55c8 100644 --- a/examples/exchange_client/derivative_exchange_rpc/1_Market.py +++ b/examples/exchange_client/derivative_exchange_rpc/1_Market.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6" market = await client.get_derivative_market(market_id=market_id) print(market) diff --git a/examples/exchange_client/derivative_exchange_rpc/20_Binary_Options_Market.py b/examples/exchange_client/derivative_exchange_rpc/20_Binary_Options_Market.py index 0d1b9150..7cbf0924 100644 --- a/examples/exchange_client/derivative_exchange_rpc/20_Binary_Options_Market.py +++ b/examples/exchange_client/derivative_exchange_rpc/20_Binary_Options_Market.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x175513943b8677368d138e57bcd6bef53170a0da192e7eaa8c2cd4509b54f8db" market = await client.get_binary_options_market(market_id=market_id) print(market) diff --git a/examples/exchange_client/derivative_exchange_rpc/21_Historical_Orders.py b/examples/exchange_client/derivative_exchange_rpc/21_Historical_Orders.py index eed98d99..ea864397 100644 --- a/examples/exchange_client/derivative_exchange_rpc/21_Historical_Orders.py +++ b/examples/exchange_client/derivative_exchange_rpc/21_Historical_Orders.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6" subaccount_id = "0x295639d56c987f0e24d21bb167872b3542a6e05a000000000000000000000000" is_conditional = "false" diff --git a/examples/exchange_client/derivative_exchange_rpc/22_OrderbooksV2.py b/examples/exchange_client/derivative_exchange_rpc/22_OrderbooksV2.py index 8205a694..2a21d145 100644 --- a/examples/exchange_client/derivative_exchange_rpc/22_OrderbooksV2.py +++ b/examples/exchange_client/derivative_exchange_rpc/22_OrderbooksV2.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_ids = [ "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6", "0xd5e4b12b19ecf176e4e14b42944731c27677819d2ed93be4104ad7025529c7ff" diff --git a/examples/exchange_client/derivative_exchange_rpc/2_Markets.py b/examples/exchange_client/derivative_exchange_rpc/2_Markets.py index 9b7ec94f..275d372f 100644 --- a/examples/exchange_client/derivative_exchange_rpc/2_Markets.py +++ b/examples/exchange_client/derivative_exchange_rpc/2_Markets.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_status = "active" quote_denom = "peggy0x87aB3B4C8661e07D6372361211B96ed4Dc36B1B5" market = await client.get_derivative_markets( diff --git a/examples/exchange_client/derivative_exchange_rpc/3_StreamMarket.py b/examples/exchange_client/derivative_exchange_rpc/3_StreamMarket.py index b44fa804..d3b15a71 100644 --- a/examples/exchange_client/derivative_exchange_rpc/3_StreamMarket.py +++ b/examples/exchange_client/derivative_exchange_rpc/3_StreamMarket.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) markets = await client.stream_derivative_markets() async for market in markets: print(market) diff --git a/examples/exchange_client/derivative_exchange_rpc/4_Orderbook.py b/examples/exchange_client/derivative_exchange_rpc/4_Orderbook.py index 8d891a6c..9020a949 100644 --- a/examples/exchange_client/derivative_exchange_rpc/4_Orderbook.py +++ b/examples/exchange_client/derivative_exchange_rpc/4_Orderbook.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6" market = await client.get_derivative_orderbook(market_id=market_id) print(market) diff --git a/examples/exchange_client/derivative_exchange_rpc/5_StreamOrderbooks.py b/examples/exchange_client/derivative_exchange_rpc/5_StreamOrderbooks.py index 64304ec4..8a5a88f6 100644 --- a/examples/exchange_client/derivative_exchange_rpc/5_StreamOrderbooks.py +++ b/examples/exchange_client/derivative_exchange_rpc/5_StreamOrderbooks.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6" markets = await client.stream_derivative_orderbook_snapshot(market_ids=[market_id]) async for market in markets: diff --git a/examples/exchange_client/derivative_exchange_rpc/6_StreamOrderbookUpdate.py b/examples/exchange_client/derivative_exchange_rpc/6_StreamOrderbookUpdate.py index b5f48c5a..4dd446db 100644 --- a/examples/exchange_client/derivative_exchange_rpc/6_StreamOrderbookUpdate.py +++ b/examples/exchange_client/derivative_exchange_rpc/6_StreamOrderbookUpdate.py @@ -50,7 +50,7 @@ async def load_orderbook_snapshot(async_client: AsyncClient, orderbook: Orderboo async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - async_client = AsyncClient(network, insecure=False) + async_client = AsyncClient(network) market_id = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6" orderbook = Orderbook(market_id=market_id) diff --git a/examples/exchange_client/derivative_exchange_rpc/7_Positions.py b/examples/exchange_client/derivative_exchange_rpc/7_Positions.py index 36e871cb..50500c14 100644 --- a/examples/exchange_client/derivative_exchange_rpc/7_Positions.py +++ b/examples/exchange_client/derivative_exchange_rpc/7_Positions.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_ids = [ "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6", "0xd97d0da6f6c11710ef06315971250e4e9aed4b7d4cd02059c9477ec8cf243782" diff --git a/examples/exchange_client/derivative_exchange_rpc/9_StreamPositions.py b/examples/exchange_client/derivative_exchange_rpc/9_StreamPositions.py index 32586681..425363ff 100644 --- a/examples/exchange_client/derivative_exchange_rpc/9_StreamPositions.py +++ b/examples/exchange_client/derivative_exchange_rpc/9_StreamPositions.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x17ef48032cb24375ba7c2e39f384e56433bcab20cbee9a7357e4cba2eb00abe6" subaccount_id = "0xea98e3aa091a6676194df40ac089e40ab4604bf9000000000000000000000000" positions = await client.stream_derivative_positions( diff --git a/examples/exchange_client/explorer_rpc/10_GetIBCTransfers.py b/examples/exchange_client/explorer_rpc/10_GetIBCTransfers.py index 945d5313..68daf8d9 100644 --- a/examples/exchange_client/explorer_rpc/10_GetIBCTransfers.py +++ b/examples/exchange_client/explorer_rpc/10_GetIBCTransfers.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) sender = "inj1cll5cv3ezgal30gagkhnq2um6zf6qrmhw4r6c8" receiver = "cosmos1usr9g5a4s2qrwl63sdjtrs2qd4a7huh622pg82" src_channel = "channel-2" diff --git a/examples/exchange_client/explorer_rpc/1_GetTxByHash.py b/examples/exchange_client/explorer_rpc/1_GetTxByHash.py index ad1be37f..7fd480f8 100644 --- a/examples/exchange_client/explorer_rpc/1_GetTxByHash.py +++ b/examples/exchange_client/explorer_rpc/1_GetTxByHash.py @@ -9,7 +9,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = Composer(network=network.string()) tx_hash = "0F3EBEC1882E1EEAC5B7BDD836E976250F1CD072B79485877CEACCB92ACDDF52" transaction_response = await client.get_tx_by_hash(tx_hash=tx_hash) diff --git a/examples/exchange_client/explorer_rpc/2_AccountTxs.py b/examples/exchange_client/explorer_rpc/2_AccountTxs.py index f0f7cca0..2fc3958b 100644 --- a/examples/exchange_client/explorer_rpc/2_AccountTxs.py +++ b/examples/exchange_client/explorer_rpc/2_AccountTxs.py @@ -9,7 +9,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) composer = Composer(network=network.string()) address = "inj1phd706jqzd9wznkk5hgsfkrc8jqxv0kmlj0kex" message_type = "cosmos.bank.v1beta1.MsgSend" diff --git a/examples/exchange_client/explorer_rpc/3_Blocks.py b/examples/exchange_client/explorer_rpc/3_Blocks.py index 0035c51d..23d30dba 100644 --- a/examples/exchange_client/explorer_rpc/3_Blocks.py +++ b/examples/exchange_client/explorer_rpc/3_Blocks.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) limit = 2 block = await client.get_blocks(limit=limit) print(block) diff --git a/examples/exchange_client/explorer_rpc/4_Block.py b/examples/exchange_client/explorer_rpc/4_Block.py index 6ac9982f..92b17b12 100644 --- a/examples/exchange_client/explorer_rpc/4_Block.py +++ b/examples/exchange_client/explorer_rpc/4_Block.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) block_height = "5825046" block = await client.get_block(block_height=block_height) print(block) diff --git a/examples/exchange_client/explorer_rpc/5_TxsRequest.py b/examples/exchange_client/explorer_rpc/5_TxsRequest.py index e01a7066..434b0779 100644 --- a/examples/exchange_client/explorer_rpc/5_TxsRequest.py +++ b/examples/exchange_client/explorer_rpc/5_TxsRequest.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) limit = 2 txs = await client.get_txs(limit=limit) print(txs) diff --git a/examples/exchange_client/explorer_rpc/6_StreamTxs.py b/examples/exchange_client/explorer_rpc/6_StreamTxs.py index 52cde6d3..6c173091 100644 --- a/examples/exchange_client/explorer_rpc/6_StreamTxs.py +++ b/examples/exchange_client/explorer_rpc/6_StreamTxs.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) stream_txs = await client.stream_txs( ) async for tx in stream_txs: diff --git a/examples/exchange_client/explorer_rpc/7_StreamBlocks.py b/examples/exchange_client/explorer_rpc/7_StreamBlocks.py index a460ee14..96b83935 100644 --- a/examples/exchange_client/explorer_rpc/7_StreamBlocks.py +++ b/examples/exchange_client/explorer_rpc/7_StreamBlocks.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) stream_blocks = await client.stream_blocks( ) async for block in stream_blocks: diff --git a/examples/exchange_client/explorer_rpc/8_GetPeggyDeposits.py b/examples/exchange_client/explorer_rpc/8_GetPeggyDeposits.py index 32a8f01a..97a8ab10 100644 --- a/examples/exchange_client/explorer_rpc/8_GetPeggyDeposits.py +++ b/examples/exchange_client/explorer_rpc/8_GetPeggyDeposits.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) receiver = "inj1phd706jqzd9wznkk5hgsfkrc8jqxv0kmlj0kex" peggy_deposits = await client.get_peggy_deposits(receiver=receiver) print(peggy_deposits) diff --git a/examples/exchange_client/explorer_rpc/9_GetPeggyWithdrawals.py b/examples/exchange_client/explorer_rpc/9_GetPeggyWithdrawals.py index 889b46df..12264475 100644 --- a/examples/exchange_client/explorer_rpc/9_GetPeggyWithdrawals.py +++ b/examples/exchange_client/explorer_rpc/9_GetPeggyWithdrawals.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) sender = "inj14au322k9munkmx5wrchz9q30juf5wjgz2cfqku" limit = 2 peggy_deposits = await client.get_peggy_withdrawals( diff --git a/examples/exchange_client/insurance_rpc/1_InsuranceFunds.py b/examples/exchange_client/insurance_rpc/1_InsuranceFunds.py index 6e0885d1..487e64df 100644 --- a/examples/exchange_client/insurance_rpc/1_InsuranceFunds.py +++ b/examples/exchange_client/insurance_rpc/1_InsuranceFunds.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) insurance_funds = await client.get_insurance_funds() print(insurance_funds) diff --git a/examples/exchange_client/insurance_rpc/2_Redemptions.py b/examples/exchange_client/insurance_rpc/2_Redemptions.py index 66e94ad9..8db3238b 100644 --- a/examples/exchange_client/insurance_rpc/2_Redemptions.py +++ b/examples/exchange_client/insurance_rpc/2_Redemptions.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) redeemer = "inj14au322k9munkmx5wrchz9q30juf5wjgz2cfqku" redemption_denom = "share4" status = "disbursed" diff --git a/examples/exchange_client/meta_rpc/1_Ping.py b/examples/exchange_client/meta_rpc/1_Ping.py index ce7bd3e3..dc505a7a 100644 --- a/examples/exchange_client/meta_rpc/1_Ping.py +++ b/examples/exchange_client/meta_rpc/1_Ping.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) resp = await client.ping() print('Health OK?', resp) diff --git a/examples/exchange_client/meta_rpc/2_Version.py b/examples/exchange_client/meta_rpc/2_Version.py index 1cd63d81..48cb0b4c 100644 --- a/examples/exchange_client/meta_rpc/2_Version.py +++ b/examples/exchange_client/meta_rpc/2_Version.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) resp = await client.version() print('Version:', resp) diff --git a/examples/exchange_client/meta_rpc/3_Info.py b/examples/exchange_client/meta_rpc/3_Info.py index bd925f20..9c3c2693 100644 --- a/examples/exchange_client/meta_rpc/3_Info.py +++ b/examples/exchange_client/meta_rpc/3_Info.py @@ -9,7 +9,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) resp = await client.info() print('[!] Info:') print(resp) diff --git a/examples/exchange_client/meta_rpc/4_StreamKeepAlive.py b/examples/exchange_client/meta_rpc/4_StreamKeepAlive.py index 53092a05..5d3c531b 100644 --- a/examples/exchange_client/meta_rpc/4_StreamKeepAlive.py +++ b/examples/exchange_client/meta_rpc/4_StreamKeepAlive.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) task1 = asyncio.create_task(get_markets(client)) task2 = asyncio.create_task(keepalive(client, [task1])) diff --git a/examples/exchange_client/oracle_rpc/1_StreamPrices.py b/examples/exchange_client/oracle_rpc/1_StreamPrices.py index 3707aa72..788f02f2 100644 --- a/examples/exchange_client/oracle_rpc/1_StreamPrices.py +++ b/examples/exchange_client/oracle_rpc/1_StreamPrices.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) base_symbol = 'BTC' quote_symbol = 'USDT' oracle_type = 'bandibc' diff --git a/examples/exchange_client/oracle_rpc/2_Price.py b/examples/exchange_client/oracle_rpc/2_Price.py index cf92aa1e..094d82d7 100644 --- a/examples/exchange_client/oracle_rpc/2_Price.py +++ b/examples/exchange_client/oracle_rpc/2_Price.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) base_symbol = 'BTC' quote_symbol = 'USDT' oracle_type = 'bandibc' diff --git a/examples/exchange_client/oracle_rpc/3_OracleList.py b/examples/exchange_client/oracle_rpc/3_OracleList.py index 2ff2152c..94cbd70b 100644 --- a/examples/exchange_client/oracle_rpc/3_OracleList.py +++ b/examples/exchange_client/oracle_rpc/3_OracleList.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) oracle_list = await client.get_oracle_list() print(oracle_list) diff --git a/examples/exchange_client/portfolio_rpc/1_AccountPortfolio.py b/examples/exchange_client/portfolio_rpc/1_AccountPortfolio.py index 83b46d57..707f602a 100644 --- a/examples/exchange_client/portfolio_rpc/1_AccountPortfolio.py +++ b/examples/exchange_client/portfolio_rpc/1_AccountPortfolio.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) account_address = "inj1clw20s2uxeyxtam6f7m84vgae92s9eh7vygagt" portfolio = await client.get_account_portfolio( account_address=account_address diff --git a/examples/exchange_client/portfolio_rpc/2_StreamAccountPortfolio.py b/examples/exchange_client/portfolio_rpc/2_StreamAccountPortfolio.py index bc587bb9..33c064f8 100644 --- a/examples/exchange_client/portfolio_rpc/2_StreamAccountPortfolio.py +++ b/examples/exchange_client/portfolio_rpc/2_StreamAccountPortfolio.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) account_address = "inj1clw20s2uxeyxtam6f7m84vgae92s9eh7vygagt" updates = await client.stream_account_portfolio(account_address=account_address) async for update in updates: diff --git a/examples/exchange_client/spot_exchange_rpc/10_StreamTrades.py b/examples/exchange_client/spot_exchange_rpc/10_StreamTrades.py index d906378c..8f488d9b 100644 --- a/examples/exchange_client/spot_exchange_rpc/10_StreamTrades.py +++ b/examples/exchange_client/spot_exchange_rpc/10_StreamTrades.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_ids = [ "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe", "0x7a57e705bb4e09c88aecfc295569481dbf2fe1d5efe364651fbe72385938e9b0" diff --git a/examples/exchange_client/spot_exchange_rpc/11_SubaccountOrdersList.py b/examples/exchange_client/spot_exchange_rpc/11_SubaccountOrdersList.py index a7ab90ef..40a198db 100644 --- a/examples/exchange_client/spot_exchange_rpc/11_SubaccountOrdersList.py +++ b/examples/exchange_client/spot_exchange_rpc/11_SubaccountOrdersList.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) subaccount_id = "0xc7dca7c15c364865f77a4fb67ab11dc95502e6fe000000000000000000000001" market_id = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe" skip = 10 diff --git a/examples/exchange_client/spot_exchange_rpc/12_SubaccountTradesList.py b/examples/exchange_client/spot_exchange_rpc/12_SubaccountTradesList.py index 090b1fc3..9c6fbd5b 100644 --- a/examples/exchange_client/spot_exchange_rpc/12_SubaccountTradesList.py +++ b/examples/exchange_client/spot_exchange_rpc/12_SubaccountTradesList.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) subaccount_id = "0xaf79152ac5df276d9a8e1e2e22822f9713474902000000000000000000000000" market_id = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe" execution_type = "market" diff --git a/examples/exchange_client/spot_exchange_rpc/13_StreamOrderbooks.py b/examples/exchange_client/spot_exchange_rpc/13_StreamOrderbooks.py index 7171595b..5592878b 100644 --- a/examples/exchange_client/spot_exchange_rpc/13_StreamOrderbooks.py +++ b/examples/exchange_client/spot_exchange_rpc/13_StreamOrderbooks.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_ids = [ "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe", "0x7a57e705bb4e09c88aecfc295569481dbf2fe1d5efe364651fbe72385938e9b0" diff --git a/examples/exchange_client/spot_exchange_rpc/14_Orderbooks.py b/examples/exchange_client/spot_exchange_rpc/14_Orderbooks.py index b8b0840f..82f59a69 100644 --- a/examples/exchange_client/spot_exchange_rpc/14_Orderbooks.py +++ b/examples/exchange_client/spot_exchange_rpc/14_Orderbooks.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_ids = [ "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe", "0x7a57e705bb4e09c88aecfc295569481dbf2fe1d5efe364651fbe72385938e9b0" diff --git a/examples/exchange_client/spot_exchange_rpc/15_HistoricalOrders.py b/examples/exchange_client/spot_exchange_rpc/15_HistoricalOrders.py index d116a8a7..a2ff4cec 100644 --- a/examples/exchange_client/spot_exchange_rpc/15_HistoricalOrders.py +++ b/examples/exchange_client/spot_exchange_rpc/15_HistoricalOrders.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe" subaccount_id = "0xbdaedec95d563fb05240d6e01821008454c24c36000000000000000000000000" skip = 10 diff --git a/examples/exchange_client/spot_exchange_rpc/1_Market.py b/examples/exchange_client/spot_exchange_rpc/1_Market.py index e1c99b6e..e96f8d57 100644 --- a/examples/exchange_client/spot_exchange_rpc/1_Market.py +++ b/examples/exchange_client/spot_exchange_rpc/1_Market.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe" market = await client.get_spot_market(market_id=market_id) print(market) diff --git a/examples/exchange_client/spot_exchange_rpc/2_Markets.py b/examples/exchange_client/spot_exchange_rpc/2_Markets.py index ff7e3211..36f90f86 100644 --- a/examples/exchange_client/spot_exchange_rpc/2_Markets.py +++ b/examples/exchange_client/spot_exchange_rpc/2_Markets.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_status = "active" base_denom = "inj" quote_denom = "peggy0x87aB3B4C8661e07D6372361211B96ed4Dc36B1B5" diff --git a/examples/exchange_client/spot_exchange_rpc/3_StreamMarkets.py b/examples/exchange_client/spot_exchange_rpc/3_StreamMarkets.py index d697eeea..d5e37a55 100644 --- a/examples/exchange_client/spot_exchange_rpc/3_StreamMarkets.py +++ b/examples/exchange_client/spot_exchange_rpc/3_StreamMarkets.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) markets = await client.stream_spot_markets() async for market in markets: print(market) diff --git a/examples/exchange_client/spot_exchange_rpc/4_Orderbook.py b/examples/exchange_client/spot_exchange_rpc/4_Orderbook.py index b1a107e2..60822926 100644 --- a/examples/exchange_client/spot_exchange_rpc/4_Orderbook.py +++ b/examples/exchange_client/spot_exchange_rpc/4_Orderbook.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe" orderbook = await client.get_spot_orderbookV2(market_id=market_id) print(orderbook) diff --git a/examples/exchange_client/spot_exchange_rpc/6_Trades.py b/examples/exchange_client/spot_exchange_rpc/6_Trades.py index aab46ba2..4745296f 100644 --- a/examples/exchange_client/spot_exchange_rpc/6_Trades.py +++ b/examples/exchange_client/spot_exchange_rpc/6_Trades.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_ids = ["0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"] execution_side = "taker" direction = "buy" diff --git a/examples/exchange_client/spot_exchange_rpc/7_StreamOrderbookSnapshot.py b/examples/exchange_client/spot_exchange_rpc/7_StreamOrderbookSnapshot.py index 9094d4ba..e46a8ca8 100644 --- a/examples/exchange_client/spot_exchange_rpc/7_StreamOrderbookSnapshot.py +++ b/examples/exchange_client/spot_exchange_rpc/7_StreamOrderbookSnapshot.py @@ -8,7 +8,7 @@ async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_ids = ["0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe"] orderbooks = await client.stream_spot_orderbook_snapshot(market_ids=market_ids) async for orderbook in orderbooks: diff --git a/examples/exchange_client/spot_exchange_rpc/8_StreamOrderbookUpdate.py b/examples/exchange_client/spot_exchange_rpc/8_StreamOrderbookUpdate.py index ea0a0a95..bd5fc5fc 100644 --- a/examples/exchange_client/spot_exchange_rpc/8_StreamOrderbookUpdate.py +++ b/examples/exchange_client/spot_exchange_rpc/8_StreamOrderbookUpdate.py @@ -50,7 +50,7 @@ async def load_orderbook_snapshot(async_client: AsyncClient, orderbook: Orderboo async def main() -> None: # select network: local, testnet, mainnet network = Network.testnet() - async_client = AsyncClient(network, insecure=False) + async_client = AsyncClient(network) market_id = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe" orderbook = Orderbook(market_id=market_id) diff --git a/examples/exchange_client/spot_exchange_rpc/9_StreamHistoricalOrders.py b/examples/exchange_client/spot_exchange_rpc/9_StreamHistoricalOrders.py index 48453eed..96d0898c 100644 --- a/examples/exchange_client/spot_exchange_rpc/9_StreamHistoricalOrders.py +++ b/examples/exchange_client/spot_exchange_rpc/9_StreamHistoricalOrders.py @@ -7,7 +7,7 @@ async def main() -> None: network = Network.testnet() - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) market_id = "0x0611780ba69656949525013d947713300f56c37b6175e02f26bffa495c3208fe" order_side = "buy" subaccount_id = "0xc6fe5d33615a1c52c08018c47e8bc53646a0e101000000000000000000000000" diff --git a/pyinjective/async_client.py b/pyinjective/async_client.py index f1ecb8f6..3374f6c1 100644 --- a/pyinjective/async_client.py +++ b/pyinjective/async_client.py @@ -78,6 +78,7 @@ def __init__( insecure: bool = False, credentials=grpc.ssl_channel_credentials(), ): + # the `insecure` parameter is ignored and will be deprecated soon. The value is taken directly from `network` self.addr = "" self.number = 0 @@ -87,11 +88,11 @@ def __init__( # chain stubs self.chain_channel = ( - grpc.aio.insecure_channel(network.grpc_endpoint) - if (insecure or credentials is None) - else grpc.aio.secure_channel(network.grpc_endpoint, credentials) + grpc.aio.secure_channel(network.grpc_endpoint, credentials) + if (network.use_secure_connection and credentials is not None) + else grpc.aio.insecure_channel(network.grpc_endpoint) ) - self.insecure = insecure + self.stubCosmosTendermint = tendermint_query_grpc.ServiceStub( self.chain_channel ) @@ -105,9 +106,9 @@ def __init__( # exchange stubs self.exchange_channel = ( - grpc.aio.insecure_channel(network.grpc_exchange_endpoint) - if (insecure or credentials is None) - else grpc.aio.secure_channel(network.grpc_exchange_endpoint, credentials) + grpc.aio.secure_channel(network.grpc_exchange_endpoint, credentials) + if (network.use_secure_connection and credentials is not None) + else grpc.aio.insecure_channel(network.grpc_exchange_endpoint) ) self.stubMeta = exchange_meta_rpc_grpc.InjectiveMetaRPCStub( self.exchange_channel @@ -136,9 +137,9 @@ def __init__( # explorer stubs self.explorer_channel = ( - grpc.aio.insecure_channel(network.grpc_explorer_endpoint) - if (insecure or credentials is None) - else grpc.aio.secure_channel(network.grpc_explorer_endpoint, credentials) + grpc.aio.secure_channel(network.grpc_explorer_endpoint, credentials) + if (network.use_secure_connection and credentials is not None) + else grpc.aio.insecure_channel(network.grpc_explorer_endpoint) ) self.stubExplorer = explorer_rpc_grpc.InjectiveExplorerRPCStub( self.explorer_channel diff --git a/pyinjective/core/broadcaster.py b/pyinjective/core/broadcaster.py index 68a5baf1..7fb54278 100644 --- a/pyinjective/core/broadcaster.py +++ b/pyinjective/core/broadcaster.py @@ -67,11 +67,10 @@ def new_using_simulation( cls, network: Network, private_key: str, - use_secure_connection: bool = True, client: Optional[AsyncClient] = None, composer: Optional[Composer] = None, ): - client = client or AsyncClient(network=network, insecure=not(use_secure_connection)) + client = client or AsyncClient(network=network) composer = composer or Composer(network=client.network.string()) account_config = StandardAccountBroadcasterConfig(private_key=private_key) fee_calculator = SimulatedTransactionFeeCalculator( @@ -92,11 +91,10 @@ def new_without_simulation( cls, network: Network, private_key: str, - use_secure_connection: bool = True, client: Optional[AsyncClient] = None, composer: Optional[Composer] = None, ): - client = client or AsyncClient(network=network, insecure=not (use_secure_connection)) + client = client or AsyncClient(network=network) composer = composer or Composer(network=client.network.string()) account_config = StandardAccountBroadcasterConfig(private_key=private_key) fee_calculator = MessageBasedTransactionFeeCalculator( @@ -117,11 +115,10 @@ def new_for_grantee_account_using_simulation( cls, network: Network, grantee_private_key: str, - use_secure_connection: bool = True, client: Optional[AsyncClient] = None, composer: Optional[Composer] = None, ): - client = client or AsyncClient(network=network, insecure=not (use_secure_connection)) + client = client or AsyncClient(network=network) composer = composer or Composer(network=client.network.string()) account_config = GranteeAccountBroadcasterConfig(grantee_private_key=grantee_private_key, composer=composer) fee_calculator = SimulatedTransactionFeeCalculator( @@ -142,11 +139,10 @@ def new_for_grantee_account_without_simulation( cls, network: Network, grantee_private_key: str, - use_secure_connection: bool = True, client: Optional[AsyncClient] = None, composer: Optional[Composer] = None, ): - client = client or AsyncClient(network=network, insecure=not (use_secure_connection)) + client = client or AsyncClient(network=network) composer = composer or Composer(network=client.network.string()) account_config = GranteeAccountBroadcasterConfig(grantee_private_key=grantee_private_key, composer=composer) fee_calculator = MessageBasedTransactionFeeCalculator( diff --git a/pyinjective/core/network.py b/pyinjective/core/network.py index ea638920..420d0152 100644 --- a/pyinjective/core/network.py +++ b/pyinjective/core/network.py @@ -150,71 +150,6 @@ def _is_cookie_expired(self, cookie_data: str) -> bool: return False -class TestnetLegacyCookieAssistant(CookieAssistant): - - def __init__(self): - self._chain_cookie: Optional[str] = None - self._exchange_cookie: Optional[str] = None - self._chain_cookie_initialization_lock = asyncio.Lock() - self._exchange_cookie_initialization_lock = asyncio.Lock() - - async def chain_cookie(self, metadata_query_provider: Callable) -> str: - if self._chain_cookie == None: - async with self._chain_cookie_initialization_lock: - if self._chain_cookie == None: - await self._fetch_chain_cookie(metadata_query_provider=metadata_query_provider) - cookie = self._chain_cookie - self._check_chain_cookie_expiration() - - return cookie - - async def exchange_cookie(self, metadata_query_provider: Callable) -> str: - if self._exchange_cookie == None: - async with self._exchange_cookie_initialization_lock: - if self._exchange_cookie == None: - await self._fetch_exchange_cookie(metadata_query_provider=metadata_query_provider) - cookie = self._exchange_cookie - self._check_exchange_cookie_expiration() - - return cookie - - async def _fetch_chain_cookie(self, metadata_query_provider: Callable): - metadata = await metadata_query_provider() - cookie_info = next((value for key, value in metadata if key == "set-cookie"), None) - - if cookie_info is None: - raise RuntimeError(f"Error fetching chain cookie ({metadata})") - - self._chain_cookie = cookie_info - - async def _fetch_exchange_cookie(self, metadata_query_provider: Callable): - metadata = await metadata_query_provider() - cookie_info = next((value for key, value in metadata if key == "set-cookie"), None) - - if cookie_info is None: - raise RuntimeError(f"Error fetching exchange cookie ({metadata})") - - self._exchange_cookie = cookie_info - - def _check_chain_cookie_expiration(self): - if self._is_cookie_expired(cookie_data=self._chain_cookie): - self._chain_cookie = None - - def _check_exchange_cookie_expiration(self): - if self._is_cookie_expired(cookie_data=self._exchange_cookie): - self._exchange_cookie = None - - def _is_cookie_expired(self, cookie_data: str) -> bool: - cookie = SimpleCookie() - cookie.load(cookie_data) - - expiration_time = datetime.datetime.strptime(cookie["grpc-cookie"]["expires"], - "%a, %d-%b-%y %H:%M:%S %Z").timestamp() - - timestamp_diff = expiration_time - time.time() - return timestamp_diff < self.SESSION_RENEWAL_OFFSET - - class DisabledCookieAssistant(CookieAssistant): async def chain_cookie(self, metadata_query_provider: Callable) -> str: pass @@ -241,6 +176,7 @@ def __init__( fee_denom: str, env: str, cookie_assistant: CookieAssistant, + use_secure_connection: bool = False, ): self.lcd_endpoint = lcd_endpoint self.tm_websocket_endpoint = tm_websocket_endpoint @@ -251,6 +187,7 @@ def __init__( self.fee_denom = fee_denom self.env = env self.cookie_assistant = cookie_assistant + self.use_secure_connection = use_secure_connection @classmethod def devnet(cls): @@ -282,13 +219,15 @@ def testnet(cls, node="lb"): grpc_exchange_endpoint = "testnet.sentry.exchange.grpc.injective.network:443" grpc_explorer_endpoint = "testnet.sentry.explorer.grpc.injective.network:443" cookie_assistant = BareMetalLoadBalancedCookieAssistant() + use_secure_connection = True else: lcd_endpoint = "https://testnet.lcd.injective.network" tm_websocket_endpoint = "wss://testnet.tm.injective.network/websocket" grpc_endpoint = "testnet.chain.grpc.injective.network" grpc_exchange_endpoint = "testnet.exchange.grpc.injective.network" grpc_explorer_endpoint = "testnet.explorer.grpc.injective.network" - cookie_assistant = TestnetLegacyCookieAssistant() + cookie_assistant = DisabledCookieAssistant() + use_secure_connection = True return cls( lcd_endpoint=lcd_endpoint, @@ -299,14 +238,15 @@ def testnet(cls, node="lb"): chain_id="injective-888", fee_denom="inj", env="testnet", - cookie_assistant=cookie_assistant + cookie_assistant=cookie_assistant, + use_secure_connection=use_secure_connection ) @classmethod def mainnet(cls, node="lb"): nodes = [ "lb", # us, asia, prod - "lb_bare_metal", + "lb_k8s", "sentry0", # ca, prod "sentry1", # ca, prod "sentry3", # us, prod @@ -315,19 +255,21 @@ def mainnet(cls, node="lb"): raise ValueError("Must be one of {}".format(nodes)) if 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" - grpc_explorer_endpoint = "k8s.global.mainnet.explorer.grpc.injective.network:443" - cookie_assistant = KubernetesLoadBalancedCookieAssistant() - elif node == "lb_bare_metal": lcd_endpoint = "https://sentry.lcd.injective.network:443" tm_websocket_endpoint = "wss://sentry.tm.injective.network:443/websocket" grpc_endpoint = "sentry.chain.grpc.injective.network:443" grpc_exchange_endpoint = "sentry.exchange.grpc.injective.network:443" grpc_explorer_endpoint = "sentry.explorer.grpc.injective.network:443" cookie_assistant = BareMetalLoadBalancedCookieAssistant() + use_secure_connection = True + elif node == "lb_k8s": + 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" + grpc_explorer_endpoint = "k8s.global.mainnet.explorer.grpc.injective.network:443" + cookie_assistant = KubernetesLoadBalancedCookieAssistant() + use_secure_connection = True else: lcd_endpoint = f"http://{node}.injective.network:10337" tm_websocket_endpoint = f"ws://{node}.injective.network:26657/websocket" @@ -335,6 +277,7 @@ def mainnet(cls, node="lb"): grpc_exchange_endpoint = f"{node}.injective.network:9910" grpc_explorer_endpoint = f"{node}.injective.network:9911" cookie_assistant = DisabledCookieAssistant() + use_secure_connection = False return cls( lcd_endpoint=lcd_endpoint, @@ -346,6 +289,7 @@ def mainnet(cls, node="lb"): fee_denom="inj", env="mainnet", cookie_assistant=cookie_assistant, + use_secure_connection=use_secure_connection, ) @classmethod @@ -360,6 +304,7 @@ def local(cls): fee_denom="inj", env="local", cookie_assistant=DisabledCookieAssistant(), + use_secure_connection=False, ) @classmethod @@ -373,6 +318,7 @@ def custom( chain_id, env, cookie_assistant: Optional[CookieAssistant] = None, + use_secure_connection: bool = False, ): assistant = cookie_assistant or DisabledCookieAssistant() return cls( @@ -384,7 +330,8 @@ def custom( chain_id=chain_id, fee_denom="inj", env=env, - cookie_assistant=assistant + cookie_assistant=assistant, + use_secure_connection=use_secure_connection ) def string(self): diff --git a/pyinjective/utils/fetch_metadata.py b/pyinjective/utils/fetch_metadata.py index ef81cef0..68269b74 100644 --- a/pyinjective/utils/fetch_metadata.py +++ b/pyinjective/utils/fetch_metadata.py @@ -28,7 +28,7 @@ async def fetch_denom(network) -> str: symbols = {} # fetch meta data for spot markets - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) status = 'active' mresp = await client.get_spot_markets(market_status=status) for market in mresp.markets: @@ -55,7 +55,7 @@ async def fetch_denom(network) -> str: denom_output += config # fetch meta data for derivative markets - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) status = 'active' mresp = await client.get_derivative_markets(market_status=status) for market in mresp.markets: diff --git a/pyinjective/utils/metadata_validation.py b/pyinjective/utils/metadata_validation.py index 3ef03209..366aa0aa 100644 --- a/pyinjective/utils/metadata_validation.py +++ b/pyinjective/utils/metadata_validation.py @@ -4,12 +4,12 @@ import pyinjective.constant as constant from pyinjective.async_client import AsyncClient -from pyinjective.constant import Network +from pyinjective.core.network import Network from pyinjective.core.market import SpotMarket, DerivativeMarket, BinaryOptionMarket def find_metadata_inconsistencies(network: Network) -> Tuple[List[Any]]: - client = AsyncClient(network, insecure=False) + client = AsyncClient(network) ini_config = constant.CONFIGS[network.string()] spot_markets = asyncio.get_event_loop().run_until_complete(client.all_spot_markets()) diff --git a/setup.py b/setup.py index 69b8a244..ec5c78ae 100755 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ EMAIL = "achilleas@injectivelabs.com" AUTHOR = "Injective Labs" REQUIRES_PYTHON = ">=3.9" -VERSION = "0.8" +VERSION = "0.8.1" REQUIRED = [ "aiohttp", diff --git a/tests/core/test_message_based_transaction_fee_calculator.py b/tests/core/test_message_based_transaction_fee_calculator.py index 7525fe00..2c3c4441 100644 --- a/tests/core/test_message_based_transaction_fee_calculator.py +++ b/tests/core/test_message_based_transaction_fee_calculator.py @@ -18,7 +18,7 @@ class TestMessageBasedTransactionFeeCalculator: @pytest.mark.asyncio async def test_gas_fee_for_privileged_execute_contract_message(self): network = Network.testnet(node="sentry") - client = AsyncClient(network=network, insecure=False) + client = AsyncClient(network=network) composer = Composer(network=network.string()) calculator = MessageBasedTransactionFeeCalculator( client=client, @@ -40,7 +40,7 @@ async def test_gas_fee_for_privileged_execute_contract_message(self): @pytest.mark.asyncio async def test_gas_fee_for_execute_contract_message(self): network = Network.testnet(node="sentry") - client = AsyncClient(network=network, insecure=False) + client = AsyncClient(network=network) composer = Composer(network=network.string()) calculator = MessageBasedTransactionFeeCalculator( client=client, @@ -66,7 +66,7 @@ async def test_gas_fee_for_execute_contract_message(self): @pytest.mark.asyncio async def test_gas_fee_for_wasm_message(self): network = Network.testnet(node="sentry") - client = AsyncClient(network=network, insecure=False) + client = AsyncClient(network=network) composer = Composer(network=network.string()) calculator = MessageBasedTransactionFeeCalculator( client=client, @@ -88,7 +88,7 @@ async def test_gas_fee_for_wasm_message(self): @pytest.mark.asyncio async def test_gas_fee_for_governance_message(self): network = Network.testnet(node="sentry") - client = AsyncClient(network=network, insecure=False) + client = AsyncClient(network=network) composer = Composer(network=network.string()) calculator = MessageBasedTransactionFeeCalculator( client=client, @@ -110,7 +110,7 @@ async def test_gas_fee_for_governance_message(self): @pytest.mark.asyncio async def test_gas_fee_for_exchange_message(self): network = Network.testnet(node="sentry") - client = AsyncClient(network=network, insecure=False) + client = AsyncClient(network=network) composer = Composer(network=network.string()) calculator = MessageBasedTransactionFeeCalculator( client=client, @@ -141,7 +141,7 @@ async def test_gas_fee_for_exchange_message(self): @pytest.mark.asyncio async def test_gas_fee_for_msg_exec_message(self): network = Network.testnet(node="sentry") - client = AsyncClient(network=network, insecure=False) + client = AsyncClient(network=network) composer = Composer(network=network.string()) calculator = MessageBasedTransactionFeeCalculator( client=client, @@ -180,7 +180,7 @@ async def test_gas_fee_for_msg_exec_message(self): @pytest.mark.asyncio async def test_gas_fee_for_two_messages_in_one_transaction(self): network = Network.testnet(node="sentry") - client = AsyncClient(network=network, insecure=False) + client = AsyncClient(network=network) composer = Composer(network=network.string()) calculator = MessageBasedTransactionFeeCalculator( client=client,