fix: rebase conflicts

bancorprotocol · May 7, 2024 · 23fe78a · 23fe78a
1 parent f47ab4d
commit 23fe78a
Show file tree

Hide file tree

Showing 8 changed files with 468 additions and 3,542 deletions.
diff --git a/fastlane_bot/bot.py b/fastlane_bot/bot.py
@@ -55,7 +55,7 @@
 from typing import Generator, List, Dict, Tuple, Any, Callable
 from typing import Optional
 
-from arb_optimizer import ConstantProductCurve as CPC
+from arb_optimizer import CurveContainer, ConstantProductCurve as CPC
 
 from fastlane_bot.config import Config
 from fastlane_bot.helpers import (

diff --git a/fastlane_bot/modes/pairwise_multi_all.py b/fastlane_bot/modes/pairwise_multi_all.py
@@ -13,7 +13,7 @@
 
 import pandas as pd
 
-from arb_optimizer import PairOptimizer
+from arb_optimizer import CurveContainer, PairOptimizer
 
 from fastlane_bot.modes.base_pairwise import ArbitrageFinderPairwiseBase
 

diff --git a/fastlane_bot/tools/curves/__init__.py b/fastlane_bot/tools/curves/__init__.py