add support affiliation fee in dln and fix get allowance

Author: mncdg

meta_aggregation_api/models/meta_agg_models.py

@@ -14,6 +14,7 @@ class ProviderPriceResponse(BaseModel):
  gas_price: str # gas price for the swap
  value: str # amount of native token that should be sent with the transaction
  price: str # price for buy_token in sell_token
+ allowance_target: Optional[str]
 
 
 class MetaPriceModel(BaseModel):

meta_aggregation_api/providers/base_crosschain_provider.py

@@ -34,6 +34,11 @@ def __init__(
  self.aiohttp_session = session
  self.config = config
 
+ @abstractmethod
+ def is_require_gas_price(self) -> bool:
+ pass
+
+
  @abstractmethod
  async def get_swap_quote(
  self,

meta_aggregation_api/providers/debridge_dln_v1/debridge_dln_provider_v1.py

@@ -34,6 +34,9 @@ class DebridgeDlnProviderV1(CrossChainProvider):
  with open(Path(__file__).parent / 'config.json') as f:
  PROVIDER_NAME = ujson.load(f)['name']
 
+ def is_require_gas_price(self) -> bool:
+ return True
+
  async def _get_response(self, url: str, params: Optional[dict] = None) -> dict:
  async with self.aiohttp_session.get(
  url, params=params, timeout=self.REQUEST_TIMEOUT, ssl=ssl.SSLContext()
@@ -110,8 +113,8 @@ async def get_swap_price(
  'srcChainTokenInAmount': sell_amount,
  'dstChainId': chain_id_to,
  'dstChainTokenOut': buy_token,
- 'affiliateFeePercent': 0,
- 'prependOperatingExpenses': 'false',
+ 'affiliateFeePercent': int(buy_token_percentage_fee * 100),
+ 'prependOperatingExpenses': 'true',
  }
  try:
  response = await self._get_response(url, params)
@@ -153,7 +156,8 @@ async def get_swap_quote(
  'srcChainTokenInAmount': sell_amount,
  'dstChainId': chain_id_to,
  'dstChainTokenOut': buy_token,
- 'affiliateFeePercent': 0,
+ 'affiliateFeePercent': int(buy_token_percentage_fee * 100),
+ "affiliateFeeRecipient": taker_address,
  'dstChainTokenOutAmount': 'auto',
  'srcChainOrderAuthorityAddress': taker_address,
  'dstChainTokenOutRecipient': taker_address,
@@ -194,6 +198,7 @@ def _convert_response_from_swap_price(
  gas_price='0',
  value='0',
  price=str(price),
+ allowance_target=response['tx']['allowanceTarget'],
  )
  except (KeyError, ValidationError) as e:
  e = self.handle_exception(

meta_aggregation_api/services/meta_aggregation_service.py

@@ -645,50 +645,59 @@ async def get_crosschain_provider_price(
  if not provider_instance:
  raise ProviderNotFound(provider)
 
- spender_address = next(
- (
- spender['address']
- for spender in self.providers.get_providers_on_chain(chain_id_from)[
- 'market_order'
- ]
- if spender['name'] == provider
- ),
- None,
+ if provider_instance.is_require_gas_price():
+ if not gas_price:
+ gas_price = asyncio.create_task(
+ self.gas_service.get_base_gas_price(chain_id_from)
+ )
+ gas_price = (
+ await gas_price if isinstance(gas_price, asyncio.Task) else gas_price
+ )
+
+ price = await provider_instance.get_swap_price(
+ buy_token=buy_token,
+ sell_token=sell_token,
+ sell_amount=sell_amount,
+ chain_id_from=chain_id_from,
+ chain_id_to=chain_id_to,
+ gas_price=gas_price,
+ slippage_percentage=slippage_percentage,
+ taker_address=taker_address,
+ fee_recipient=fee_recipient,
+ buy_token_percentage_fee=buy_token_percentage_fee,
  )
 
  web3_url = get_web3_url(chain_id_from, config=self.config)
  erc20_contract = Web3Client(web3_url, self.config).get_erc20_contract(
  sell_token
  )
- if not gas_price:
- gas_price = asyncio.create_task(
- self.gas_service.get_base_gas_price(chain_id_from)
+
+ approve_cost = 0
+ if price.allowance_target is None:
+ spender_address = next(
+ (
+ spender['address']
+ for spender in self.providers.get_providers_on_chain(chain_id_from)[
+ 'market_order'
+ ]
+ if spender['name'] == provider
+ ),
+ None,
  )
+
+ else:
+ spender_address = price.allowance_target
+
  allowance = await self.get_token_allowance(
  sell_token, spender_address, erc20_contract, taker_address
  )
- approve_cost = 0
  if allowance < sell_amount:
  approve_cost = await self.get_approve_cost(
  owner_address=taker_address,
  spender_address=spender_address,
  erc20_contract=erc20_contract,
  )
- gas_price = (
- await gas_price if isinstance(gas_price, asyncio.Task) else gas_price
- )
- price = await provider_instance.get_swap_price(
- buy_token=buy_token,
- sell_token=sell_token,
- sell_amount=sell_amount,
- chain_id_from=chain_id_from,
- chain_id_to=chain_id_to,
- gas_price=gas_price,
- slippage_percentage=slippage_percentage,
- taker_address=taker_address,
- fee_recipient=fee_recipient,
- buy_token_percentage_fee=buy_token_percentage_fee,
- )
+
  return MetaPriceModel(
  provider=provider,
  price_response=price,