Solving conflicts between hummingbot master branch and our fork

.coveragerc

@@ -13,18 +13,12 @@ omit =
         hummingbot/client/ui/layout.py
         hummingbot/client/tab/*
         hummingbot/client/ui/parser.py
-        hummingbot/connector/connector/balancer*
-        hummingbot/connector/connector/terra*
-        hummingbot/connector/connector/uniswap*
-        hummingbot/connector/connector/uniswap_v3*
-        hummingbot/connector/derivative/perpetual_finance*
         hummingbot/connector/derivative/position.py
         hummingbot/connector/exchange/bitfinex*
         hummingbot/connector/exchange/coinbase_pro*
         hummingbot/connector/exchange/hitbtc*
-        hummingbot/connector/exchange/loopring*
         hummingbot/connector/exchange/paper_trade*
-        hummingbot/connector/gateway*
+        hummingbot/connector/gateway/**
         hummingbot/connector/test_support/*
         hummingbot/core/utils/gateway_config_utils.py
         hummingbot/core/utils/kill_switch.py
@@ -33,6 +27,7 @@ omit =
         hummingbot/strategy/*/start.py
         hummingbot/strategy/dev*
         hummingbot/user/user_balances.py
+        hummingbot/smart_components/controllers/*
 dynamic_context = test_function
 branch = true
 

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: hummingbot

.github/ISSUE_TEMPLATE/bounty_request.yml

@@ -1,13 +1,14 @@
 name: Bounty Request
 description: Create a bounty for developers to work on
-title: "SUMMARY OF BOUNTY REQUEST"
+title: "Bounty Request "
 labels: bounty
 body:
  - type: markdown
    attributes:
      value: |
        ## **Before Submitting:**
 
+       * Please edit the "Bounty request" to the title of the bug/issue
        * Please make sure to look on our GitHub issues to avoid duplicate tickets
        * You can add additional `Labels` to support this ticket (connectors, strategies, etc)
        * See https://docs.hummingbot.org/governance/bounties/sponsors/ for more information on bounties

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,13 +1,14 @@
 name: Bug Report
 description: Create a bug report to help us improve
-title: "SUMMARY OF BUG"
+title: "Bug Report"
 labels: bug
 body:
  - type: markdown
    attributes:
      value: |
        ## **Before Submitting:**
        
+       * Please edit the "Bug Report" to the title of the bug or issue
        * Please make sure to look on our GitHub issues to avoid duplicate tickets
        * You can add additional `Labels` to support this ticket (connectors, strategies, etc)
        * If this is something to do with installation and how to's we would recommend to visit our [Discord server](https://discord.gg/hummingbot) and [Hummingbot docs](https://docs.hummingbot.org/)

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,13 +1,14 @@
 name: Feature request
 description: Suggest an idea that will improve the Hummingbot codebase
-title: "SUMMARY OF FEATURE REQUEST"
+title: "Feature Request"
 labels: enhancement
 body:
  - type: markdown
    attributes:
      value: |
        ## **Before Submitting:**
 
+       * Please edit the "Feature Request" to the title of the feature
        * Please make sure to look on our GitHub issues to avoid duplicate tickets
        * You can add additional `Labels` to support this ticket (connectors, strategies, etc)
        * If this is something to do with installation and how to's we would recommend to visit our [Discord server](https://discord.gg/hummingbot) and [Hummingbot docs](https://docs.hummingbot.org/)

.github/workflows/workflow.yml

@@ -25,7 +25,7 @@ jobs:
         if: env.GIT_DIFF
         run: |
           echo ${{ env.GIT_DIFF }}
-          echo "{is_set}={true}" >> $GITHUB_OUTPUT
+          echo "::set-output name=is_set::true"
 
   build_hummingbot:
     name: Hummingbot build + stable tests

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected]. All
+reported by contacting the project team at [email protected]. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

CONTRIBUTING.md

@@ -82,6 +82,8 @@ If the Foundation team requests changes, make more commits to your branch to add
 
 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.
 
+To run tests locally, run `make test` after activating the environment.
+
 To calculate the diff-coverage locally on your computer, run `make development-diff-cover` after running all tests.
 
 ## Checklist

Dockerfile

@@ -60,7 +60,7 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Create mount points
-RUN mkdir -p /home/hummingbot/conf /home/hummingbot/conf/connectors /home/hummingbot/conf/strategies /home/hummingbot/logs /home/hummingbot/data /home/hummingbot/certs /home/hummingbot/scripts
+RUN mkdir -p /home/hummingbot/conf /home/hummingbot/conf/connectors /home/hummingbot/conf/strategies /home/hummingbot/conf/scripts /home/hummingbot/logs /home/hummingbot/data /home/hummingbot/certs /home/hummingbot/scripts
 
 WORKDIR /home/hummingbot
 
@@ -73,4 +73,4 @@ SHELL [ "/bin/bash", "-lc" ]
 
 # Set the default command to run when starting the container
 
-CMD conda activate hummingbot && ./bin/hummingbot_quickstart.py 2>./logs/standard_error_output.txt
+CMD conda activate hummingbot && ./bin/hummingbot_quickstart.py 2>> ./logs/errors.log

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 CoinAlpha, Inc.
+   Copyright 2023 Hummingbot Foundation.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -21,7 +21,7 @@ test:
  	--exclude-dir="test/hummingbot/connector/gateway/clob_spot/data_sources/dexalot" \
  	--exclude-dir="test/hummingbot/strategy/amm_arb" \
  	--exclude-dir="test/hummingbot/core/gateway" \
- 	--exclude-dir="test/hummingbot/strategy/uniswap_v3_lp"
+ 	--exclude-dir="test/hummingbot/strategy/amm_v3_lp"
 
 run_coverage: test
 	coverage report