Skip to content
This repository has been archived by the owner on Jul 9, 2021. It is now read-only.

Add Uniswap V2 support to @0x/asset-swapper #2599

Merged
merged 7 commits into from
Jun 11, 2020
Merged

Conversation

xianny
Copy link
Contributor

@xianny xianny commented Jun 8, 2020

Description

Add Uniswap V2 to asset-swapper.

Testing instructions

Instead of writing new tests, I replaced Uniswap (V1) with V2 in existing tests.

Types of changes

  • New feature (non-breaking change which adds functionality)

Checklist:

  • Prefix PR title with [WIP] if necessary.
  • Add tests to cover changes as needed.
  • Update documentation as needed.
  • Add new entries to the relevant CHANGELOG.jsons.

@xianny xianny marked this pull request as ready for review June 9, 2020 00:56
@xianny xianny requested review from dorothy-zbornak and dekz and removed request for BMillman19, fragosti, dave4506 and abandeali1 June 9, 2020 00:56
@xianny xianny force-pushed the feat/AS-uniswap-v2 branch from 961a336 to 68fd915 Compare June 9, 2020 16:40
@xianny xianny requested a review from dekz June 9, 2020 22:43
@xianny xianny requested a review from hysz as a code owner June 10, 2020 17:06
@xianny xianny requested review from dorothy-zbornak and removed request for hysz June 10, 2020 18:03
Copy link
Contributor

@dorothy-zbornak dorothy-zbornak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great!

Copy link
Member

@dekz dekz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! I reckon we merge once the contracts (UniswapBridge and Sampler) are updated so the PR is tied up nicely.

Will get this moving

@@ -20,6 +20,7 @@
"devUtils": "0x74134cf88b21383713e096a5ecf59e297dc7f547",
"erc20BridgeProxy": "0x8ed95d1746bf1e4dab58d8ed4724f1ef95b20db0",
"uniswapBridge": "0x36691c4f426eb8f42f150ebde43069a31cb080ad",
"uniswapV2Bridge": "0x0000000000000000000000000000000000000000",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"uniswapV2Bridge": "0x0000000000000000000000000000000000000000",
"uniswapV2Bridge": "0xdcd6011f4c6b80e470d9487f5871a0cba7c93f48",

Deployed https://etherscan.io/address/0xdcd6011f4c6b80e470d9487f5871a0cba7c93f48#code

@@ -9,6 +9,10 @@
{
"note": "Add `ERC20BridgeSampler` deployment",
"pr": 2541
},
{
"note": "Added `UniswapV2Bridge` address (null)",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"note": "Added `UniswapV2Bridge` address (null)",
"note": "Added `UniswapV2Bridge` address on mainnet",

@@ -20,6 +20,7 @@
"devUtils": "0x74134cf88b21383713e096a5ecf59e297dc7f547",
"erc20BridgeProxy": "0x8ed95d1746bf1e4dab58d8ed4724f1ef95b20db0",
"uniswapBridge": "0x36691c4f426eb8f42f150ebde43069a31cb080ad",
"uniswapV2Bridge": "0x0000000000000000000000000000000000000000",
"erc20BridgeSampler": "0xc0154b14cc60a6661171fdc817f759429a57e184",
Copy link
Member

@dekz dekz Jun 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"erc20BridgeSampler": "0xc0154b14cc60a6661171fdc817f759429a57e184",
"erc20BridgeSampler": "0xdfec429f7d87bd9911211bbb3b8b83df0f37ebc7",

As at 1b5746b

@xianny xianny merged commit 0fbbabe into development Jun 11, 2020
@xianny xianny deleted the feat/AS-uniswap-v2 branch June 11, 2020 17:23
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants