aarmoa · aarmoa · Jul 10, 2023 · Jul 10, 2023 · Jul 10, 2023 · Jul 10, 2023
diff --git a/Makefile b/Makefile
@@ -15,12 +15,9 @@ test:
  	--exclude-dir="test/debug" \
  	--exclude-dir="test/mock" \
  	--exclude-dir="test/hummingbot/connector/gateway/amm" \
- 	--exclude-dir="test/hummingbot/connector/exchange/polkadex" \
  	--exclude-dir="test/hummingbot/connector/exchange/coinbase_pro" \
  	--exclude-dir="test/hummingbot/connector/exchange/kraken" \
  	--exclude-dir="test/hummingbot/connector/exchange/hitbtc" \
- 	--exclude-dir="test/hummingbot/connector/exchange/bitmart" \
- 	--exclude-dir="test/hummingbot/connector/exchange/ndax" \
  	--exclude-dir="test/hummingbot/connector/gateway/clob_spot/data_sources/dexalot" \
  	--exclude-dir="test/hummingbot/strategy/amm_arb" \
  	--exclude-dir="test/hummingbot/core/gateway" \

diff --git a/README.md b/README.md
@@ -72,7 +72,6 @@ Exchanges may be centralized (**CEX**), or decentralized (**DEX**), in which cas
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Bybit](https://docs.hummingbot.org/exchanges/bybit/) | SPOT CEX |
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Bybit (perp)](https://docs.hummingbot.org/exchanges/bitmex-perpetual/) | PERP CEX |
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Coinbase](https://docs.hummingbot.org/exchanges/coinbase/) | SPOT CEX |
-| ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [DeFi Kingdoms](https://docs.hummingbot.org/exchanges/defikingdoms/) | AMM DEX |
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Defira](https://docs.hummingbot.org/exchanges/defira/) | AMM DEX |
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Dexalot](https://docs.hummingbot.org/exchanges/dexalot/) | CLOB DEX |
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [HitBTC](https://docs.hummingbot.org/exchanges/hitbtc/) | SPOT CEX |
@@ -88,14 +87,13 @@ Exchanges may be centralized (**CEX**), or decentralized (**DEX**), in which cas
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Pancakeswap](https://docs.hummingbot.org/exchanges/pancakeswap/) | AMM DEX |
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Pangolin](https://docs.hummingbot.org/exchanges/pangolin/) | AMM DEX |
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Perpetual Protocol](https://docs.hummingbot.org/exchanges/perp/) | PERP DEX |
-| ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Phemex Perpetual](https://docs.hummingbot.org/exchanges/perp/) | PERP DEX |
+| ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Phemex Perpetual](https://docs.hummingbot.org/exchanges/perp/) | PERP CEX |
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Polkadex](https://docs.hummingbot.org/exchanges/polkadex/) | SPOT DEX |
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Ref Finance](https://docs.hummingbot.org/exchanges/ref/) | SPOT DEX |
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Sushiswap](https://docs.hummingbot.org/exchanges/sushiswap/) | AMM DEX |
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Tinyman](https://docs.hummingbot.org/exchanges/tinyman/) | SPOT DEX |
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [VVS Finance](https://docs.hummingbot.org/exchanges/vvs/) | AMM DEX |
 | ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [XSWAP](https://docs.hummingbot.org/exchanges/xswap/) | AMM DEX |
-| ![](https://img.shields.io/static/v1?label=Hummingbot&message=BRONZE&color=green) | [Zigzag](https://docs.hummingbot.org/exchanges/zigzag/) | SPOT DEX |
 
 
 Quarterly [Polls](https://docs.hummingbot.org/governance/polls/) allow the Hummingbot community to vote using HBOT tokens to decide which exchanges should be certified GOLD or SILVER, which means that they are maintained and continually improved by Hummingbot Foundation. In addition, the codebase includes BRONZE exchange connectors that are maintained by community members. See the [Hummingbot documentation](https://docs.hummingbot.org/exchanges) for all exchanges supported.

diff --git a/hummingbot/client/config/client_config_map.py b/hummingbot/client/config/client_config_map.py
@@ -600,7 +600,7 @@ class Config:
 
 class GlobalTokenConfigMap(BaseClientModel):
     global_token_name: str = Field(
-        default="USD",
+        default="USDT",
         client_data=ClientFieldData(
             prompt=lambda
                 cm: "What is your default display token? (e.g. USD,EUR,BTC)",

diff --git a/hummingbot/connector/connector_status.py b/hummingbot/connector/connector_status.py
@@ -36,25 +36,23 @@
     'perpetual_finance': 'bronze',
     'uniswap': 'gold',
     'uniswapLP': 'gold',
-    'pancakeswap': 'bronze',
+    'pancakeswap': 'silver',
     'sushiswap': 'bronze',
-    'traderjoe': 'silver',
-    'quickswap': 'silver',
+    'traderjoe': 'bronze',
+    'quickswap': 'bronze',
     'perp': 'bronze',
     'openocean': 'bronze',
     'pangolin': 'bronze',
-    'defikingdoms': 'bronze',
     'defira': 'bronze',
     'mad_meerkat': 'bronze',
     'vvs': 'bronze',
     'ref': 'bronze',
     'injective': 'bronze',
     'xswap': 'bronze',
-    'dexalot': 'bronze',
+    'dexalot': 'silver',
     'kucoin_perpetual': 'silver',
     'kucoin_perpetual_testnet': 'silver',
     'injective_perpetual': 'bronze',
-    'zigzag': 'bronze',
     'bit_com_perpetual': 'bronze',
     'bit_com_perpetual_testnet': 'bronze',
     'tinyman': 'bronze',

diff --git a/hummingbot/connector/derivative/bitget_perpetual/bitget_perpetual_derivative.py b/hummingbot/connector/derivative/bitget_perpetual/bitget_perpetual_derivative.py
@@ -303,7 +303,7 @@ def _get_fee(self,
         trading_pair = combine_to_hb_trading_pair(base=base_currency, quote=quote_currency)
         if trading_pair in self._trading_fees:
             fee_schema: TradeFeeSchema = self._trading_fees[trading_pair]
-            fee_rate = fee_schema.maker_percent_fee_decimal if is_maker else fee_schema.maker_percent_fee_decimal
+            fee_rate = fee_schema.maker_percent_fee_decimal if is_maker else fee_schema.taker_percent_fee_decimal
             fee = TradeFeeBase.new_spot_fee(
                 fee_schema=fee_schema,
                 trade_type=order_side,

diff --git a/hummingbot/connector/exchange/injective_v2/README.md b/hummingbot/connector/exchange/injective_v2/README.md
@@ -0,0 +1,17 @@
+## Injective v2
+
+This is a spot connector created by **[Injective Labs](https://injectivelabs.org/)**.
+The difference with `injective` connector is that v2 is a pure Python connector. That means that the user does not need to configure and run a Gateway instance to use the connector.
+Also, `injective_v2` has been implemented to use delegated accounts. That means that the account used to send the transactions to the chain for trading is not the account holding the funds.
+The user will need to have one portfolio account and at least one trading account. And permissions should be granted with the portfolio account to the trading account for it to operate using the portfolio account's funds.
+
+### Trading permissions grant
+To grant permissions from a portfolio account to a trading account to operate using the portfolio account funds please refer to the script `account_delegation_script.py`
+
+### Connector parameters
+When configuring a new instance of the connector in Hummingbot the following parameters are required:
+
+- **injective_private_key**: the private key of the trading account (grantee account)
+- **injective_subaccount_index**: the index (decimal number) of the subaccount from the trading account that the connector will be operating with
+- **injective_granter_address**: the public key (injective format address) or the portfolio account
+- **injective_granter_subaccount_index**: the index (decimal number) of the subaccount from the portfolio account (the subaccount holding the funds)
diff --git a/hummingbot/connector/exchange/injective_v2/__init__.py b/hummingbot/connector/exchange/injective_v2/__init__.py
diff --git a/hummingbot/connector/exchange/injective_v2/account_delegation_script.py b/hummingbot/connector/exchange/injective_v2/account_delegation_script.py
@@ -0,0 +1,84 @@
+import asyncio
+
+from pyinjective.async_client import AsyncClient
+from pyinjective.composer import Composer
+from pyinjective.constant import Network
+from pyinjective.transaction import Transaction
+from pyinjective.wallet import PrivateKey
+
+# Values to be configured by the user
+NETWORK = Network.testnet()  # Select the correct network: mainnet, testnet, devnet, local or custom
+GRANT_EXPIRATION_IN_DAYS = 365
+GRANTER_ACCOUNT_PRIVATE_KEY = ""
+GRANTER_SUBACCOUNT_INDEX = 0
+GRANTEE_PUBLIC_INJECTIVE_ADDRESS = ""
+MARKET_IDS = []
+# List of the ids of all the markets the grant will include, for example:
+# MARKET_IDS = ["0x0511ddc4e6586f3bfe1acb2dd905f8b8a82c97e1edaef654b12ca7e6031ca0fa"]  # noqa: mock
+
+# Fixed values, do not change
+SECONDS_PER_DAY = 60 * 60 * 24
+
+
+async def main() -> None:
+    composer = Composer(network=NETWORK.string())
+
+    # initialize grpc client
+    client = AsyncClient(NETWORK, insecure=False)
+    await client.sync_timeout_height()
+
+    # load account
+    granter_private_key = PrivateKey.from_hex(GRANTER_ACCOUNT_PRIVATE_KEY)
+    granter_public_key = granter_private_key.to_public_key()
+    granter_address = granter_public_key.to_address()
+    account = await client.get_account(granter_address.to_acc_bech32())  # noqa: F841
+    granter_subaccount_id = granter_address.get_subaccount_id(index=0)
+
+    msg = composer.MsgGrantTyped(
+        granter = granter_address.to_acc_bech32(),
+        grantee = GRANTEE_PUBLIC_INJECTIVE_ADDRESS,
+        msg_type = "BatchUpdateOrdersAuthz",
+        expire_in=GRANT_EXPIRATION_IN_DAYS * SECONDS_PER_DAY,
+        subaccount_id=granter_subaccount_id,
+        spot_markets=MARKET_IDS,
+    )
+
+    tx = (
+        Transaction()
+        .with_messages(msg)
+        .with_sequence(client.get_sequence())
+        .with_account_num(client.get_number())
+        .with_chain_id(NETWORK.chain_id)
+    )
+    sim_sign_doc = tx.get_sign_doc(granter_public_key)
+    sim_sig = granter_private_key.sign(sim_sign_doc.SerializeToString())
+    sim_tx_raw_bytes = tx.get_tx_data(sim_sig, granter_public_key)
+
+    # simulate tx
+    (sim_res, success) = await client.simulate_tx(sim_tx_raw_bytes)
+    if not success:
+        print(sim_res)
+        return
+
+    # build tx
+    gas_price = 500000000
+    gas_limit = sim_res.gas_info.gas_used + 20000
+    gas_fee = "{:.18f}".format((gas_price * gas_limit) / pow(10, 18)).rstrip("0")
+    fee = [composer.Coin(
+        amount=gas_price * gas_limit,
+        denom=NETWORK.fee_denom,
+    )]
+
+    tx = tx.with_gas(gas_limit).with_fee(fee).with_memo("").with_timeout_height(client.timeout_height)
+    sign_doc = tx.get_sign_doc(granter_public_key)
+    sig = granter_private_key.sign(sign_doc.SerializeToString())
+    tx_raw_bytes = tx.get_tx_data(sig, granter_public_key)
+
+    res = await client.send_tx_sync_mode(tx_raw_bytes)
+    print(res)
+    print("gas wanted: {}".format(gas_limit))
+    print("gas fee: {} INJ".format(gas_fee))
+
+
+if __name__ == "__main__":
+    asyncio.get_event_loop().run_until_complete(main())
diff --git a/hummingbot/connector/exchange/injective_v2/injective_constants.py b/hummingbot/connector/exchange/injective_v2/injective_constants.py
@@ -0,0 +1,52 @@
+import sys
+
+from hummingbot.core.api_throttler.data_types import RateLimit
+from hummingbot.core.data_type.in_flight_order import OrderState
+
+EXCHANGE_NAME = "injective_v2"
+
+DEFAULT_DOMAIN = ""
+TESTNET_DOMAIN = "testnet"
+
+DEFAULT_SUBACCOUNT_INDEX = 0
+EXTRA_TRANSACTION_GAS = 20000
+DEFAULT_GAS_PRICE = 500000000
+
+EXPECTED_BLOCK_TIME = 1.5
+TRANSACTIONS_CHECK_INTERVAL = 3 * EXPECTED_BLOCK_TIME
+
+# Public limit ids
+ORDERBOOK_LIMIT_ID = "OrderBookSnapshot"
+GET_TRANSACTION_LIMIT_ID = "GetTransaction"
+GET_CHAIN_TRANSACTION_LIMIT_ID = "GetChainTransaction"
+
+# Private limit ids
+PORTFOLIO_BALANCES_LIMIT_ID = "AccountPortfolio"
+SPOT_ORDERS_HISTORY_LIMIT_ID = "SpotOrdersHistory"
+SPOT_TRADES_LIMIT_ID = "SpotTrades"
+SIMULATE_TRANSACTION_LIMIT_ID = "SimulateTransaction"
+SEND_TRANSACTION = "SendTransaction"
+
+NO_LIMIT = sys.maxsize
+ONE_SECOND = 1
+
+RATE_LIMITS = [
+    RateLimit(limit_id=ORDERBOOK_LIMIT_ID, limit=NO_LIMIT, time_interval=ONE_SECOND),
+    RateLimit(limit_id=GET_TRANSACTION_LIMIT_ID, limit=NO_LIMIT, time_interval=ONE_SECOND),
+    RateLimit(limit_id=GET_CHAIN_TRANSACTION_LIMIT_ID, limit=NO_LIMIT, time_interval=ONE_SECOND),
+    RateLimit(limit_id=PORTFOLIO_BALANCES_LIMIT_ID, limit=NO_LIMIT, time_interval=ONE_SECOND),
+    RateLimit(limit_id=SPOT_ORDERS_HISTORY_LIMIT_ID, limit=NO_LIMIT, time_interval=ONE_SECOND),
+    RateLimit(limit_id=SPOT_TRADES_LIMIT_ID, limit=NO_LIMIT, time_interval=ONE_SECOND),
+    RateLimit(limit_id=SIMULATE_TRANSACTION_LIMIT_ID, limit=NO_LIMIT, time_interval=ONE_SECOND),
+    RateLimit(limit_id=SEND_TRANSACTION, limit=NO_LIMIT, time_interval=ONE_SECOND),
+]
+
+ORDER_STATE_MAP = {
+    "booked": OrderState.OPEN,
+    "partial_filled": OrderState.PARTIALLY_FILLED,
+    "filled": OrderState.FILLED,
+    "canceled": OrderState.CANCELED,
+}
+
+ORDER_NOT_FOUND_ERROR_MESSAGE = "order not found"
+ACCOUNT_SEQUENCE_MISMATCH_ERROR = "account sequence mismatch"