diff --git a/packages/asset-swapper/CHANGELOG.json b/packages/asset-swapper/CHANGELOG.json index 0d70280830..53f33d05b1 100644 --- a/packages/asset-swapper/CHANGELOG.json +++ b/packages/asset-swapper/CHANGELOG.json @@ -13,10 +13,6 @@ { "note": "Add MeshSwap on Polygon", "pr": 491 - }, - { - "note": "Added support for BancorV3 on ethereum mainnet", - "pr": 492 } ] }, diff --git a/packages/asset-swapper/src/utils/market_operation_utils/orders.ts b/packages/asset-swapper/src/utils/market_operation_utils/orders.ts index 6ec49dcebb..52bfb2378f 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/orders.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/orders.ts @@ -206,23 +206,10 @@ export function getErc20BridgeSourceToBridgeSource(source: ERC20BridgeSource): s return encodeBridgeSourceId(BridgeProtocol.GMX, 'GMX'); case ERC20BridgeSource.Platypus: return encodeBridgeSourceId(BridgeProtocol.Platypus, 'Platypus'); -<<<<<<< HEAD case ERC20BridgeSource.MeshSwap: return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'MeshSwap'); -======= -<<<<<<< HEAD ->>>>>>> d1bbea019 (feat/add MeshSwap on Polygon [TKR-374] (#491)) case ERC20BridgeSource.BancorV3: return encodeBridgeSourceId(BridgeProtocol.BancorV3, 'BancorV3'); -======= - case ERC20BridgeSource.MeshSwap: - return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'MeshSwap'); -<<<<<<< HEAD ->>>>>>> 1f41fe6a2 (feat/add MeshSwap on Polygon [TKR-374] (#491)) -======= - case ERC20BridgeSource.BancorV3: - return encodeBridgeSourceId(BridgeProtocol.BancorV3, 'BancorV3'); ->>>>>>> 767b42c54 (add weth/eth wrap/unwrap support for bancorv3) default: throw new Error(AggregationError.NoBridgeForSource); }