Skip to content

Commit

Permalink
Merge pull request hummingbot#7186 from hummingbot/staging
Browse files Browse the repository at this point in the history
sync / staging -> master for Hummingbot version 2.0.1
  • Loading branch information
nikspz authored Aug 28, 2024
2 parents f111d1c + 2f83e02 commit 7a8d841
Show file tree
Hide file tree
Showing 430 changed files with 25,521 additions and 18,956 deletions.
3 changes: 2 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ omit =
hummingbot/client/ui/parser.py
hummingbot/connector/derivative/position.py
hummingbot/connector/exchange/bitfinex*
hummingbot/connector/exchange/coinbase_pro*
hummingbot/connector/exchange/foxbit*
hummingbot/connector/exchange/hitbtc*
hummingbot/connector/derivative/dydx_v4_perpetual/*
hummingbot/connector/derivative/dydx_v4_perpetual/data_sources/*
hummingbot/connector/exchange/injective_v2/account_delegation_script.py
hummingbot/connector/exchange/paper_trade*
hummingbot/connector/gateway/**
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ If the Foundation team requests changes, make more commits to your branch to add

## Unit Test Coverage

A minimum of 75% unit test coverage is required for all changes included in a pull request. However, some components, like UI components, are excluded from this validation.
A minimum of 80% unit test coverage is required for all changes included in a pull request. However, some components, like UI components, are excluded from this validation.

To run tests locally, run `make test` after activating the environment.

Expand Down
146 changes: 0 additions & 146 deletions DOCKER.md

This file was deleted.

6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@

test:
coverage run -m nose \
--exclude-dir="test/connector" \
--exclude-dir="test/debug" \
--exclude-dir="test/mock" \
--exclude-dir="test/hummingbot/connector/gateway/amm" \
--exclude-dir="test/hummingbot/connector/exchange/coinbase_pro" \
--exclude-dir="test/hummingbot/connector/exchange/hitbtc" \
--exclude-dir="test/hummingbot/connector/exchange/coinbase_advance_trade" \
--exclude-dir="test/hummingbot/connector/exchange/ndax" \
--exclude-dir="test/hummingbot/connector/exchange/foxbit" \
--exclude-dir="test/hummingbot/connector/derivative/dydx_v4_perpetual" \
--exclude-dir="test/hummingbot/connector/gateway/clob_spot/data_sources/dexalot" \
--exclude-dir="test/hummingbot/strategy/amm_arb" \
--exclude-dir="test/hummingbot/core/gateway" \
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ Help us **democratize high-frequency trading** and make powerful trading algorit
* [Website and Docs](https://hummingbot.org): Official Hummingbot website and documentation
* [Installation](https://hummingbot.org/installation/docker/): Install Hummingbot on various platforms
* [FAQs](https://hummingbot.org/faq/): Answers to all your burning questions
* [Botcamp](https://hummingbot.org/botcamp/): Learn how build your own custom HFT strategy in Hummingbot with our hands-on bootcamp!
* [Newsletter](https://hummingbot.substack.com): Get our monthly newletter whenever we ship a new release
* [Botcamp](https://hummingbot.org/botcamp/): Learn how to build your own custom HFT strategy in Hummingbot with our hands-on bootcamp!
* [Newsletter](https://hummingbot.substack.com): Get our monthly newsletter whenever we ship a new release
* [Discord](https://discord.gg/hummingbot): The main gathering spot for the global Hummingbot community
* [YouTube](https://www.youtube.com/c/hummingbot): Videos that teach you how to get the most of of Hummingbot
* [Twitter](https://twitter.com/_hummingbot): Get the latest announcements about Hummingbot
Expand Down
Binary file removed assets/Pangolin-logo.png
Binary file not shown.
Binary file removed assets/altmarkets_logo1.png
Binary file not shown.
Binary file removed assets/ascendex-logo.jpg
Binary file not shown.
Binary file removed assets/balancer-logo.jpg
Binary file not shown.
Binary file removed assets/bamboorelay-logo.jpg
Binary file not shown.
Binary file removed assets/beaxy-logo.png
Binary file not shown.
Binary file removed assets/binance-logo.jpg
Binary file not shown.
Binary file removed assets/binance_futures-logo.jpg
Binary file not shown.
Binary file removed assets/binance_us-logo.jpg
Binary file not shown.
Binary file removed assets/bitfinex-logo.jpg
Binary file not shown.
Binary file removed assets/bitget-logo.png
Binary file not shown.
Binary file removed assets/bitmart-logo.jpg
Binary file not shown.
Binary file removed assets/bitmex-logo.png
Binary file not shown.
Binary file removed assets/bittrex_global-logo.jpg
Binary file not shown.
Binary file removed assets/btcmarkets-logo.jpg
Binary file not shown.
Binary file removed assets/bybit-logo.jpg
Binary file not shown.
Binary file removed assets/celo-logo.jpg
Binary file not shown.
Binary file removed assets/coinbase_pro-logo.jpg
Binary file not shown.
Binary file removed assets/coinzoom-logo.jpg
Binary file not shown.
Binary file removed assets/cryptocom-logo.jpg
Binary file not shown.
Binary file removed assets/digifinex-logo.jpg
Binary file not shown.
Binary file removed assets/dolomite-logo.jpg
Binary file not shown.
Binary file removed assets/dydx-logo.jpg
Binary file not shown.
Binary file removed assets/eve_exchange_logo.png
Binary file not shown.
Binary file removed assets/foxbit-exchange-logo.png
Binary file not shown.
Binary file removed assets/ftx-logo.jpg
Diff not rendered.
Binary file removed assets/gate-io-logo.jpg
Diff not rendered.
Binary file removed assets/himalaya_exchange-logo.jpg
Diff not rendered.
Binary file removed assets/hitbtc-logo.jpg
Diff not rendered.
Binary file removed assets/huobi_global-logo.jpg
Diff not rendered.
Binary file removed assets/injective.jpg
Diff not rendered.
Binary file removed assets/kraken-logo.jpg
Diff not rendered.
Binary file removed assets/kucoin-logo.jpg
Diff not rendered.
Binary file removed assets/latoken-logo.png
Diff not rendered.
Binary file removed assets/lbank.jpg
Diff not rendered.
Binary file removed assets/lbank.png
Diff not rendered.
Binary file removed assets/liquid-logo.jpg
Diff not rendered.
Binary file removed assets/loopring-logo.jpg
Diff not rendered.
Binary file removed assets/mexc.jpg
Diff not rendered.
Binary file removed assets/mm-finance-logo.png
Diff not rendered.
Binary file removed assets/ndax-logo.jpg
Diff not rendered.
Binary file removed assets/okex-logo.jpg
Diff not rendered.
Binary file removed assets/pancakeswap-logo.png
Diff not rendered.
Binary file removed assets/perpetual_protocol-logo.jpg
Diff not rendered.
Binary file removed assets/probit-logo.jpg
Diff not rendered.
Binary file removed assets/probit_kr-logo.jpg
Diff not rendered.
Binary file removed assets/quickswap-logo.png
Diff not rendered.
Binary file removed assets/radar_logo.png
Diff not rendered.
Binary file removed assets/ref-finance-logo.png
Diff not rendered.
Binary file removed assets/serum-logo.jpg
Diff not rendered.
Binary file removed assets/sushiswap-logo.jpg
Diff not rendered.
Binary file removed assets/terra-logo.jpg
Diff not rendered.
Binary file removed assets/traderjoe-logo.png
Diff not rendered.
Binary file removed assets/uniswap-logo.jpg
Diff not rendered.
Binary file removed assets/uniswap_v3-logo.jpg
Diff not rendered.
Binary file removed assets/vvs-finance-logo.png
Diff not rendered.
Binary file removed assets/wazirX-logo.jpg
Diff not rendered.
Binary file removed assets/white-bit.png
Diff not rendered.
5 changes: 0 additions & 5 deletions conf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@
coinbase_advanced_trade_api_key = os.getenv("COINBASE_ADVANCED_TRADE_API_KEY")
coinbase_advanced_trade_secret_key = os.getenv("COINBASE_ADVANCED_TRADE_SECRET_KEY")
# Coinbase Pro Tests
coinbase_pro_api_key = os.getenv("COINBASE_PRO_API_KEY")
coinbase_pro_secret_key = os.getenv("COINBASE_PRO_SECRET_KEY")
coinbase_pro_passphrase = os.getenv("COINBASE_PRO_PASSPHRASE")
# Htx Tests
htx_api_key = os.getenv("HTX_API_KEY")
Expand Down
2 changes: 1 addition & 1 deletion controllers/market_making/pmm_dynamic.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class PMMDynamicController(MarketMakingControllerBase):
"""
def __init__(self, config: PMMDynamicControllerConfig, *args, **kwargs):
self.config = config
self.max_records = max(config.macd_slow, config.macd_fast, config.macd_signal, config.natr_length) + 10
self.max_records = max(config.macd_slow, config.macd_fast, config.macd_signal, config.natr_length) + 100
if len(self.config.candles_config) == 0:
self.config.candles_config = [CandlesConfig(
connector=config.candles_connector,
Expand Down
5 changes: 0 additions & 5 deletions hooks/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions hooks/build

This file was deleted.

2 changes: 1 addition & 1 deletion hummingbot/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
2.0.1
2 changes: 0 additions & 2 deletions hummingbot/client/command/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from .import_command import ImportCommand
from .mqtt_command import MQTTCommand
from .order_book_command import OrderBookCommand
from .pmm_script_command import PMMScriptCommand
from .previous_strategy_command import PreviousCommand
from .rate_command import RateCommand
from .silly_commands import SillyCommands
Expand All @@ -31,7 +30,6 @@
HistoryCommand,
ImportCommand,
OrderBookCommand,
PMMScriptCommand,
PreviousCommand,
RateCommand,
SillyCommands,
Expand Down
2 changes: 0 additions & 2 deletions hummingbot/client/command/config_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@
"mqtt_autostart",
"instance_id",
"send_error_logs",
"pmm_script_mode",
"pmm_script_file_path",
"ethereum_chain_name",
"gateway",
"gateway_api_host",
Expand Down
12 changes: 0 additions & 12 deletions hummingbot/client/command/pmm_script_command.py

This file was deleted.

9 changes: 0 additions & 9 deletions hummingbot/client/command/start_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,15 +255,6 @@ async def start_market_making(self, # type: HummingbotApplication
await market.cancel_all(10.0)
if self.strategy:
self.clock.add_iterator(self.strategy)
try:
self._pmm_script_iterator = self.client_config_map.pmm_script_mode.get_iterator(
self.strategy_name, list(self.markets.values()), self.strategy
)
except ValueError as e:
self.notify(f"Error: {e}")
if self._pmm_script_iterator is not None:
self.clock.add_iterator(self._pmm_script_iterator)
self.notify(f"PMM script ({self.client_config_map.pmm_script_mode.pmm_script_file_path}) started.")
self.strategy_task: asyncio.Task = safe_ensure_future(self._run_clock(), loop=self.ev_loop)
self.notify(f"\n'{self.strategy_name}' strategy started.\n"
f"Run `status` command to query the progress.")
Expand Down
2 changes: 0 additions & 2 deletions hummingbot/client/command/status_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ async def strategy_status(self, live: bool = False):
else:
st_status = self.strategy.format_status()
status = paper_trade + "\n" + st_status
if self._pmm_script_iterator is not None and live is False:
self._pmm_script_iterator.request_status()
return status

def application_warning(self):
Expand Down
5 changes: 1 addition & 4 deletions hummingbot/client/command/stop_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,8 @@ async def stop_loop(self, # type: HummingbotApplication
import appnope
appnope.nap()

if self._pmm_script_iterator is not None:
self._pmm_script_iterator.stop(self.clock)

if isinstance(self.strategy, ScriptStrategyBase):
self.strategy.on_stop()
await self.strategy.on_stop()

if self._trading_required and not skip_order_cancellation:
# Remove the strategy from clock before cancelling orders, to
Expand Down
Loading

0 comments on commit 7a8d841

Please sign in to comment.