From 4db50c6861e82411c43a5be7d124a87a7ab04445 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 28 Nov 2023 08:57:31 +0000 Subject: [PATCH 01/10] Bump version [skip ci] --- fastlane_bot/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane_bot/__init__.py b/fastlane_bot/__init__.py index 39ec3042d..bb0654a08 100644 --- a/fastlane_bot/__init__.py +++ b/fastlane_bot/__init__.py @@ -1,7 +1,7 @@ from .bot import CarbonBot as Bot, __VERSION__, __DATE__ from .config import Config, ConfigNetwork, ConfigDB, ConfigLogger, ConfigProvider -__version__ = '2.7.72' +__version__ = '2.7.73' From a5a4e536e42468d3e5734b2cebe35f3ac59d79b0 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 28 Nov 2023 08:57:48 +0000 Subject: [PATCH 02/10] Update changelog [skip ci] --- CHANGELOG.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 092efc618..116217f11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,23 @@ ## [Unreleased](https://github.com/bancorprotocol/fastlane-bot/tree/HEAD) -[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.71...HEAD) +[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.72...HEAD) -- Add missing pool data [\#227](https://github.com/bancorprotocol/fastlane-bot/issues/227) +- Specific exchanges bug [\#226](https://github.com/bancorprotocol/fastlane-bot/issues/226) +- Target token bug [\#225](https://github.com/bancorprotocol/fastlane-bot/issues/225) +- If gas tkn or wrapped gas token is in flashloan tokens, always include both in token list [\#232](https://github.com/bancorprotocol/fastlane-bot/pull/232) ([Lesigh-3100](https://github.com/Lesigh-3100)) +- Add handling for instances where Stablecoin pool cannot be found for … [\#231](https://github.com/bancorprotocol/fastlane-bot/pull/231) ([Lesigh-3100](https://github.com/Lesigh-3100)) Closed issues - USDC missing from tokens.csv [\#229](https://github.com/bancorprotocol/fastlane-bot/issues/229) +## [v2.7.72](https://github.com/bancorprotocol/fastlane-bot/tree/v2.7.72) (2023-11-27) + +[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.71...v2.7.72) + +- Add missing pool data [\#227](https://github.com/bancorprotocol/fastlane-bot/issues/227) + Merged pull requests - Update tokens.csv [\#230](https://github.com/bancorprotocol/fastlane-bot/pull/230) ([NIXBNT](https://github.com/NIXBNT)) From fddad6dcc9402add78e0ca4ef4761ad05d464847 Mon Sep 17 00:00:00 2001 From: Lesigh-3100 Date: Tue, 28 Nov 2023 11:10:19 +0200 Subject: [PATCH 03/10] Update README.md --- README.md | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3a531772a..99f91b7d1 100644 --- a/README.md +++ b/README.md @@ -110,12 +110,21 @@ python main.py You can configure the Fastlane Arbitrage Bot using the options in the `@click.option` section of `main.py`. An overview of options is provided below: - **cache_latest_only** (bool): Whether to cache only the latest events. -- **arb_mode** (str): Specifies the arbitrage mode. Options include: - - **single**: Arbitrage between one Carbon curve and one other exchange curve. - - **multi** (default): Arbitrage between multiple Carbon curves and one other exchange curve. - - **triangle**: Triangular arbitrage between one Carbon curve and two other exchange curves. - - **multi_triangle**: Triangular arbitrage between multiple Carbon curves and two other exchange curves. - - **bancor_v3**: Arbitrage between two Bancor v3 pools and one other exchange curve. +- **arb_mode** (str): Specifies the arbitrage mode. + - **Types of arbitrage**: + - **Pairwise**: This includes arbitrage trades between two liquidity pools that contain the same tokens. For example: USDC > LINK, LINK > USDC + - **Triangular**: This includes arbitrage trades between three liquidity pools that can create a triangular route, starting and ending in the same token. For example, USDC > ETH, ETH > LINK, LINK > USDC + - **Multi**: These modes can trade through multiple Carbon orders as a single trade. + - **arb_mode options**: + - **single**: Pairwise arbitrage between one Carbon curve and one other exchange curve. + - **multi** Pairwise arbitrage between **multiple** Carbon curves and one other exchange curve. + - **triangle**: Triangular arbitrage between one Carbon curve and two other exchange curves. + - **multi_triangle**: Triangular arbitrage between **multiple** Carbon curves and two other exchange curves. + - **bancor_v3**: Triangular arbitrage between two Bancor v3 pools and one other exchange curve. + - **b3_two_hop**: Triangular arbitrage - the same as bancor_v3 mode but more gas-efficient. + - **multi_pairwise_pol**: Pairwise multi-mode that always routes through the Bancor protocol-owned liquidity contract. + - **multi_pairwise_bal**: Pairwise multi-mode that always routes through the Balancer. + - **multi_pairwise_all**: Pairwise multi-mode that searches all available exchanges for pairwise arbitrage. - **flashloan_tokens** (str): Tokens the bot can use for flash loans. Specify tokens as a comma-separated string in TKN-ADDR format (e.g., BNT-FF1C, WETH-6Cc2). - **exchanges** (str): Comma-separated string of exchanges to include. - **polling_interval** (int): Bot's polling interval for new events. From 12dc9d4405e8a63828cf93912293b2c84888ff80 Mon Sep 17 00:00:00 2001 From: Lesigh-3100 Date: Tue, 28 Nov 2023 11:13:25 +0200 Subject: [PATCH 04/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 99f91b7d1..a7f989cfe 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ You can configure the Fastlane Arbitrage Bot using the options in the `@click.op - **bancor_v3**: Triangular arbitrage between two Bancor v3 pools and one other exchange curve. - **b3_two_hop**: Triangular arbitrage - the same as bancor_v3 mode but more gas-efficient. - **multi_pairwise_pol**: Pairwise multi-mode that always routes through the Bancor protocol-owned liquidity contract. - - **multi_pairwise_bal**: Pairwise multi-mode that always routes through the Balancer. + - **multi_pairwise_bal**: Pairwise multi-mode that always routes through Balancer. - **multi_pairwise_all**: Pairwise multi-mode that searches all available exchanges for pairwise arbitrage. - **flashloan_tokens** (str): Tokens the bot can use for flash loans. Specify tokens as a comma-separated string in TKN-ADDR format (e.g., BNT-FF1C, WETH-6Cc2). - **exchanges** (str): Comma-separated string of exchanges to include. From 2db530f7c3a099eab21d89c3c6f437248ea5a455 Mon Sep 17 00:00:00 2001 From: Lesigh-3100 Date: Tue, 28 Nov 2023 11:14:28 +0200 Subject: [PATCH 05/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a7f989cfe..2d07d4b64 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ You can configure the Fastlane Arbitrage Bot using the options in the `@click.op - **b3_two_hop**: Triangular arbitrage - the same as bancor_v3 mode but more gas-efficient. - **multi_pairwise_pol**: Pairwise multi-mode that always routes through the Bancor protocol-owned liquidity contract. - **multi_pairwise_bal**: Pairwise multi-mode that always routes through Balancer. - - **multi_pairwise_all**: Pairwise multi-mode that searches all available exchanges for pairwise arbitrage. + - **multi_pairwise_all**: **(Default)** Pairwise multi-mode that searches all available exchanges for pairwise arbitrage. - **flashloan_tokens** (str): Tokens the bot can use for flash loans. Specify tokens as a comma-separated string in TKN-ADDR format (e.g., BNT-FF1C, WETH-6Cc2). - **exchanges** (str): Comma-separated string of exchanges to include. - **polling_interval** (int): Bot's polling interval for new events. From 5ecb9b0be75b103dc861fc6d28ba78a8a9a0ffc1 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 28 Nov 2023 09:25:07 +0000 Subject: [PATCH 06/10] Bump version [skip ci] --- fastlane_bot/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane_bot/__init__.py b/fastlane_bot/__init__.py index bb0654a08..aa1470aad 100644 --- a/fastlane_bot/__init__.py +++ b/fastlane_bot/__init__.py @@ -1,7 +1,7 @@ from .bot import CarbonBot as Bot, __VERSION__, __DATE__ from .config import Config, ConfigNetwork, ConfigDB, ConfigLogger, ConfigProvider -__version__ = '2.7.73' +__version__ = '2.7.74' From 4caa273fae1d94a8795055b84ae19494cd297b07 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 28 Nov 2023 09:25:21 +0000 Subject: [PATCH 07/10] Update changelog [skip ci] --- CHANGELOG.md | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 116217f11..b530673ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,23 @@ ## [Unreleased](https://github.com/bancorprotocol/fastlane-bot/tree/HEAD) -[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.72...HEAD) +[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.73...HEAD) -- Specific exchanges bug [\#226](https://github.com/bancorprotocol/fastlane-bot/issues/226) - Target token bug [\#225](https://github.com/bancorprotocol/fastlane-bot/issues/225) + +Closed issues + +- Update Arb Mode descriptions in Readme [\#233](https://github.com/bancorprotocol/fastlane-bot/issues/233) + +Merged pull requests + +- Update README.md [\#234](https://github.com/bancorprotocol/fastlane-bot/pull/234) ([Lesigh-3100](https://github.com/Lesigh-3100)) + +## [v2.7.73](https://github.com/bancorprotocol/fastlane-bot/tree/v2.7.73) (2023-11-28) + +[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.72...v2.7.73) + +- Specific exchanges bug [\#226](https://github.com/bancorprotocol/fastlane-bot/issues/226) - If gas tkn or wrapped gas token is in flashloan tokens, always include both in token list [\#232](https://github.com/bancorprotocol/fastlane-bot/pull/232) ([Lesigh-3100](https://github.com/Lesigh-3100)) - Add handling for instances where Stablecoin pool cannot be found for … [\#231](https://github.com/bancorprotocol/fastlane-bot/pull/231) ([Lesigh-3100](https://github.com/Lesigh-3100)) From 48b305d911622f48f6c1b7806d59608968baadf8 Mon Sep 17 00:00:00 2001 From: NIXBNT <88088888+NIXBNT@users.noreply.github.com> Date: Wed, 29 Nov 2023 10:10:50 +1100 Subject: [PATCH 08/10] add float wrapper incase decimal input is string --- fastlane_bot/events/managers/base.py | 2 +- fastlane_bot/events/managers/contracts.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fastlane_bot/events/managers/base.py b/fastlane_bot/events/managers/base.py index b1b753d18..a32e6a872 100644 --- a/fastlane_bot/events/managers/base.py +++ b/fastlane_bot/events/managers/base.py @@ -644,7 +644,7 @@ def get_tkn_symbol_and_decimals( record = next((add for add in self.tokens if add["address"] == addr), None) if record: - return record["symbol"], int(record["decimals"]) + return record["symbol"], int(float(record["decimals"])) return self.get_token_info_from_contract(web3, erc20_contracts, addr) diff --git a/fastlane_bot/events/managers/contracts.py b/fastlane_bot/events/managers/contracts.py index c4b810d9d..602f8b1f5 100644 --- a/fastlane_bot/events/managers/contracts.py +++ b/fastlane_bot/events/managers/contracts.py @@ -349,7 +349,7 @@ def _get_and_save_token_info_from_contract( decimals = token_data.loc[token_data["key"] == key, "decimals"].iloc[0] return symbol, decimals else: - decimals = int(contract.functions.decimals().call()) + decimals = int(float(contract.functions.decimals().call())) if ( symbol is None From 647e951ab4e6c251cacfc1717e67c2d44de767ba Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 29 Nov 2023 12:54:26 +0000 Subject: [PATCH 09/10] Bump version [skip ci] --- fastlane_bot/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane_bot/__init__.py b/fastlane_bot/__init__.py index aa1470aad..b4333cce2 100644 --- a/fastlane_bot/__init__.py +++ b/fastlane_bot/__init__.py @@ -1,7 +1,7 @@ from .bot import CarbonBot as Bot, __VERSION__, __DATE__ from .config import Config, ConfigNetwork, ConfigDB, ConfigLogger, ConfigProvider -__version__ = '2.7.74' +__version__ = '2.7.75' From 0105d7cb9673039fe9cbd4df0175eda5733d3eb2 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 29 Nov 2023 12:54:42 +0000 Subject: [PATCH 10/10] Update changelog [skip ci] --- CHANGELOG.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b530673ac..6c67e41f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,14 +2,21 @@ ## [Unreleased](https://github.com/bancorprotocol/fastlane-bot/tree/HEAD) -[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.73...HEAD) +[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.74...HEAD) -- Target token bug [\#225](https://github.com/bancorprotocol/fastlane-bot/issues/225) +- Error reading updating pool decimals [\#235](https://github.com/bancorprotocol/fastlane-bot/issues/235) +- add float wrapper incase decimal input is string [\#236](https://github.com/bancorprotocol/fastlane-bot/pull/236) ([NIXBNT](https://github.com/NIXBNT)) Closed issues - Update Arb Mode descriptions in Readme [\#233](https://github.com/bancorprotocol/fastlane-bot/issues/233) +## [v2.7.74](https://github.com/bancorprotocol/fastlane-bot/tree/v2.7.74) (2023-11-28) + +[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.73...v2.7.74) + +- Target token bug [\#225](https://github.com/bancorprotocol/fastlane-bot/issues/225) + Merged pull requests - Update README.md [\#234](https://github.com/bancorprotocol/fastlane-bot/pull/234) ([Lesigh-3100](https://github.com/Lesigh-3100))