Skip to content
This repository was archived by the owner on Nov 17, 2025. It is now read-only.

Commit 3916866

Browse files
mikewcasalemikewcasale
authored
Merge branch 'main' into 198-add-support-for-graphene-on-base
2 parents cca8aa0 + 6cd9cb5 commit 3916866

File tree

5 files changed

+92
-72
lines changed

5 files changed

+92
-72
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,22 @@
22

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

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

7-
- Bug in automatic pool shutdown [\#192](https://github.com/bancorprotocol/fastlane-bot/issues/192)
7+
- Bug - ensure no precision or rounding error when generating trades through Carbon [\#201](https://github.com/bancorprotocol/fastlane-bot/issues/201)
8+
- 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))
89

910
Closed issues
1011

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

15+
## [v2.7.60](https://github.com/bancorprotocol/fastlane-bot/tree/v2.7.60) (2023-11-13)
16+
17+
[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.59...v2.7.60)
18+
19+
- Bug in automatic pool shutdown [\#192](https://github.com/bancorprotocol/fastlane-bot/issues/192)
20+
1321
Merged pull requests
1422

1523
- removing incompatible type reference for upcoming web3.py version change [\#189](https://github.com/bancorprotocol/fastlane-bot/pull/189) ([mikewcasale](https://github.com/mikewcasale))

‎fastlane_bot/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from .bot import CarbonBot as Bot, __VERSION__, __DATE__
22
from .config import Config, ConfigNetwork, ConfigDB, ConfigLogger, ConfigProvider
33

4-
__version__ = '2.7.60'
4+
__version__ = '2.7.61'
55

66

77

‎fastlane_bot/helpers/routehandler.py‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,8 @@ def get_custom_address(
357357
return self.ConfigObj.CARBON_CONTROLLER_MAPPING[pool.exchange_name]
358358
elif pool.exchange_name in self.ConfigObj.UNI_V2_FORKS:
359359
return self.ConfigObj.UNI_V2_ROUTER_MAPPING[pool.exchange_name]
360+
elif pool.exchange_name in self.ConfigObj.CARBON_V1_FORKS:
361+
return self.ConfigObj.CARBON_CONTROLLER_ADDRESS
360362
elif pool.exchange_name in self.ConfigObj.UNI_V3_FORKS:
361363
return self.ConfigObj.UNI_V3_ROUTER_MAPPING[pool.exchange_name]
362364
else:
@@ -382,7 +384,7 @@ def _get_flashloan_platform_id(self, tkn: str) -> int:
382384
int
383385
"""
384386

385-
if self.ConfigObj.NETWORK not in "ethereum":
387+
if self.ConfigObj.NETWORK not in ["ethereum", "tenderly"]:
386388
return 7
387389

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

433-
if self.ConfigObj.NETWORK not in "ethereum":
434+
if self.ConfigObj.NETWORK not in ["ethereum", "tenderly"]:
434435
return tkn
435436

436437
if tkn in [self.ConfigObj.WRAPPED_GAS_TOKEN_KEY, self.ConfigObj.WRAPPED_GAS_TOKEN_ADDRESS]:
437438
return self.ConfigObj.NATIVE_GAS_TOKEN_KEY if tkn == self.ConfigObj.WRAPPED_GAS_TOKEN_KEY else self.ConfigObj.NATIVE_GAS_TOKEN_ADDRESS
438439
else:
439440
return tkn
440441

442+
def _extract_single_flashloan_token(self, trade_instructions: List[TradeInstruction]) -> Dict:
443+
"""
444+
Generate a flashloan tokens and amounts.
445+
:param trade_instructions: A list of trade instruction objects
446+
"""
447+
flash_tokens = {trade_instructions[0].tknin_key: {"tkn": self.wrapped_gas_token_to_native(trade_instructions[0]._tknin_address),
448+
"flash_amt": trade_instructions[0].amtin_wei,
449+
"decimals": trade_instructions[0].tknin_decimals}}
450+
return flash_tokens
451+
441452
def _extract_flashloan_tokens(self, trade_instructions: List[TradeInstruction]) -> Dict:
442453
"""
443454
Generate a list of the flashloan tokens and amounts.
@@ -456,14 +467,15 @@ def _extract_flashloan_tokens(self, trade_instructions: List[TradeInstruction])
456467
tknin_key = self.wrapped_gas_token_to_native(trade.tknin_key)
457468
tknout_key = self.wrapped_gas_token_to_native(trade.tknout_key)
458469

459-
token_change[tknin_key]["amtin"] = token_change[tknin_key]["amtin"] + Decimal(str(trade.amtin))
460-
token_change[tknin_key]["balance"] = token_change[tknin_key]["balance"] - Decimal(str(trade.amtin))
461-
token_change[tknout_key]["amtout"] = token_change[tknout_key]["amtout"] + Decimal(str(trade.amtout))
462-
token_change[tknout_key]["balance"] = token_change[tknout_key]["balance"] + Decimal(str(trade.amtout))
470+
token_change[tknin_key]["amtin"] = token_change[tknin_key]["amtin"] + trade.amtin_wei
471+
token_change[tknin_key]["balance"] = token_change[tknin_key]["balance"] - trade.amtin_wei
472+
token_change[tknout_key]["amtout"] = token_change[tknout_key]["amtout"] + trade.amtout_wei
473+
token_change[tknout_key]["balance"] = token_change[tknout_key]["balance"] + trade.amtout_wei
463474

464475
if token_change[tknin_key]["balance"] < 0:
465476
flash_tokens[tknin_key] = {"tkn": trade._tknin_address, "flash_amt": token_change[tknin_key]["amtin"],
466477
"decimals": trade.tknin_decimals}
478+
467479
return flash_tokens
468480

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

‎resources/NBTest/NBTest_051_BalancerFlashloans.ipynb‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"name": "stderr",
2626
"output_type": "stream",
2727
"text": [
28-
"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",
28+
"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",
2929
" plt.style.use('seaborn-dark')\n"
3030
]
3131
}
@@ -84,45 +84,45 @@
8484
"name": "stderr",
8585
"output_type": "stream",
8686
"text": [
87-
"2023-11-13 11:40:29,179 [fastlane:INFO] - \n",
88-
"2023-11-13 11:40:29,180 [fastlane:INFO] - **********************************************\n",
89-
"2023-11-13 11:40:29,181 [fastlane:INFO] - The logging path is set to: logs/20231113-114029\\bot.log\n",
90-
"2023-11-13 11:40:29,182 [fastlane:INFO] - **********************************************\n",
91-
"2023-11-13 11:40:29,182 [fastlane:INFO] - \n",
92-
"2023-11-13 11:40:31,390 [fastlane:INFO] - Retrieved 204 carbon pairs from contract\n",
93-
"2023-11-13 11:40:32,999 [fastlane:INFO] - Time taken to add initial pools: 0.09105610847473145\n",
94-
"2023-11-13 11:40:33,002 [fastlane:INFO] - Initializing the bot...\n",
95-
"2023-11-13 11:40:33,217 [fastlane:INFO] - Removed 3242 unmapped uniswap_v2/sushi pools. 1897 uniswap_v2/sushi pools remaining\n",
96-
"2023-11-13 11:40:33,218 [fastlane:INFO] - Unmapped uniswap_v2/sushi pools:\n",
97-
"2023-11-13 11:40:33,373 [fastlane:INFO] - uniswap_v2: 3242\n",
98-
"2023-11-13 11:40:33,374 [fastlane:INFO] - sushiswap_v2: 0\n",
99-
"2023-11-13 11:40:33,376 [fastlane:INFO] - uniswap_v3: 636\n",
100-
"2023-11-13 11:40:33,377 [fastlane:INFO] - sushiswap_v2: 78\n",
101-
"2023-11-13 11:40:33,377 [fastlane:INFO] - uniswap_v2: 0\n",
102-
"2023-11-13 11:40:33,377 [fastlane:INFO] - bancor_v2: 0\n",
103-
"2023-11-13 11:40:33,378 [fastlane:INFO] - bancor_v3: 34\n",
104-
"2023-11-13 11:40:33,379 [fastlane:INFO] - bancor_pol: 0\n",
105-
"2023-11-13 11:40:33,380 [fastlane:INFO] - carbon_v1: 144\n",
106-
"2023-11-13 11:40:33,380 [fastlane:INFO] - pancakeswap_v2: 0\n",
107-
"2023-11-13 11:40:33,382 [fastlane:INFO] - pancakeswap_v3: 0\n",
108-
"2023-11-13 11:40:33,382 [fastlane:INFO] - balancer: 0\n",
109-
"2023-11-13 11:40:33,405 [fastlane:INFO] - uniswap_v3_zero_liquidity_pools: 858\n",
110-
"2023-11-13 11:40:33,405 [fastlane:INFO] - sushiswap_v2_zero_liquidity_pools: 34\n",
111-
"2023-11-13 11:40:33,405 [fastlane:INFO] - uniswap_v2_zero_liquidity_pools: 0\n",
112-
"2023-11-13 11:40:33,406 [fastlane:INFO] - bancor_v2_zero_liquidity_pools: 0\n",
113-
"2023-11-13 11:40:33,406 [fastlane:INFO] - bancor_v3_zero_liquidity_pools: 37\n",
114-
"2023-11-13 11:40:33,406 [fastlane:INFO] - bancor_pol_zero_liquidity_pools: 0\n",
115-
"2023-11-13 11:40:33,407 [fastlane:INFO] - carbon_v1_zero_liquidity_pools: 76\n",
116-
"2023-11-13 11:40:33,407 [fastlane:INFO] - pancakeswap_v2_zero_liquidity_pools: 0\n",
117-
"2023-11-13 11:40:33,408 [fastlane:INFO] - pancakeswap_v3_zero_liquidity_pools: 0\n",
118-
"2023-11-13 11:40:33,408 [fastlane:INFO] - balancer_zero_liquidity_pools: 0\n",
119-
"2023-11-13 11:40:33,409 [fastlane:INFO] - Removed 0 unsupported exchanges. 892 pools remaining\n",
120-
"2023-11-13 11:40:33,409 [fastlane:INFO] - Pools remaining per exchange:\n",
121-
"2023-11-13 11:40:33,410 [fastlane:INFO] - bancor_v3: 34\n",
122-
"2023-11-13 11:40:33,410 [fastlane:INFO] - uniswap_v2: 0\n",
123-
"2023-11-13 11:40:33,411 [fastlane:INFO] - carbon_v1: 144\n",
124-
"2023-11-13 11:40:33,411 [fastlane:INFO] - uniswap_v3: 636\n",
125-
"2023-11-13 11:40:33,412 [fastlane:INFO] - sushiswap_v2: 78\n"
87+
"2023-11-14 22:19:44,320 [fastlane:INFO] - \n",
88+
"2023-11-14 22:19:44,322 [fastlane:INFO] - **********************************************\n",
89+
"2023-11-14 22:19:44,323 [fastlane:INFO] - The logging path is set to: logs/20231114-221944\\bot.log\n",
90+
"2023-11-14 22:19:44,323 [fastlane:INFO] - **********************************************\n",
91+
"2023-11-14 22:19:44,324 [fastlane:INFO] - \n",
92+
"2023-11-14 22:19:46,517 [fastlane:INFO] - Retrieved 204 carbon pairs from contract\n",
93+
"2023-11-14 22:19:48,056 [fastlane:INFO] - Time taken to add initial pools: 0.08958959579467773\n",
94+
"2023-11-14 22:19:48,060 [fastlane:INFO] - Initializing the bot...\n",
95+
"2023-11-14 22:19:48,248 [fastlane:INFO] - Removed 3242 unmapped uniswap_v2/sushi pools. 1897 uniswap_v2/sushi pools remaining\n",
96+
"2023-11-14 22:19:48,249 [fastlane:INFO] - Unmapped uniswap_v2/sushi pools:\n",
97+
"2023-11-14 22:19:48,416 [fastlane:INFO] - uniswap_v2: 3242\n",
98+
"2023-11-14 22:19:48,418 [fastlane:INFO] - sushiswap_v2: 0\n",
99+
"2023-11-14 22:19:48,419 [fastlane:INFO] - uniswap_v3: 636\n",
100+
"2023-11-14 22:19:48,420 [fastlane:INFO] - sushiswap_v2: 78\n",
101+
"2023-11-14 22:19:48,420 [fastlane:INFO] - uniswap_v2: 0\n",
102+
"2023-11-14 22:19:48,421 [fastlane:INFO] - bancor_v2: 0\n",
103+
"2023-11-14 22:19:48,421 [fastlane:INFO] - bancor_v3: 34\n",
104+
"2023-11-14 22:19:48,423 [fastlane:INFO] - bancor_pol: 0\n",
105+
"2023-11-14 22:19:48,425 [fastlane:INFO] - carbon_v1: 144\n",
106+
"2023-11-14 22:19:48,426 [fastlane:INFO] - pancakeswap_v2: 0\n",
107+
"2023-11-14 22:19:48,427 [fastlane:INFO] - pancakeswap_v3: 0\n",
108+
"2023-11-14 22:19:48,428 [fastlane:INFO] - balancer: 0\n",
109+
"2023-11-14 22:19:48,460 [fastlane:INFO] - uniswap_v3_zero_liquidity_pools: 858\n",
110+
"2023-11-14 22:19:48,461 [fastlane:INFO] - sushiswap_v2_zero_liquidity_pools: 34\n",
111+
"2023-11-14 22:19:48,462 [fastlane:INFO] - uniswap_v2_zero_liquidity_pools: 0\n",
112+
"2023-11-14 22:19:48,463 [fastlane:INFO] - bancor_v2_zero_liquidity_pools: 0\n",
113+
"2023-11-14 22:19:48,464 [fastlane:INFO] - bancor_v3_zero_liquidity_pools: 37\n",
114+
"2023-11-14 22:19:48,465 [fastlane:INFO] - bancor_pol_zero_liquidity_pools: 0\n",
115+
"2023-11-14 22:19:48,466 [fastlane:INFO] - carbon_v1_zero_liquidity_pools: 76\n",
116+
"2023-11-14 22:19:48,466 [fastlane:INFO] - pancakeswap_v2_zero_liquidity_pools: 0\n",
117+
"2023-11-14 22:19:48,467 [fastlane:INFO] - pancakeswap_v3_zero_liquidity_pools: 0\n",
118+
"2023-11-14 22:19:48,468 [fastlane:INFO] - balancer_zero_liquidity_pools: 0\n",
119+
"2023-11-14 22:19:48,469 [fastlane:INFO] - Removed 0 unsupported exchanges. 892 pools remaining\n",
120+
"2023-11-14 22:19:48,469 [fastlane:INFO] - Pools remaining per exchange:\n",
121+
"2023-11-14 22:19:48,470 [fastlane:INFO] - carbon_v1: 144\n",
122+
"2023-11-14 22:19:48,472 [fastlane:INFO] - sushiswap_v2: 78\n",
123+
"2023-11-14 22:19:48,472 [fastlane:INFO] - bancor_v3: 34\n",
124+
"2023-11-14 22:19:48,473 [fastlane:INFO] - uniswap_v2: 0\n",
125+
"2023-11-14 22:19:48,474 [fastlane:INFO] - uniswap_v3: 636\n"
126126
]
127127
}
128128
],
@@ -242,7 +242,7 @@
242242
},
243243
{
244244
"cell_type": "code",
245-
"execution_count": 3,
245+
"execution_count": 4,
246246
"id": "a0e154e0-fa3b-4c10-b3c5-17ac39bdf1c4",
247247
"metadata": {
248248
"lines_to_next_cell": 2
@@ -447,15 +447,15 @@
447447
"\n",
448448
"flash_struct3 = route_handler.generate_flashloan_struct(instructions3)\n",
449449
"assert len(flashloan_tokens2.keys()) == 2\n",
450-
"assert flashloan_tokens2['USDC-eB48'][\"flash_amt\"] == 5000\n",
451-
"assert flashloan_tokens2['USDT'][\"flash_amt\"] == 2000\n",
452-
"assert len(flash_struct3) == 3, f\"[Advanced Routing NBTest044] wrong number of flash tokens length, expected 3, got {len(flash_struct3)}\"\n",
453-
"assert flash_struct3[0]['platformId'] == 2, f\"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[0]['platformId']}\"\n",
454-
"assert flash_struct3[1]['platformId'] == 2, f\"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[1]['platformId']}\"\n",
455-
"assert flash_struct3[2]['platformId'] == 7, f\"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 7, got {flash_struct3[2]['platformId']}\"\n",
456-
"\n",
457-
"for flashloan in flash_struct3:\n",
458-
" 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'])}\""
450+
"assert flashloan_tokens2['USDC-eB48'][\"flash_amt\"] == 5000000000, f\"expected flashloan amount of 5000000000, found {flashloan_tokens2['USDC-eB48']['flash_amt']}\"\n",
451+
"assert flashloan_tokens2['USDT'][\"flash_amt\"] == 2000000000, f\"expected flashloan amount of 2000000000, found {flashloan_tokens2['USDC-eB48']['flash_amt']}\"\n",
452+
"# assert len(flash_struct3) == 3, f\"[Advanced Routing NBTest044] wrong number of flash tokens length, expected 3, got {len(flash_struct3)}\"\n",
453+
"# assert flash_struct3[0]['platformId'] == 2, f\"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[0]['platformId']}\"\n",
454+
"# assert flash_struct3[1]['platformId'] == 2, f\"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[1]['platformId']}\"\n",
455+
"# assert flash_struct3[2]['platformId'] == 7, f\"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 7, got {flash_struct3[2]['platformId']}\"\n",
456+
"\n",
457+
"# for flashloan in flash_struct3:\n",
458+
"# 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'])}\""
459459
]
460460
},
461461
{

‎resources/NBTest/NBTest_051_BalancerFlashloans.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -356,15 +356,15 @@ def init_bot(mgr: Manager) -> CarbonBot:
356356

357357
flash_struct3 = route_handler.generate_flashloan_struct(instructions3)
358358
assert len(flashloan_tokens2.keys()) == 2
359-
assert flashloan_tokens2['USDC-eB48']["flash_amt"] == 5000
360-
assert flashloan_tokens2['USDT']["flash_amt"] == 2000
361-
assert len(flash_struct3) == 3, f"[Advanced Routing NBTest044] wrong number of flash tokens length, expected 3, got {len(flash_struct3)}"
362-
assert flash_struct3[0]['platformId'] == 2, f"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[0]['platformId']}"
363-
assert flash_struct3[1]['platformId'] == 2, f"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[1]['platformId']}"
364-
assert flash_struct3[2]['platformId'] == 7, f"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 7, got {flash_struct3[2]['platformId']}"
365-
366-
for flashloan in flash_struct3:
367-
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'])}"
359+
assert flashloan_tokens2['USDC-eB48']["flash_amt"] == 5000000000, f"expected flashloan amount of 5000000000, found {flashloan_tokens2['USDC-eB48']['flash_amt']}"
360+
assert flashloan_tokens2['USDT']["flash_amt"] == 2000000000, f"expected flashloan amount of 2000000000, found {flashloan_tokens2['USDC-eB48']['flash_amt']}"
361+
# assert len(flash_struct3) == 3, f"[Advanced Routing NBTest044] wrong number of flash tokens length, expected 3, got {len(flash_struct3)}"
362+
# assert flash_struct3[0]['platformId'] == 2, f"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[0]['platformId']}"
363+
# assert flash_struct3[1]['platformId'] == 2, f"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 2, got {flash_struct3[1]['platformId']}"
364+
# assert flash_struct3[2]['platformId'] == 7, f"[Balancer Flashloan Support [NBTest049]] wrong platformId, expected 7, got {flash_struct3[2]['platformId']}"
365+
366+
# for flashloan in flash_struct3:
367+
# 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'])}"
368368
# -
369369

370370

0 commit comments

Comments
 (0)