From 526f0ac72b39f2db42a2d624b4e57105312507dc Mon Sep 17 00:00:00 2001 From: NIXBNT <88088888+NIXBNT@users.noreply.github.com> Date: Thu, 4 Apr 2024 11:00:17 +1100 Subject: [PATCH 1/9] gpu external sources added to event mapping --- .../blockchain_data/ethereum/uniswap_v2_event_mappings.csv | 1 + .../blockchain_data/ethereum/uniswap_v3_event_mappings.csv | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fastlane_bot/data/blockchain_data/ethereum/uniswap_v2_event_mappings.csv b/fastlane_bot/data/blockchain_data/ethereum/uniswap_v2_event_mappings.csv index 74c939435..5c9515098 100644 --- a/fastlane_bot/data/blockchain_data/ethereum/uniswap_v2_event_mappings.csv +++ b/fastlane_bot/data/blockchain_data/ethereum/uniswap_v2_event_mappings.csv @@ -290647,3 +290647,4 @@ Unnamed: 0,exchange,address ,pancakeswap_v2,0xF35bD23a6Acea6E7AE4aD08D8c57cba4Ea147257 ,pancakeswap_v2,0xa4843930053BA36aD96d1cB6623a646eBB38f5a9 ,pancakeswap_v2,0x9b0B62e7f964A7c8D93f27BBd2e4Cc7660886813 +,uniswap_v2,0x769f539486b31eF310125C44d7F405C6d470cD1f \ No newline at end of file diff --git a/fastlane_bot/data/blockchain_data/ethereum/uniswap_v3_event_mappings.csv b/fastlane_bot/data/blockchain_data/ethereum/uniswap_v3_event_mappings.csv index 30d70b019..1a15b11dc 100644 --- a/fastlane_bot/data/blockchain_data/ethereum/uniswap_v3_event_mappings.csv +++ b/fastlane_bot/data/blockchain_data/ethereum/uniswap_v3_event_mappings.csv @@ -18249,4 +18249,5 @@ Unnamed: 0,exchange,address ,pancakeswap_v3,0xA436B68605D03e20C95aD93DD74eDcc447AC785F ,pancakeswap_v3,0x4689e3C91036437A46A6c8B62157F58210Ba67a7 ,pancakeswap_v3,0x3A2195f4760e89e5B753fd3521a236b6a9f72EBB -,uniswap_v3,0xeed4603BC333EF406E5EB691BA66798d5c857d8B \ No newline at end of file +,uniswap_v3,0xeed4603BC333EF406E5EB691BA66798d5c857d8B +,uniswap_v3,0xD572D276b699947A043C85f8d66Ce311CC85E357 \ No newline at end of file From 274525aefda7ba68bb8b3c36bbad558bfc2917f5 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 4 Apr 2024 06:58:10 +0000 Subject: [PATCH 2/9] 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 1b1dbc220..83856acb8 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.2" +__version__ = "3.1.3" From 49e3427d927282c6047ba1b9af84d6cf86fc9327 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 4 Apr 2024 06:58:33 +0000 Subject: [PATCH 3/9] Update changelog [skip ci] --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 993b1ddb6..8772874a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,20 @@ # Changelog +## [Unreleased](https://github.com/bancorprotocol/fastlane-bot/tree/HEAD) + +[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v3.1.2...HEAD) + +Closed issues + +- All files should have doc strings [\#438](https://github.com/bancorprotocol/fastlane-bot/issues/438) + ## [v3.1.2](https://github.com/bancorprotocol/fastlane-bot/tree/v3.1.2) (2024-04-01) [Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v3.1.1...v3.1.2) -- Pool-Type not handled correctly after changing input from None to '' [\#509](https://github.com/bancorprotocol/fastlane-bot/issues/509) +Merged pull requests + +- Fix issue 509 [\#510](https://github.com/bancorprotocol/fastlane-bot/pull/510) ([barakman](https://github.com/barakman)) ## [v3.1.1](https://github.com/bancorprotocol/fastlane-bot/tree/v3.1.1) (2024-03-27) From cc35d1d25ef524131d5e5bfd3e15e8beefb74677 Mon Sep 17 00:00:00 2001 From: Lesigh-3100 Date: Sun, 7 Apr 2024 19:44:02 +0300 Subject: [PATCH 4/9] Update pools.py --- fastlane_bot/events/managers/pools.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fastlane_bot/events/managers/pools.py b/fastlane_bot/events/managers/pools.py index 084a554a5..9b8890129 100644 --- a/fastlane_bot/events/managers/pools.py +++ b/fastlane_bot/events/managers/pools.py @@ -14,6 +14,7 @@ from fastlane_bot.events.interface import Pool from fastlane_bot.events.managers.base import BaseManager from fastlane_bot.events.pools import pool_factory +from fastlane_bot.events.pools.utils import get_pool_cid class PoolManager(BaseManager): @@ -282,11 +283,7 @@ def add_pool_info( pool_info.update(other_args) # Update cid if necessary - unique_id = pool_info["descr"] if pool_info['exchange_name'] not in self.cfg.CARBON_V1_FORKS else ( - f"{pool_info['exchange_name']} {pool_info['strategy_id']} {pool_info['fee']}" - ) - pool_info["cid"] = self.pool_cid_from_descr(self.web3, unique_id) - + pool_info["cid"] = get_pool_cid(pool_info, self.cfg.CARBON_V1_FORKS) # Add pool to exchange if necessary pool = self.get_or_init_pool(pool_info) assert pool, f"Pool not found in {exchange_name} pools" From 6a88fb7852b6efb394d90690e63a01508c346f39 Mon Sep 17 00:00:00 2001 From: NIXBNT <88088888+NIXBNT@users.noreply.github.com> Date: Mon, 8 Apr 2024 11:23:04 +1000 Subject: [PATCH 5/9] add puffs_penthouse_v3 staticdata --- fastlane_bot/data/blockchain_data/mantle/static_pool_data.csv | 4 ++++ .../data/blockchain_data/mantle/uniswap_v3_event_mappings.csv | 4 ++++ fastlane_bot/data/multichain_addresses.csv | 1 + 3 files changed, 9 insertions(+) diff --git a/fastlane_bot/data/blockchain_data/mantle/static_pool_data.csv b/fastlane_bot/data/blockchain_data/mantle/static_pool_data.csv index 1010ebb25..e5df94f78 100644 --- a/fastlane_bot/data/blockchain_data/mantle/static_pool_data.csv +++ b/fastlane_bot/data/blockchain_data/mantle/static_pool_data.csv @@ -1151,3 +1151,7 @@ cid,strategy_id,last_updated,last_updated_block,descr,pair_name,exchange_name,fe 0x3B752bE1bC07bc5A5FF2f3129203f6dC567088bc,0,,38629155,velocimeter_v2 0x78c1b0C915c4FAA5FffA6CAbf0219DA63d7f4cb8/0xEB466342C4d449BC9f53A865D5Cb90586f405215,0x78c1b0C915c4FAA5FffA6CAbf0219DA63d7f4cb8/0xEB466342C4d449BC9f53A865D5Cb90586f405215,velocimeter_v2,0.0025,0.0025,0x3B752bE1bC07bc5A5FF2f3129203f6dC567088bc,,0x78c1b0C915c4FAA5FffA6CAbf0219DA63d7f4cb8,0xEB466342C4d449BC9f53A865D5Cb90586f405215,18,6,11,WMNT,AXLUSDC,0,0,0,,,,,velocimeter_v2,volatile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 0xFB5DBe1fc5c115492Bd486796A860d73c3C948B7,0,,48364886,velocimeter_v2 0x78c1b0C915c4FAA5FffA6CAbf0219DA63d7f4cb8/0x7e51aD847CDf8729Efc97CFa6E8aFA4D658Cb85b,0x78c1b0C915c4FAA5FffA6CAbf0219DA63d7f4cb8/0x7e51aD847CDf8729Efc97CFa6E8aFA4D658Cb85b,velocimeter_v2,0.02,0.02,0xFB5DBe1fc5c115492Bd486796A860d73c3C948B7,,0x78c1b0C915c4FAA5FffA6CAbf0219DA63d7f4cb8,0x7e51aD847CDf8729Efc97CFa6E8aFA4D658Cb85b,18,18,11,WMNT,lz-fMULTI,0,0,0,,,,,velocimeter_v2,volatile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, 0xB45377d54656ac36018dF454950Ebb68B75A08c6,0,,49450176,velocimeter_v2 0x7e51aD847CDf8729Efc97CFa6E8aFA4D658Cb85b/0xdEAddEaDdeadDEadDEADDEAddEADDEAddead1111,0x7e51aD847CDf8729Efc97CFa6E8aFA4D658Cb85b/0xdEAddEaDdeadDEadDEADDEAddEADDEAddead1111,velocimeter_v2,0.02,0.02,0xB45377d54656ac36018dF454950Ebb68B75A08c6,,0x7e51aD847CDf8729Efc97CFa6E8aFA4D658Cb85b,0xdEAddEaDdeadDEadDEADDEAddEADDEAddead1111,18,18,11,lz-fMULTI,WETH,0,0,0,,,,,velocimeter_v2,volatile,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +0x866B1818D6A221fA2B87A6C10bf60871d09C71A4,0,,59940322,puffs_penthouse_v3 0x09Bc4E0D864854c6aFB6eB9A9cdF58aC190D0dF9/0x78c1b0C915c4FAA5FffA6CAbf0219DA63d7f4cb 3000,0x09Bc4E0D864854c6aFB6eB9A9cdF58aC190D0dF9/0x78c1b0C915c4FAA5FffA6CAbf0219DA63d7f4cb,puffs_penthouse_v3,3000,0.003,0x866B1818D6A221fA2B87A6C10bf60871d09C71A4,,0x09Bc4E0D864854c6aFB6eB9A9cdF58aC190D0dF9,0x78c1b0C915c4FAA5FffA6CAbf0219DA63d7f4cb8,6,18,4,USDC,WMNT,0,0,0,0,0,0,60,puffs_penthouse_v3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +0x23d31b3d4A283Fd8E39d64FeeEbc64F6B1eeF874,0,,60094503,puffs_penthouse_v3 0x26a6b0dcdCfb981362aFA56D581e4A7dBA3Be140/0xcDA86A272531e8640cD7F1a92c01839911B90bb 3000,0x26a6b0dcdCfb981362aFA56D581e4A7dBA3Be140/0xcDA86A272531e8640cD7F1a92c01839911B90bb,puffs_penthouse_v3,3000,0.003,0x23d31b3d4A283Fd8E39d64FeeEbc64F6B1eeF874,,0x26a6b0dcdCfb981362aFA56D581e4A7dBA3Be140,0xcDA86A272531e8640cD7F1a92c01839911B90bb0,18,18,4,PUFF,METH,0,0,0,0,0,0,60,puffs_penthouse_v3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +0x28190bC18bbdc3D340C9A8C80265096E3A7f7EdA,0,,61305447,puffs_penthouse_v3 0x201EBa5CC46D216Ce6DC03F6a759e8E766e956aE/0xcDA86A272531e8640cD7F1a92c01839911B90bb 3000,0x201EBa5CC46D216Ce6DC03F6a759e8E766e956aE/0xcDA86A272531e8640cD7F1a92c01839911B90bb,puffs_penthouse_v3,3000,0.003,0x28190bC18bbdc3D340C9A8C80265096E3A7f7EdA,,0x201EBa5CC46D216Ce6DC03F6a759e8E766e956aE,0xcDA86A272531e8640cD7F1a92c01839911B90bb0,6,18,4,USDT,METH,0,0,0,0,0,0,60,puffs_penthouse_v3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +0xc0c94deE13fBD76faB0633924f4fA73e12EC3a1A,0,,61310467,puffs_penthouse_v3 0x201EBa5CC46D216Ce6DC03F6a759e8E766e956aE/0x78c1b0C915c4FAA5FffA6CAbf0219DA63d7f4cb 3000,0x201EBa5CC46D216Ce6DC03F6a759e8E766e956aE/0x78c1b0C915c4FAA5FffA6CAbf0219DA63d7f4cb,puffs_penthouse_v3,3000,0.003,0xc0c94deE13fBD76faB0633924f4fA73e12EC3a1A,,0x201EBa5CC46D216Ce6DC03F6a759e8E766e956aE,0x78c1b0C915c4FAA5FffA6CAbf0219DA63d7f4cb8,6,18,4,USDT,WMNT,0,0,0,0,0,0,60,puffs_penthouse_v3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, diff --git a/fastlane_bot/data/blockchain_data/mantle/uniswap_v3_event_mappings.csv b/fastlane_bot/data/blockchain_data/mantle/uniswap_v3_event_mappings.csv index 4e575ef62..846904879 100644 --- a/fastlane_bot/data/blockchain_data/mantle/uniswap_v3_event_mappings.csv +++ b/fastlane_bot/data/blockchain_data/mantle/uniswap_v3_event_mappings.csv @@ -635,3 +635,7 @@ fusionx_v3,0x417Ed45c1ADf3A3eB21fbA7a40A4e2E4c3405050 fusionx_v3,0xbF9B9305E8a59ed2c32bEBcC33B402E5C457E053 fusionx_v3,0xf5c8dD260f4824D92E82e4201b6eC69e67Fdfda4 fusionx_v3,0xB0af0176877736d0E61bA0554F7c8f2D9aEA3a7f +puffs_penthouse_v3,0x866B1818D6A221fA2B87A6C10bf60871d09C71A4 +puffs_penthouse_v3,0x23d31b3d4A283Fd8E39d64FeeEbc64F6B1eeF874 +puffs_penthouse_v3,0x28190bC18bbdc3D340C9A8C80265096E3A7f7EdA +puffs_penthouse_v3,0xc0c94deE13fBD76faB0633924f4fA73e12EC3a1A diff --git a/fastlane_bot/data/multichain_addresses.csv b/fastlane_bot/data/multichain_addresses.csv index 8fc2e6f7b..7e708bd6e 100644 --- a/fastlane_bot/data/multichain_addresses.csv +++ b/fastlane_bot/data/multichain_addresses.csv @@ -78,6 +78,7 @@ sushiswap_v2,harmony,uniswap_v2,0xc35DADB65012eC5796536bD9864eD8773aBc74C4,0x1b0 sushiswap_v2,heco,uniswap_v2,0xc35DADB65012eC5796536bD9864eD8773aBc74C4,0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506,0.003,0, sushiswap_v3,linea,uniswap_v3,0xc35DADB65012eC5796536bD9864eD8773aBc74C4,0xb1E835Dc2785b52265711e17fCCb0fd018226a6e,,, agni_v3,mantle,uniswap_v3,0x25780dc8Fc3cfBD75F33bFDAB65e969b603b2035,0x319B69888b0d11cEC22caA5034e25FfFBDc88421,,110692, +puffs_penthouse_v3,mantle,uniswap_v3,0x8f140Fc3e9211b8DC2fC1D7eE3292F6817C5dD5D,0x58b3a3797FF02B934a7d69D00873889F33Fb8829,,59915640, butter_v3,mantle,uniswap_v3,0xEECa0a86431A7B42ca2Ee5F479832c3D4a4c2644,0xAe5c0a73bAE513fe5842DbcB8E32fc7E3e30DA57,,22966090, carbon_v1,mantle,carbon_v1,0x7900f766F06e361FDDB4FdeBac5b138c4EEd8d4A,0x7900f766F06e361FDDB4FdeBac5b138c4EEd8d4A,,, some_carbon_fork,mantle,carbon_v1,0x3749f6Ef09B0f74CD5324126b02d867A03DEE844,0x3749f6Ef09B0f74CD5324126b02d867A03DEE844,,, From 3606dc8d2a81fd1ac7fe659364ae4d05a58492c8 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 8 Apr 2024 10:38:06 +0000 Subject: [PATCH 6/9] 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 83856acb8..dfd0edfa8 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.3" +__version__ = "3.1.4" From 841281ecea69ce890fa747c2c9bd88f3b7b520ae Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 8 Apr 2024 10:38:30 +0000 Subject: [PATCH 7/9] Update changelog [skip ci] --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8772874a1..c6dc4803b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,13 @@ ## [Unreleased](https://github.com/bancorprotocol/fastlane-bot/tree/HEAD) -[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v3.1.2...HEAD) +[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v3.1.3...HEAD) + +- GPU token external liquidity not found [\#515](https://github.com/bancorprotocol/fastlane-bot/issues/515) + +## [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) Closed issues From f72185119fa4865a00f1a1a80a606f4727746c2c Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 9 Apr 2024 11:59:46 +0000 Subject: [PATCH 8/9] 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 dfd0edfa8..74b32e5cc 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.4" +__version__ = "3.1.5" From 4bcf123b24f75aa61ea49f9af26da163d16a2eae Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 9 Apr 2024 12:00:09 +0000 Subject: [PATCH 9/9] Update changelog [skip ci] --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6dc4803b..ae62ef084 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,13 @@ ## [Unreleased](https://github.com/bancorprotocol/fastlane-bot/tree/HEAD) -[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v3.1.3...HEAD) +[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v3.1.4...HEAD) + +- Carbon strategies are duplicated from events [\#521](https://github.com/bancorprotocol/fastlane-bot/issues/521) + +## [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)