From 1d0bac4805a6a34abbc29a84c02785ec1f502309 Mon Sep 17 00:00:00 2001 From: Will Liu Date: Thu, 12 Oct 2023 14:59:37 -0700 Subject: [PATCH] update --- .../v4_client_py/chain/aerial/client/utils.py | 8 +++++--- .../v4_client_py/chain/aerial/config.py | 17 ++++++++++++++++- v4-client-py/v4_client_py/clients/constants.py | 3 --- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/v4-client-py/v4_client_py/chain/aerial/client/utils.py b/v4-client-py/v4_client_py/chain/aerial/client/utils.py index cffb8f7f..e711b6a7 100644 --- a/v4-client-py/v4_client_py/chain/aerial/client/utils.py +++ b/v4-client-py/v4_client_py/chain/aerial/client/utils.py @@ -3,7 +3,7 @@ from datetime import timedelta from typing import Any, Callable, List, Optional, Union -from v4_client_py.clients.constants import BroadcastMode, DEFAULT_TOKEN +from v4_client_py.clients.constants import BroadcastMode from v4_proto.cosmos.base.query.v1beta1.pagination_pb2 import PageRequest @@ -18,7 +18,7 @@ def prepare_and_broadcast_basic_transaction( gas_limit: Optional[int] = None, memo: Optional[str] = None, broadcast_mode: BroadcastMode = None, - fee: Optional[int] = 5000, + fee: int = 5000, ) -> SubmittedTx: """Prepare and broadcast basic transaction. @@ -28,6 +28,8 @@ def prepare_and_broadcast_basic_transaction( :param account: The account :param gas_limit: The gas limit :param memo: Transaction memo, defaults to None + :param broadcast_mode: Broadcast mode, defaults to None + :param fee: Transaction fee, defaults to 5000 :return: broadcast transaction """ @@ -53,7 +55,7 @@ def prepare_and_broadcast_basic_transaction( # finally, build the final transaction that will be executed with the correct gas and fee values tx.seal( SigningCfg.direct(sender.public_key(), account.sequence), - fee=f"{fee}{DEFAULT_TOKEN}", + fee=f"{fee}{client.network_config.fee_denomination}", gas_limit=gas_limit, memo=memo, ) diff --git a/v4-client-py/v4_client_py/chain/aerial/config.py b/v4-client-py/v4_client_py/chain/aerial/config.py index 3e8ff627..3adf9db7 100644 --- a/v4-client-py/v4_client_py/chain/aerial/config.py +++ b/v4-client-py/v4_client_py/chain/aerial/config.py @@ -71,6 +71,21 @@ def fetchai_dorado_testnet(cls) -> "NetworkConfig": faucet_url="https://faucet-dorado.fetch.ai", ) + @classmethod + def fetch_dydx_testnet(cls) -> "NetworkConfig": + """Dydx testnet. + + :return: Network configuration + """ + return NetworkConfig( + chain_id="dydx", + url="grpc+https://v4.testnet.dydx.exchange", + fee_minimum_gas_price=5000000000, + fee_denomination="dv4tnt", + staking_denomination="dv4tnt", + faucet_url="http://faucet.v4testnet.dydx.exchange", + ) + @classmethod def fetchai_alpha_testnet(cls): """Get the fetchai alpha testnet. @@ -93,7 +108,7 @@ def fetchai_stable_testnet(cls): :return: fetchai stable testnet. For now dorado is fetchai stable testnet. """ - return cls.fetchai_dorado_testnet() + return cls.fetch_dydx_testnet() @classmethod def fetchai_mainnet(cls) -> "NetworkConfig": diff --git a/v4-client-py/v4_client_py/clients/constants.py b/v4-client-py/v4_client_py/clients/constants.py index e8bb4543..4a1ba0ba 100644 --- a/v4-client-py/v4_client_py/clients/constants.py +++ b/v4-client-py/v4_client_py/clients/constants.py @@ -96,9 +96,6 @@ BECH32_PREFIX = 'dydx' -# ------------ DEFAULT TOKEN ------------ -DEFAULT_TOKEN = "dv4tnt" - class BroadcastMode(Enum): BroadcastTxSync = 0 BroadcastTxCommit = 1