From 83da7caab411885511b4cccc0f870c75e9a54aeb Mon Sep 17 00:00:00 2001 From: Noah Khamliche Date: Thu, 2 Jun 2022 21:57:13 -0400 Subject: [PATCH] fixed bancor sell quotes --- contracts/zero-ex/CHANGELOG.json | 9 +++++++++ packages/asset-swapper/CHANGELOG.json | 4 ++++ .../asset-swapper/contracts/src/BancorV3Sampler.sol | 4 +++- .../src/utils/market_operation_utils/index.ts | 2 +- .../utils/market_operation_utils/sampler_operations.ts | 2 +- packages/protocol-utils/CHANGELOG.json | 10 ++++++++++ 6 files changed, 28 insertions(+), 3 deletions(-) diff --git a/contracts/zero-ex/CHANGELOG.json b/contracts/zero-ex/CHANGELOG.json index 9a3c22e253..806b5f9e95 100644 --- a/contracts/zero-ex/CHANGELOG.json +++ b/contracts/zero-ex/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "0.35.0", + "changes": [ + { + "note": "Adds support for BancorV3 to EthereumBridgeAdapter", + "pr": 492 + } + ] + }, { "version": "0.34.0", "changes": [ diff --git a/packages/asset-swapper/CHANGELOG.json b/packages/asset-swapper/CHANGELOG.json index 53f33d05b1..0d70280830 100644 --- a/packages/asset-swapper/CHANGELOG.json +++ b/packages/asset-swapper/CHANGELOG.json @@ -13,6 +13,10 @@ { "note": "Add MeshSwap on Polygon", "pr": 491 + }, + { + "note": "Added support for BancorV3 on ethereum mainnet", + "pr": 492 } ] }, diff --git a/packages/asset-swapper/contracts/src/BancorV3Sampler.sol b/packages/asset-swapper/contracts/src/BancorV3Sampler.sol index 821795ad68..c6ae921b44 100644 --- a/packages/asset-swapper/contracts/src/BancorV3Sampler.sol +++ b/packages/asset-swapper/contracts/src/BancorV3Sampler.sol @@ -26,11 +26,12 @@ import "./interfaces/IBancorV3.sol"; contract BancorV3Sampler { /// @dev Gas limit for BancorV3 calls. - uint256 constant private BancorV3_CALL_GAS = 150e3; // 150k + uint256 constant private BancorV3_CALL_GAS = 1500e3; // 150k address constant public ETH = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE; /// @dev Sample sell quotes from BancorV3. + /// @param weth The WETH contract address /// @param router Router to look up tokens and amounts /// @param path Token route. Should be takerToken -> makerToken /// @param takerTokenAmounts Taker token sell amount for each sample. @@ -74,6 +75,7 @@ contract BancorV3Sampler } /// @dev Sample buy quotes from BancorV3. + /// @param weth The WETH contract address /// @param router Router to look up tokens and amounts /// @param path Token route. Should be takerToken -> makerToken. /// @param makerTokenAmounts Maker token buy amount for each sample. diff --git a/packages/asset-swapper/src/utils/market_operation_utils/index.ts b/packages/asset-swapper/src/utils/market_operation_utils/index.ts index 8f2d084ec2..44b77c1ccd 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/index.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/index.ts @@ -209,7 +209,7 @@ export class MarketOperationUtils { gasAfter, ], ] = await Promise.all([samplerPromise]); - + console.log(dexQuotes); // Log the gas metrics _opts.samplerMetrics?.logGasDetails({ gasBefore, gasAfter }); _opts.samplerMetrics?.logBlockNumber(blockNumber); diff --git a/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts b/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts index ddb96f08b2..b708d57a5c 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts @@ -722,7 +722,7 @@ export class SamplerOperations { source: ERC20BridgeSource.BancorV3, fillData: { networkAddress, path}, contract: this._samplerContract, - function: this._samplerContract.sampleBuysFromBancorV3, + function: this._samplerContract.sampleSellsFromBancorV3, params: [MAINNET_TOKENS.WETH, networkInfoAddress, path, takerFillAmounts], }); } diff --git a/packages/protocol-utils/CHANGELOG.json b/packages/protocol-utils/CHANGELOG.json index f3fc7c6c93..1ecc8bc483 100644 --- a/packages/protocol-utils/CHANGELOG.json +++ b/packages/protocol-utils/CHANGELOG.json @@ -1,4 +1,14 @@ [ + { + "version": "11.14.0", + "changes": [ + { + "note": "Adds Support for BancorV3 on Ethereum", + "pr": 492 + } + ], + + }, { "version": "11.13.0", "changes": [