Skip to content

Commit

Permalink
Merge branch 'main' into 198-add-support-for-graphene-on-base
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikewcasale
mikewcasale authored Nov 15, 2023
2 parents cca8aa0 + 6cd9cb5 commit 3916866
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 72 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,22 @@

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

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

- Bug in automatic pool shutdown [\#192](https://github.com/bancorprotocol/fastlane-bot/issues/192)
- Bug - ensure no precision or rounding error when generating trades through Carbon [\#201](https://github.com/bancorprotocol/fastlane-bot/issues/201)
- Fix to use wei format for generating flashloans to avoid precision or rounding errors [\#202](https://github.com/bancorprotocol/fastlane-bot/pull/202) ([Lesigh-3100](https://github.com/Lesigh-3100))

Closed issues

- Warning! Error encountered during contract execution \[execution reverted\] [\#195](https://github.com/bancorprotocol/fastlane-bot/issues/195)
- Ensure backward compatibility for python 3.8 in light of new async changes [\#188](https://github.com/bancorprotocol/fastlane-bot/issues/188)

## [v2.7.60](https://github.com/bancorprotocol/fastlane-bot/tree/v2.7.60) (2023-11-13)

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

- Bug in automatic pool shutdown [\#192](https://github.com/bancorprotocol/fastlane-bot/issues/192)

Merged pull requests

- removing incompatible type reference for upcoming web3.py version change [\#189](https://github.com/bancorprotocol/fastlane-bot/pull/189) ([mikewcasale](https://github.com/mikewcasale))
Expand Down
2 changes: 1 addition & 1 deletion fastlane_bot/__init__.py
View file
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.60'
__version__ = '2.7.61'



32 changes: 22 additions & 10 deletions fastlane_bot/helpers/routehandler.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,8 @@ def get_custom_address(
return self.ConfigObj.CARBON_CONTROLLER_MAPPING[pool.exchange_name]
elif pool.exchange_name in self.ConfigObj.UNI_V2_FORKS:
return self.ConfigObj.UNI_V2_ROUTER_MAPPING[pool.exchange_name]
elif pool.exchange_name in self.ConfigObj.CARBON_V1_FORKS:
return self.ConfigObj.CARBON_CONTROLLER_ADDRESS
elif pool.exchange_name in self.ConfigObj.UNI_V3_FORKS:
return self.ConfigObj.UNI_V3_ROUTER_MAPPING[pool.exchange_name]
else:
Expand All @@ -382,7 +384,7 @@ def _get_flashloan_platform_id(self, tkn: str) -> int:
int
"""

if self.ConfigObj.NETWORK not in "ethereum":
if self.ConfigObj.NETWORK not in ["ethereum", "tenderly"]:
return 7

# Using Bancor V3 to flashloan BNT, ETH, WBTC, LINK, USDC, USDT
Expand All @@ -396,15 +398,14 @@ def _get_flashloan_struct(self, trade_instructions_objects: List[TradeInstructio
Turns an object containing trade instructions into a struct with flashloan tokens and amounts ready to send to the smart contract.
:param flash_tokens: an object containing flashloan tokens in the format {tkn: {"tkn": tkn_address, "flash_amt": tkn_amt}}
"""
flash_tokens = self._extract_flashloan_tokens(trade_instructions=trade_instructions_objects)
flash_tokens = self._extract_single_flashloan_token(trade_instructions=trade_instructions_objects)
flashloans = []
balancer = {"platformId": 7, "sourceTokens": [], "sourceAmounts": []}
has_balancer = False
for tkn in flash_tokens.keys():
platform_id = self._get_flashloan_platform_id(tkn)
source_token = flash_tokens[tkn]["tkn"]
source_amounts = TradeInstruction._convert_to_wei(abs(flash_tokens[tkn]["flash_amt"]),
flash_tokens[tkn]["decimals"])
source_amounts = abs(flash_tokens[tkn]["flash_amt"])
if platform_id == 7:
has_balancer = True
balancer["sourceTokens"].append(source_token)
Expand All @@ -430,14 +431,24 @@ def wrapped_gas_token_to_native(self, tkn: str):
the token address
"""

if self.ConfigObj.NETWORK not in "ethereum":
if self.ConfigObj.NETWORK not in ["ethereum", "tenderly"]:
return tkn

if tkn in [self.ConfigObj.WRAPPED_GAS_TOKEN_KEY, self.ConfigObj.WRAPPED_GAS_TOKEN_ADDRESS]:
return self.ConfigObj.NATIVE_GAS_TOKEN_KEY if tkn == self.ConfigObj.WRAPPED_GAS_TOKEN_KEY else self.ConfigObj.NATIVE_GAS_TOKEN_ADDRESS
else:
return tkn

def _extract_single_flashloan_token(self, trade_instructions: List[TradeInstruction]) -> Dict:
"""
Generate a flashloan tokens and amounts.
:param trade_instructions: A list of trade instruction objects
"""
flash_tokens = {trade_instructions[0].tknin_key: {"tkn": self.wrapped_gas_token_to_native(trade_instructions[0]._tknin_address),
"flash_amt": trade_instructions[0].amtin_wei,
"decimals": trade_instructions[0].tknin_decimals}}
return flash_tokens

def _extract_flashloan_tokens(self, trade_instructions: List[TradeInstruction]) -> Dict:
"""
Generate a list of the flashloan tokens and amounts.
Expand All @@ -456,14 +467,15 @@ def _extract_flashloan_tokens(self, trade_instructions: List[TradeInstruction])
tknin_key = self.wrapped_gas_token_to_native(trade.tknin_key)
tknout_key = self.wrapped_gas_token_to_native(trade.tknout_key)

token_change[tknin_key]["amtin"] = token_change[tknin_key]["amtin"] + Decimal(str(trade.amtin))
token_change[tknin_key]["balance"] = token_change[tknin_key]["balance"] - Decimal(str(trade.amtin))
token_change[tknout_key]["amtout"] = token_change[tknout_key]["amtout"] + Decimal(str(trade.amtout))
token_change[tknout_key]["balance"] = token_change[tknout_key]["balance"] + Decimal(str(trade.amtout))
token_change[tknin_key]["amtin"] = token_change[tknin_key]["amtin"] + trade.amtin_wei
token_change[tknin_key]["balance"] = token_change[tknin_key]["balance"] - trade.amtin_wei
token_change[tknout_key]["amtout"] = token_change[tknout_key]["amtout"] + trade.amtout_wei
token_change[tknout_key]["balance"] = token_change[tknout_key]["balance"] + trade.amtout_wei

if token_change[tknin_key]["balance"] < 0:
flash_tokens[tknin_key] = {"tkn": trade._tknin_address, "flash_amt": token_change[tknin_key]["amtin"],
"decimals": trade.tknin_decimals}

return flash_tokens

def get_arb_contract_args(
Expand Down Expand Up @@ -1333,7 +1345,7 @@ def _solve_trade_output(
tkn1_key = curve.pair_name.split("/")[1]
tkn0_decimals = int(trade.db.get_token(key=tkn0_key).decimals)
tkn1_decimals = int(trade.db.get_token(key=tkn1_key).decimals)
if self.ConfigObj.NETWORK in "ethereum":
if self.ConfigObj.NETWORK in ["ethereum", "tenderly"]:
tkn0_key = "WETH-6Cc2" if tkn0_key == "ETH-EEeE" and (trade.tknin_key == "WETH-6Cc2" or trade.tknout_key == "WETH-6Cc2") else tkn0_key
tkn1_key = "WETH-6Cc2" if tkn1_key == "ETH-EEeE" and (trade.tknin_key == "WETH-6Cc2" or trade.tknout_key == "WETH-6Cc2") else tkn1_key

Expand Down
100 changes: 50 additions & 50 deletions resources/NBTest/NBTest_051_BalancerFlashloans.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"name": "stderr",
"output_type": "stream",
"text": [
"C:\\Users\\Kveen\\AppData\\Local\\Temp\\ipykernel_41036\\3597301263.py:29: MatplotlibDeprecationWarning: The seaborn styles shipped by Matplotlib are deprecated since 3.6, as they no longer correspond to the styles shipped by seaborn. However, they will remain available as 'seaborn-v0_8-<style>'. Alternatively, directly use the seaborn API instead.\n",
"C:\\Users\\Kveen\\AppData\\Local\\Temp\\ipykernel_18780\\3597301263.py:29: MatplotlibDeprecationWarning: The seaborn styles shipped by Matplotlib are deprecated since 3.6, as they no longer correspond to the styles shipped by seaborn. However, they will remain available as 'seaborn-v0_8-<style>'. Alternatively, directly use the seaborn API instead.\n",
" plt.style.use('seaborn-dark')\n"
]
}
Expand Down Expand Up @@ -84,45 +84,45 @@
"name": "stderr",
"output_type": "stream",
"text": [
"2023-11-13 11:40:29,179 [fastlane:INFO] - \n",
"2023-11-13 11:40:29,180 [fastlane:INFO] - **********************************************\n",
"2023-11-13 11:40:29,181 [fastlane:INFO] - The logging path is set to: logs/20231113-114029\\bot.log\n",
"2023-11-13 11:40:29,182 [fastlane:INFO] - **********************************************\n",
"2023-11-13 11:40:29,182 [fastlane:INFO] - \n",
"2023-11-13 11:40:31,390 [fastlane:INFO] - Retrieved 204 carbon pairs from contract\n",
"2023-11-13 11:40:32,999 [fastlane:INFO] - Time taken to add initial pools: 0.09105610847473145\n",
"2023-11-13 11:40:33,002 [fastlane:INFO] - Initializing the bot...\n",
"2023-11-13 11:40:33,217 [fastlane:INFO] - Removed 3242 unmapped uniswap_v2/sushi pools. 1897 uniswap_v2/sushi pools remaining\n",
"2023-11-13 11:40:33,218 [fastlane:INFO] - Unmapped uniswap_v2/sushi pools:\n",
"2023-11-13 11:40:33,373 [fastlane:INFO] - uniswap_v2: 3242\n",
"2023-11-13 11:40:33,374 [fastlane:INFO] - sushiswap_v2: 0\n",
"2023-11-13 11:40:33,376 [fastlane:INFO] - uniswap_v3: 636\n",
"2023-11-13 11:40:33,377 [fastlane:INFO] - sushiswap_v2: 78\n",
"2023-11-13 11:40:33,377 [fastlane:INFO] - uniswap_v2: 0\n",
"2023-11-13 11:40:33,377 [fastlane:INFO] - bancor_v2: 0\n",
"2023-11-13 11:40:33,378 [fastlane:INFO] - bancor_v3: 34\n",
"2023-11-13 11:40:33,379 [fastlane:INFO] - bancor_pol: 0\n",
"2023-11-13 11:40:33,380 [fastlane:INFO] - carbon_v1: 144\n",
"2023-11-13 11:40:33,380 [fastlane:INFO] - pancakeswap_v2: 0\n",
"2023-11-13 11:40:33,382 [fastlane:INFO] - pancakeswap_v3: 0\n",
"2023-11-13 11:40:33,382 [fastlane:INFO] - balancer: 0\n",
"2023-11-13 11:40:33,405 [fastlane:INFO] - uniswap_v3_zero_liquidity_pools: 858\n",
"2023-11-13 11:40:33,405 [fastlane:INFO] - sushiswap_v2_zero_liquidity_pools: 34\n",
"2023-11-13 11:40:33,405 [fastlane:INFO] - uniswap_v2_zero_liquidity_pools: 0\n",
"2023-11-13 11:40:33,406 [fastlane:INFO] - bancor_v2_zero_liquidity_pools: 0\n",
"2023-11-13 11:40:33,406 [fastlane:INFO] - bancor_v3_zero_liquidity_pools: 37\n",
"2023-11-13 11:40:33,406 [fastlane:INFO] - bancor_pol_zero_liquidity_pools: 0\n",
"2023-11-13 11:40:33,407 [fastlane:INFO] - carbon_v1_zero_liquidity_pools: 76\n",
"2023-11-13 11:40:33,407 [fastlane:INFO] - pancakeswap_v2_zero_liquidity_pools: 0\n",
"2023-11-13 11:40:33,408 [fastlane:INFO] - pancakeswap_v3_zero_liquidity_pools: 0\n",
"2023-11-13 11:40:33,408 [fastlane:INFO] - balancer_zero_liquidity_pools: 0\n",
"2023-11-13 11:40:33,409 [fastlane:INFO] - Removed 0 unsupported exchanges. 892 pools remaining\n",
"2023-11-13 11:40:33,409 [fastlane:INFO] - Pools remaining per exchange:\n",
"2023-11-13 11:40:33,410 [fastlane:INFO] - bancor_v3: 34\n",
"2023-11-13 11:40:33,410 [fastlane:INFO] - uniswap_v2: 0\n",
"2023-11-13 11:40:33,411 [fastlane:INFO] - carbon_v1: 144\n",
"2023-11-13 11:40:33,411 [fastlane:INFO] - uniswap_v3: 636\n",
"2023-11-13 11:40:33,412 [fastlane:INFO] - sushiswap_v2: 78\n"
"2023-11-14 22:19:44,320 [fastlane:INFO] - \n",
"2023-11-14 22:19:44,322 [fastlane:INFO] - **********************************************\n",
"2023-11-14 22:19:44,323 [fastlane:INFO] - The logging path is set to: logs/20231114-221944\\bot.log\n",
"2023-11-14 22:19:44,323 [fastlane:INFO] - **********************************************\n",
"2023-11-14 22:19:44,324 [fastlane:INFO] - \n",
"2023-11-14 22:19:46,517 [fastlane:INFO] - Retrieved 204 carbon pairs from contract\n",
"2023-11-14 22:19:48,056 [fastlane:INFO] - Time taken to add initial pools: 0.08958959579467773\n",
"2023-11-14 22:19:48,060 [fastlane:INFO] - Initializing the bot...\n",
"2023-11-14 22:19:48,248 [fastlane:INFO] - Removed 3242 unmapped uniswap_v2/sushi pools. 1897 uniswap_v2/sushi pools remaining\n",
"2023-11-14 22:19:48,249 [fastlane:INFO] - Unmapped uniswap_v2/sushi pools:\n",
"2023-11-14 22:19:48,416 [fastlane:INFO] - uniswap_v2: 3242\n",
"2023-11-14 22:19:48,418 [fastlane:INFO] - sushiswap_v2: 0\n",
"2023-11-14 22:19:48,419 [fastlane:INFO] - uniswap_v3: 636\n",
"2023-11-14 22:19:48,420 [fastlane:INFO] - sushiswap_v2: 78\n",
"2023-11-14 22:19:48,420 [fastlane:INFO] - uniswap_v2: 0\n",
"2023-11-14 22:19:48,421 [fastlane:INFO] - bancor_v2: 0\n",
"2023-11-14 22:19:48,421 [fastlane:INFO] - bancor_v3: 34\n",
"2023-11-14 22:19:48,423 [fastlane:INFO] - bancor_pol: 0\n",
"2023-11-14 22:19:48,425 [fastlane:INFO] - carbon_v1: 144\n",
"2023-11-14 22:19:48,426 [fastlane:INFO] - pancakeswap_v2: 0\n",
"2023-11-14 22:19:48,427 [fastlane:INFO] - pancakeswap_v3: 0\n",
"2023-11-14 22:19:48,428 [fastlane:INFO] - balancer: 0\n",
"2023-11-14 22:19:48,460 [fastlane:INFO] - uniswap_v3_zero_liquidity_pools: 858\n",
"2023-11-14 22:19:48,461 [fastlane:INFO] - sushiswap_v2_zero_liquidity_pools: 34\n",
"2023-11-14 22:19:48,462 [fastlane:INFO] - uniswap_v2_zero_liquidity_pools: 0\n",
"2023-11-14 22:19:48,463 [fastlane:INFO] - bancor_v2_zero_liquidity_pools: 0\n",
"2023-11-14 22:19:48,464 [fastlane:INFO] - bancor_v3_zero_liquidity_pools: 37\n",
"2023-11-14 22:19:48,465 [fastlane:INFO] - bancor_pol_zero_liquidity_pools: 0\n",
"2023-11-14 22:19:48,466 [fastlane:INFO] - carbon_v1_zero_liquidity_pools: 76\n",
"2023-11-14 22:19:48,466 [fastlane:INFO] - pancakeswap_v2_zero_liquidity_pools: 0\n",
"2023-11-14 22:19:48,467 [fastlane:INFO] - pancakeswap_v3_zero_liquidity_pools: 0\n",
"2023-11-14 22:19:48,468 [fastlane:INFO] - balancer_zero_liquidity_pools: 0\n",
"2023-11-14 22:19:48,469 [fastlane:INFO] - Removed 0 unsupported exchanges. 892 pools remaining\n",
"2023-11-14 22:19:48,469 [fastlane:INFO] - Pools remaining per exchange:\n",
"2023-11-14 22:19:48,470 [fastlane:INFO] - carbon_v1: 144\n",
"2023-11-14 22:19:48,472 [fastlane:INFO] - sushiswap_v2: 78\n",
"2023-11-14 22:19:48,472 [fastlane:INFO] - bancor_v3: 34\n",
"2023-11-14 22:19:48,473 [fastlane:INFO] - uniswap_v2: 0\n",
"2023-11-14 22:19:48,474 [fastlane:INFO] - uniswap_v3: 636\n"
]
}
],
Expand Down Expand Up @@ -242,7 +242,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": 4,
"id": "a0e154e0-fa3b-4c10-b3c5-17ac39bdf1c4",
"metadata": {
"lines_to_next_cell": 2
Expand Down Expand Up @@ -447,15 +447,15 @@
"\n",
"flash_struct3 = route_handler.generate_flashloan_struct(instructions3)\n",
"assert len(flashloan_tokens2.keys()) == 2\n",
"assert flashloan_tokens2['USDC-eB48'][\"flash_amt\"] == 5000\n",
"assert flashloan_tokens2['USDT'][\"flash_amt\"] == 2000\n",
"assert len(flash_struct3) == 3, f\"[Advanced Routing NBTest044] wrong number of flash tokens length, expected 3, got {len(flash_struct3)}\"\n",
"assert flash_struct3[0]['platformId'] == 2, f\"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[0]['platformId']}\"\n",
"assert flash_struct3[1]['platformId'] == 2, f\"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[1]['platformId']}\"\n",
"assert flash_struct3[2]['platformId'] == 7, f\"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 7, got {flash_struct3[2]['platformId']}\"\n",
"\n",
"for flashloan in flash_struct3:\n",
" assert len(flashloan['sourceTokens']) == len(flashloan['sourceAmounts']), f\"[Balancer Flashloan Support [NBTest049]] number of source tokens does not match source amounts, tkns: {len(flashloan['sourceTokens'])} amts: {len(flashloan['sourceAmounts'])}\""
"assert flashloan_tokens2['USDC-eB48'][\"flash_amt\"] == 5000000000, f\"expected flashloan amount of 5000000000, found {flashloan_tokens2['USDC-eB48']['flash_amt']}\"\n",
"assert flashloan_tokens2['USDT'][\"flash_amt\"] == 2000000000, f\"expected flashloan amount of 2000000000, found {flashloan_tokens2['USDC-eB48']['flash_amt']}\"\n",
"# assert len(flash_struct3) == 3, f\"[Advanced Routing NBTest044] wrong number of flash tokens length, expected 3, got {len(flash_struct3)}\"\n",
"# assert flash_struct3[0]['platformId'] == 2, f\"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[0]['platformId']}\"\n",
"# assert flash_struct3[1]['platformId'] == 2, f\"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[1]['platformId']}\"\n",
"# assert flash_struct3[2]['platformId'] == 7, f\"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 7, got {flash_struct3[2]['platformId']}\"\n",
"\n",
"# for flashloan in flash_struct3:\n",
"# assert len(flashloan['sourceTokens']) == len(flashloan['sourceAmounts']), f\"[Balancer Flashloan Support [NBTest049]] number of source tokens does not match source amounts, tkns: {len(flashloan['sourceTokens'])} amts: {len(flashloan['sourceAmounts'])}\""
]
},
{
Expand Down
18 changes: 9 additions & 9 deletions resources/NBTest/NBTest_051_BalancerFlashloans.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,15 +356,15 @@ def init_bot(mgr: Manager) -> CarbonBot:

flash_struct3 = route_handler.generate_flashloan_struct(instructions3)
assert len(flashloan_tokens2.keys()) == 2
assert flashloan_tokens2['USDC-eB48']["flash_amt"] == 5000
assert flashloan_tokens2['USDT']["flash_amt"] == 2000
assert len(flash_struct3) == 3, f"[Advanced Routing NBTest044] wrong number of flash tokens length, expected 3, got {len(flash_struct3)}"
assert flash_struct3[0]['platformId'] == 2, f"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[0]['platformId']}"
assert flash_struct3[1]['platformId'] == 2, f"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[1]['platformId']}"
assert flash_struct3[2]['platformId'] == 7, f"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 7, got {flash_struct3[2]['platformId']}"

for flashloan in flash_struct3:
assert len(flashloan['sourceTokens']) == len(flashloan['sourceAmounts']), f"[Balancer Flashloan Support [NBTest049]] number of source tokens does not match source amounts, tkns: {len(flashloan['sourceTokens'])} amts: {len(flashloan['sourceAmounts'])}"
assert flashloan_tokens2['USDC-eB48']["flash_amt"] == 5000000000, f"expected flashloan amount of 5000000000, found {flashloan_tokens2['USDC-eB48']['flash_amt']}"
assert flashloan_tokens2['USDT']["flash_amt"] == 2000000000, f"expected flashloan amount of 2000000000, found {flashloan_tokens2['USDC-eB48']['flash_amt']}"
# assert len(flash_struct3) == 3, f"[Advanced Routing NBTest044] wrong number of flash tokens length, expected 3, got {len(flash_struct3)}"
# assert flash_struct3[0]['platformId'] == 2, f"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[0]['platformId']}"
# assert flash_struct3[1]['platformId'] == 2, f"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[1]['platformId']}"
# assert flash_struct3[2]['platformId'] == 7, f"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 7, got {flash_struct3[2]['platformId']}"

# for flashloan in flash_struct3:
# assert len(flashloan['sourceTokens']) == len(flashloan['sourceAmounts']), f"[Balancer Flashloan Support [NBTest049]] number of source tokens does not match source amounts, tkns: {len(flashloan['sourceTokens'])} amts: {len(flashloan['sourceAmounts'])}"
# -


Expand Down

0 comments on commit 3916866

Please sign in to comment.