Skip to content

Commit

Permalink
Merge branch 'main' into 57-change-the-flashloan_tokens-flag-type-to-…
Browse files Browse the repository at this point in the history
…list
  • Loading branch information
mikewcasale authored Aug 7, 2023
2 parents 643c95c + d7c9ac8 commit 0bbdc30
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 147 deletions.
22 changes: 21 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,29 @@

## [Unreleased](https://github.com/bancorprotocol/fastlane-bot/tree/HEAD)

[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.0...HEAD)
[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.2...HEAD)

- Cleanup of Unused Top-Level Files [\#47](https://github.com/bancorprotocol/fastlane-bot/issues/47)
- Removes unused files. [\#48](https://github.com/bancorprotocol/fastlane-bot/pull/48) ([mikewcasale](https://github.com/mikewcasale))

Closed issues

- Update README with Brownie and pyyaml Install Troubleshoot [\#31](https://github.com/bancorprotocol/fastlane-bot/issues/31)

## [v2.7.2](https://github.com/bancorprotocol/fastlane-bot/tree/v2.7.2) (2023-08-07)

[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.1...v2.7.2)

- Change automation to increment patch version instead of minor version. [\#53](https://github.com/bancorprotocol/fastlane-bot/issues/53)

Merged pull requests

- Adds additional installation instructions for apple-silicon users. [\#52](https://github.com/bancorprotocol/fastlane-bot/pull/52) ([mikewcasale](https://github.com/mikewcasale))

## [v2.7.1](https://github.com/bancorprotocol/fastlane-bot/tree/v2.7.1) (2023-08-06)

[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.0...v2.7.1)

- Change automation to increment patch version instead of minor. [\#54](https://github.com/bancorprotocol/fastlane-bot/pull/54) ([mikewcasale](https://github.com/mikewcasale))

## [v2.7.0](https://github.com/bancorprotocol/fastlane-bot/tree/v2.7.0) (2023-08-02)
Expand Down
42 changes: 38 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,53 @@ Permanent URL for this repository: [github.com/bancorprotocol/fastlane-bot][repo

Install Fastlane Arbitrage Bot from PyPi using the following command:

Clone the repo from Bancor's GitHub and install:

```bash
git clone https://github.com/bancorprotocol/fastlane-bot
cd fastlane-bot
pip install -r requirements.txt
python setup.py install
```

Here are the added instructions for Mac users with an Apple Silicon chip:

### Installation for Mac users with Apple Silicon chip

Due to the architectural differences of the Apple Silicon chip, some Python packages may not install correctly using the standard method. Follow the instructions below to create a compatible conda environment, and then install Fastlane Arbitrage Bot:

1. Install Miniforge tailored for Apple Silicon from [here](https://github.com/conda-forge/miniforge#miniforge3).

```bash
pip install fastlane_bot
# to install miniforge
wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-arm64.sh
bash Miniforge3-MacOSX-arm64.sh
```

Or clone the repo from Bancor's GitHub:
Follow the terminal prompts to ensure conda is installed and initialized.

2. Create a new conda environment using the correct architecture:

```bash
conda create -n fastlane_bot_env python=3.9
conda activate fastlane_bot_env
```

3. Clone the repo from GitHub:

```bash
git clone https://github.com/bancorprotocol/fastlane-bot
cd fastlane-bot
pip install -r requirements.txt
python setup.py install
```

3. Now, install Fastlane Arbitrage Bot by using the provided bash scrip `apple-silicon-install.sh`:

```bash
./apple-silicon-install.sh
```

Please note that due to potential compatibility issues with the new Apple Silicon chip, some packages may still fail to install correctly. If you encounter any issues, please report them to the package maintainers.

[sim]:https://github.com/bancorprotocol/carbon-simulator

### Legacy Installation (v1.0)
Expand Down
2 changes: 1 addition & 1 deletion fastlane_bot/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from .bot import CarbonBot as Bot, __VERSION__, __DATE__
from .config import Config, ConfigNetwork, ConfigDB, ConfigLogger, ConfigProvider

__version__ = '2.7.1'
__version__ = '2.7.3'



1 change: 0 additions & 1 deletion log.txt

This file was deleted.

24 changes: 0 additions & 24 deletions requirements-monitoring.txt

This file was deleted.

10 changes: 0 additions & 10 deletions run_arbitrage_monitor

This file was deleted.

20 changes: 0 additions & 20 deletions run_server

This file was deleted.

77 changes: 0 additions & 77 deletions run_server.py

This file was deleted.

9 changes: 0 additions & 9 deletions symlinks.sh

This file was deleted.

0 comments on commit 0bbdc30

Please sign in to comment.