From 8c74ffa973b4ac4951a0692a6923090f04ed02a7 Mon Sep 17 00:00:00 2001 From: NIXBNT <88088888+NIXBNT@users.noreply.github.com> Date: Mon, 8 Apr 2024 16:37:54 +1000 Subject: [PATCH 1/7] add fusionx --- fastlane_bot/data/multichain_addresses.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane_bot/data/multichain_addresses.csv b/fastlane_bot/data/multichain_addresses.csv index 8fc2e6f7b..062809d9c 100644 --- a/fastlane_bot/data/multichain_addresses.csv +++ b/fastlane_bot/data/multichain_addresses.csv @@ -80,7 +80,7 @@ sushiswap_v3,linea,uniswap_v3,0xc35DADB65012eC5796536bD9864eD8773aBc74C4,0xb1E83 agni_v3,mantle,uniswap_v3,0x25780dc8Fc3cfBD75F33bFDAB65e969b603b2035,0x319B69888b0d11cEC22caA5034e25FfFBDc88421,,110692, butter_v3,mantle,uniswap_v3,0xEECa0a86431A7B42ca2Ee5F479832c3D4a4c2644,0xAe5c0a73bAE513fe5842DbcB8E32fc7E3e30DA57,,22966090, carbon_v1,mantle,carbon_v1,0x7900f766F06e361FDDB4FdeBac5b138c4EEd8d4A,0x7900f766F06e361FDDB4FdeBac5b138c4EEd8d4A,,, -some_carbon_fork,mantle,carbon_v1,0x3749f6Ef09B0f74CD5324126b02d867A03DEE844,0x3749f6Ef09B0f74CD5324126b02d867A03DEE844,,, +fusionx_carbon,mantle,carbon_v1,0x04FBC7f949326fFf7Fe4D6aE96BAfa3D8e8A8c0a,0x04FBC7f949326fFf7Fe4D6aE96BAfa3D8e8A8c0a,,61955475, cleopatra_v2,mantle,solidly_v2,0xAAA16c016BF556fcD620328f0759252E29b1AB57,0xAAA45c8F5ef92a000a121d102F4e89278a711Faa,,34705175, cleopatra_v3,mantle,uniswap_v3,0xAAA32926fcE6bE95ea2c51cB4Fcb60836D320C42,0xAAAE99091Fbb28D400029052821653C1C752483B,,34705175, fusionx_v2,mantle,uniswap_v2,0xE5020961fA51ffd3662CDf307dEf18F9a87Cce7c,0xDd0840118bF9CCCc6d67b2944ddDfbdb995955FD,0.003,2868, From c381de8e6eded7d80df518bf3cd8b2cc9320f28e Mon Sep 17 00:00:00 2001 From: NIXBNT <88088888+NIXBNT@users.noreply.github.com> Date: Mon, 8 Apr 2024 16:37:59 +1000 Subject: [PATCH 2/7] clean up multicarbon handling --- fastlane_bot/config/constants.py | 2 +- fastlane_bot/config/network.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fastlane_bot/config/constants.py b/fastlane_bot/config/constants.py index 10604001f..10a41b0ac 100644 --- a/fastlane_bot/config/constants.py +++ b/fastlane_bot/config/constants.py @@ -20,6 +20,6 @@ FUSIONX_V3_NAME = "fusionx_v3" CLEOPATRA_V3_NAME = "cleopatra_v3" CARBON_V1_NAME = "carbon_v1" -CARBON_V1_FORK1_NAME = "altered_carbon" +CARBON_V1_FORK1_NAME = "fusionx_carbon" VELOCIMETER_V2_NAME = "velocimeter_v2" SOLIDLY_V2_NAME = "solidly_v2" diff --git a/fastlane_bot/config/network.py b/fastlane_bot/config/network.py index 211da2d63..fc9a96b55 100644 --- a/fastlane_bot/config/network.py +++ b/fastlane_bot/config/network.py @@ -209,7 +209,7 @@ class ConfigNetwork(ConfigBase): SUSHISWAP_V2_NAME = "sushiswap_v2" SUSHISWAP_V3_NAME = "sushiswap_v3" CARBON_V1_NAME = CARBON_V1_NAME - CARBON_V1_X2_NAME = CARBON_V1_FORK1_NAME + CARBON_V1_FORK1_NAME = CARBON_V1_FORK1_NAME BANCOR_POL_NAME = "bancor_pol" BALANCER_NAME = "balancer" PANCAKESWAP_V2_NAME = "pancakeswap_v2" @@ -237,7 +237,7 @@ class ConfigNetwork(ConfigBase): GAS_ORACLE_ADDRESS = None - CARBON_V1_FORKS = [CARBON_V1_NAME, CARBON_V1_X2_NAME] + CARBON_V1_FORKS = [CARBON_V1_NAME, CARBON_V1_FORK1_NAME] MULTICALLABLE_EXCHANGES = [BANCOR_V3_NAME, BANCOR_POL_NAME, BALANCER_NAME] # BANCOR POL From e0ad6955136c2c5030ea60b67adc4bbe826c095f Mon Sep 17 00:00:00 2001 From: Lesigh-3100 Date: Tue, 9 Apr 2024 14:43:40 +0300 Subject: [PATCH 3/7] Remove extras & update name --- fastlane_bot/config/constants.py | 1 - fastlane_bot/config/network.py | 5 ++--- fastlane_bot/data/multichain_addresses.csv | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/fastlane_bot/config/constants.py b/fastlane_bot/config/constants.py index 10a41b0ac..7f9fd5631 100644 --- a/fastlane_bot/config/constants.py +++ b/fastlane_bot/config/constants.py @@ -20,6 +20,5 @@ FUSIONX_V3_NAME = "fusionx_v3" CLEOPATRA_V3_NAME = "cleopatra_v3" CARBON_V1_NAME = "carbon_v1" -CARBON_V1_FORK1_NAME = "fusionx_carbon" VELOCIMETER_V2_NAME = "velocimeter_v2" SOLIDLY_V2_NAME = "solidly_v2" diff --git a/fastlane_bot/config/network.py b/fastlane_bot/config/network.py index fc9a96b55..dc1850a61 100644 --- a/fastlane_bot/config/network.py +++ b/fastlane_bot/config/network.py @@ -12,7 +12,7 @@ from . import selectors as S from .base import ConfigBase -from .constants import CARBON_V1_FORK1_NAME, CARBON_V1_NAME +from .constants import CARBON_V1_NAME load_dotenv() from decimal import Decimal @@ -209,7 +209,6 @@ class ConfigNetwork(ConfigBase): SUSHISWAP_V2_NAME = "sushiswap_v2" SUSHISWAP_V3_NAME = "sushiswap_v3" CARBON_V1_NAME = CARBON_V1_NAME - CARBON_V1_FORK1_NAME = CARBON_V1_FORK1_NAME BANCOR_POL_NAME = "bancor_pol" BALANCER_NAME = "balancer" PANCAKESWAP_V2_NAME = "pancakeswap_v2" @@ -237,7 +236,7 @@ class ConfigNetwork(ConfigBase): GAS_ORACLE_ADDRESS = None - CARBON_V1_FORKS = [CARBON_V1_NAME, CARBON_V1_FORK1_NAME] + CARBON_V1_FORKS = [] MULTICALLABLE_EXCHANGES = [BANCOR_V3_NAME, BANCOR_POL_NAME, BALANCER_NAME] # BANCOR POL diff --git a/fastlane_bot/data/multichain_addresses.csv b/fastlane_bot/data/multichain_addresses.csv index 062809d9c..6546a4065 100644 --- a/fastlane_bot/data/multichain_addresses.csv +++ b/fastlane_bot/data/multichain_addresses.csv @@ -80,7 +80,7 @@ sushiswap_v3,linea,uniswap_v3,0xc35DADB65012eC5796536bD9864eD8773aBc74C4,0xb1E83 agni_v3,mantle,uniswap_v3,0x25780dc8Fc3cfBD75F33bFDAB65e969b603b2035,0x319B69888b0d11cEC22caA5034e25FfFBDc88421,,110692, butter_v3,mantle,uniswap_v3,0xEECa0a86431A7B42ca2Ee5F479832c3D4a4c2644,0xAe5c0a73bAE513fe5842DbcB8E32fc7E3e30DA57,,22966090, carbon_v1,mantle,carbon_v1,0x7900f766F06e361FDDB4FdeBac5b138c4EEd8d4A,0x7900f766F06e361FDDB4FdeBac5b138c4EEd8d4A,,, -fusionx_carbon,mantle,carbon_v1,0x04FBC7f949326fFf7Fe4D6aE96BAfa3D8e8A8c0a,0x04FBC7f949326fFf7Fe4D6aE96BAfa3D8e8A8c0a,,61955475, +fusionx_supernova,mantle,carbon_v1,0x04FBC7f949326fFf7Fe4D6aE96BAfa3D8e8A8c0a,0x04FBC7f949326fFf7Fe4D6aE96BAfa3D8e8A8c0a,,61955475, cleopatra_v2,mantle,solidly_v2,0xAAA16c016BF556fcD620328f0759252E29b1AB57,0xAAA45c8F5ef92a000a121d102F4e89278a711Faa,,34705175, cleopatra_v3,mantle,uniswap_v3,0xAAA32926fcE6bE95ea2c51cB4Fcb60836D320C42,0xAAAE99091Fbb28D400029052821653C1C752483B,,34705175, fusionx_v2,mantle,uniswap_v2,0xE5020961fA51ffd3662CDf307dEf18F9a87Cce7c,0xDd0840118bF9CCCc6d67b2944ddDfbdb995955FD,0.003,2868, From e16f725aca4b7448ae8d9246b1789d91720a8724 Mon Sep 17 00:00:00 2001 From: NIXBNT <88088888+NIXBNT@users.noreply.github.com> Date: Wed, 10 Apr 2024 08:25:45 +1000 Subject: [PATCH 4/7] remove unused list --- fastlane_bot/config/network.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/fastlane_bot/config/network.py b/fastlane_bot/config/network.py index dc1850a61..1c95e018a 100644 --- a/fastlane_bot/config/network.py +++ b/fastlane_bot/config/network.py @@ -236,8 +236,6 @@ class ConfigNetwork(ConfigBase): GAS_ORACLE_ADDRESS = None - CARBON_V1_FORKS = [] - MULTICALLABLE_EXCHANGES = [BANCOR_V3_NAME, BANCOR_POL_NAME, BALANCER_NAME] # BANCOR POL BANCOR_POL_START_BLOCK = 18184448 From ce69428048fa6a2b7979e5cd12d6430044a3da38 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 10 Apr 2024 15:27:02 +0000 Subject: [PATCH 5/7] 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 74b32e5cc..a80ebc117 100644 --- a/fastlane_bot/__init__.py +++ b/fastlane_bot/__init__.py @@ -2,4 +2,4 @@ from .config import Config, ConfigNetwork, ConfigDB, ConfigLogger, ConfigProvider -__version__ = "3.1.5" +__version__ = "3.1.6" From a51c14c2c3fe7f2d65acecde4f22609e6b84cdcc Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 10 Apr 2024 15:27:25 +0000 Subject: [PATCH 6/7] Update changelog [skip ci] --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae62ef084..22543d906 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,21 +1,26 @@ # Changelog -## [Unreleased](https://github.com/bancorprotocol/fastlane-bot/tree/HEAD) +## [v3.1.5](https://github.com/bancorprotocol/fastlane-bot/tree/v3.1.5) (2024-04-09) -[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v3.1.4...HEAD) +[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v3.1.4...v3.1.5) - Carbon strategies are duplicated from events [\#521](https://github.com/bancorprotocol/fastlane-bot/issues/521) +- Add support for puffs\_penthouse uniswap\_v3 fork [\#524](https://github.com/bancorprotocol/fastlane-bot/pull/524) ([NIXBNT](https://github.com/NIXBNT)) + ## [v3.1.4](https://github.com/bancorprotocol/fastlane-bot/tree/v3.1.4) (2024-04-08) [Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v3.1.3...v3.1.4) - GPU token external liquidity not found [\#515](https://github.com/bancorprotocol/fastlane-bot/issues/515) +- Hotfix - Carbon strategies duplicated [\#522](https://github.com/bancorprotocol/fastlane-bot/pull/522) ([Lesigh-3100](https://github.com/Lesigh-3100)) ## [v3.1.3](https://github.com/bancorprotocol/fastlane-bot/tree/v3.1.3) (2024-04-04) [Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v3.1.2...v3.1.3) +- gpu external sources added to event mapping [\#517](https://github.com/bancorprotocol/fastlane-bot/pull/517) ([NIXBNT](https://github.com/NIXBNT)) + Closed issues - All files should have doc strings [\#438](https://github.com/bancorprotocol/fastlane-bot/issues/438) From 78fa219d50c37ad4667837bd57ab53eea4d02ac1 Mon Sep 17 00:00:00 2001 From: Doron Zavelevsky Date: Thu, 11 Apr 2024 03:48:40 +0100 Subject: [PATCH 7/7] github action support for testing more networks [skip ci] --- .github/workflows/run-pytest.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/run-pytest.yml b/.github/workflows/run-pytest.yml index ecc112a7a..61c31d440 100644 --- a/.github/workflows/run-pytest.yml +++ b/.github/workflows/run-pytest.yml @@ -34,6 +34,9 @@ jobs: run: | echo TENDERLY_FORK=$TENDERLY_FORK > .env echo WEB3_ALCHEMY_PROJECT_ID=$WEB3_ALCHEMY_PROJECT_ID >> .env + echo WEB3_ALCHEMY_BASE=$WEB3_ALCHEMY_BASE >> .env + echo WEB3_FANTOM=$WEB3_FANTOM >> .env + echo WEB3_MANTLE=$WEB3_MANTLE >> .env echo ETHERSCAN_TOKEN=$ETHERSCAN_TOKEN >> .env echo DEFAULT_MIN_PROFIT_BNT=$DEFAULT_MIN_PROFIT_BNT >> .env echo ETH_PRIVATE_KEY_BE_CAREFUL=$ETH_PRIVATE_KEY_BE_CAREFUL >> .env @@ -41,6 +44,9 @@ jobs: env: TENDERLY_FORK: '${{ secrets.TENDERLY_FORK }}' WEB3_ALCHEMY_PROJECT_ID: '${{ secrets.WEB3_ALCHEMY_PROJECT_ID }}' + WEB3_ALCHEMY_BASE: '${{ secrets.WEB3_ALCHEMY_BASE }}' + WEB3_FANTOM: '${{ secrets.WEB3_FANTOM }}' + WEB3_MANTLE: '${{ secrets.WEB3_MANTLE }}' ETHERSCAN_TOKEN: '${{ secrets.ETHERSCAN_TOKEN }}' DEFAULT_MIN_PROFIT_BNT: '${{ secrets.DEFAULT_MIN_PROFIT_BNT }}' ETH_PRIVATE_KEY_BE_CAREFUL: '${{ secrets.ETH_PRIVATE_KEY_BE_CAREFUL }}'