contracts cleanup #164

dorothy-zbornak · 2021-03-03T16:47:03Z

Description

Add PancakeSwapFeature.
Remove TokenSpender/AllowanceTarget stuff from contracts, addresse, migrations.

TODO

Regenerate wrappers
Enable Pancake VIP in AS (will need to rebase off jacob's PR)

Testing instructions

Types of changes

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.

dorothy-zbornak · 2021-03-03T16:50:37Z

contracts/zero-ex/contracts/src/features/PancakeSwapFeature.sol

@@ -0,0 +1,401 @@
+// SPDX-License-Identifier: Apache-2.0


Mostly minor differences here from original UniswapFeature.

Remove legacy allowance target logic.

Remove greedy tokens logic.

Fortunately the above two were appended logic and don't seem to impact the rest of the assembly by their removal.

Update names, init hashes, addresses for the new AMMs/chain.

Here's a diff of the two files: https://gist.github.com/dorothy-zbornak/5a9d4e883ab1bac1f216354069781163

dorothy-zbornak · 2021-03-03T18:02:12Z

packages/contract-addresses/CHANGELOG.json

@@ -1,4 +1,17 @@
 [
+    {
+        "version": "6.0.0-bsc.0",


Note: major bump

dorothy-zbornak · 2021-03-03T18:02:18Z

packages/migrations/CHANGELOG.json

@@ -1,4 +1,12 @@
 [
+    {
+        "version": "8.0.0-bsc.0",


Note: major bump

…tokens stuff.' `@0x/contract-addresses`: Add BSC addresses. Remove exchangeProxyAllowanceTarget. `@0x/migrations`: Remove exchangeProxyAllowanceTarget.

moodlezoup

me parece bien

contracts/zero-ex/contracts/src/features/IPancakeSwapFeature.sol

hysz · 2021-03-03T21:10:54Z

contracts/zero-ex/contracts/src/features/TokenSpenderFeature.sol

@@ -1,137 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*


Is this still hooked up on mainnet?

hysz · 2021-03-03T21:11:35Z

contracts/zero-ex/contracts/src/features/UniswapFeature.sol

@@ -39,12 +39,8 @@ contract UniswapFeature is
    string public constant override FEATURE_NAME = "UniswapFeature";


Just wanted to confirm that integrators are no longer using the legacy proxy?

API will stop supporting it march 31

hysz

LGTM!

Co-authored-by: mzhu25 <mchl.zhu.96@gmail.com>

`@0x/contract-wrappers`: Regenerate wrappers

* `@0x/contracts-zero-ex`: Encode protocol ID and source name in bridge source ID `@0x/asset-swapper`: Use new bridge source ID encoding. * fix linter issues * contracts cleanup (#164) * `@0x/contracts-zero-ex`: Add PancakeSwapFeature * `@0x/contracts-zero-ex`: Remove tokenspender/allowance target/greedy tokens stuff.' `@0x/contract-addresses`: Add BSC addresses. Remove exchangeProxyAllowanceTarget. `@0x/migrations`: Remove exchangeProxyAllowanceTarget. * Update contracts/zero-ex/contracts/src/features/IPancakeSwapFeature.sol Co-authored-by: mzhu25 <mchl.zhu.96@gmail.com> * `@0x/contracts-zero-ex`: Add sushiswap support to PancakeSwap * `@0x/contract-artifacts`: Regenerate artifacts `@0x/contract-wrappers`: Regenerate wrappers * `@0x/contract-addresses`: Add BSC addresses Co-authored-by: mzhu25 <mchl.zhu.96@gmail.com> Co-authored-by: mzhu25 <mchl.zhu.96@gmail.com>

* FQT: Pack Protocol/source name into source ID (#162) * `@0x/contracts-zero-ex`: Encode protocol ID and source name in bridge source ID `@0x/asset-swapper`: Use new bridge source ID encoding. * fix linter issues * contracts cleanup (#164) * `@0x/contracts-zero-ex`: Add PancakeSwapFeature * `@0x/contracts-zero-ex`: Remove tokenspender/allowance target/greedy tokens stuff.' `@0x/contract-addresses`: Add BSC addresses. Remove exchangeProxyAllowanceTarget. `@0x/migrations`: Remove exchangeProxyAllowanceTarget. * Update contracts/zero-ex/contracts/src/features/IPancakeSwapFeature.sol Co-authored-by: mzhu25 <mchl.zhu.96@gmail.com> * `@0x/contracts-zero-ex`: Add sushiswap support to PancakeSwap * `@0x/contract-artifacts`: Regenerate artifacts `@0x/contract-wrappers`: Regenerate wrappers * `@0x/contract-addresses`: Add BSC addresses Co-authored-by: mzhu25 <mchl.zhu.96@gmail.com> Co-authored-by: mzhu25 <mchl.zhu.96@gmail.com> * feat: Better chain support (#163) * feat: Better chain support * feat: better chain support refactor deployment constants (#166) * proliferate the chainId * Refactor sampler to remove DeploymentConstants dependency and fixed addresses * Rework WETH out, replacing with address(0) * wat * hack DeploymentConstants for now * proliferate the chainId * Refactor sampler to remove DeploymentConstants dependency and fixed addresses * remove duped network addresses * Rework the bridge source encoder * Use the constants NATIVE_FEE_TOKEN in EP consumer * `@0x/contract-addresses`: Fix WBNB address (#170) Co-authored-by: Lawrence Forman <lawrence@0xproject.com> * multichain enable cakez vip (#171) * feat: Better chain support * feat: better chain support refactor deployment constants (#166) * proliferate the chainId * Refactor sampler to remove DeploymentConstants dependency and fixed addresses * Rework WETH out, replacing with address(0) * wat * hack DeploymentConstants for now * proliferate the chainId * Refactor sampler to remove DeploymentConstants dependency and fixed addresses * remove duped network addresses * `asset-swapper`: enable pancake VIP route generation Co-authored-by: Jacob Evans <jacob@dekz.net> Co-authored-by: Lawrence Forman <me@merklejerk.com> * `@0x/contracts-zero-ex`: Fix `PancakeSwapFeature` sushi values (#172) * `@0x/contracts-zero-ex`: Fix `PancakeSwapFeature` sushi values * `@0x/contracts-zero-ex`: I am a bad protocologist Co-authored-by: Lawrence Forman <me@merklejerk.com> * feat: BSC Nerve + Dodo + Nerve + Ellipsis (#181) * feat: BSC Nerve + DODO v1 * CHANGELOGs * Remove extra balance fetch * Add Belt * Added Ellipsis * Update FQT address * `@0x/contracts-zero-ex`: Delete TokenSpenderFeature and get stuff compiling * `@0x/asset-swapper`: fix compilation * prettier * `@0x/asset-swapper`: Truncate LiquidityProvider source ID name * Update packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts Co-authored-by: Jacob Evans <jacob@dekz.net> * Update packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts Co-authored-by: Jacob Evans <jacob@dekz.net> * `@0x/contracts-zero-ex`: Fix BakerySwap on PackageSwapFeature (#190) * address review comments Co-authored-by: mzhu25 <mchl.zhu.96@gmail.com> Co-authored-by: Jacob Evans <jacob@dekz.net> Co-authored-by: Lawrence Forman <me@merklejerk.com>

dorothy-zbornak force-pushed the feat/bsc/initial-contracts branch from f86fbea to eeea8c2 Compare March 3, 2021 16:47

dorothy-zbornak commented Mar 3, 2021

View reviewed changes

dorothy-zbornak force-pushed the feat/bsc/initial-contracts branch 2 times, most recently from aa30d3e to b754774 Compare March 3, 2021 17:58

dorothy-zbornak commented Mar 3, 2021

View reviewed changes

packages/contract-addresses/CHANGELOG.json

@@ -1,4 +1,17 @@

[

{

"version": "6.0.0-bsc.0",

Copy link

Contributor Author

dorothy-zbornak Mar 3, 2021

Choose a reason for hiding this comment

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

Note: major bump

dorothy-zbornak commented Mar 3, 2021

View reviewed changes

packages/migrations/CHANGELOG.json

@@ -1,4 +1,12 @@

[

{

"version": "8.0.0-bsc.0",

Copy link

Contributor Author

dorothy-zbornak Mar 3, 2021

Choose a reason for hiding this comment

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

Note: major bump

dorothy-zbornak marked this pull request as ready for review March 3, 2021 18:07

dorothy-zbornak requested review from abandeali1, hysz and moodlezoup as code owners March 3, 2021 18:07

dorothy-zbornak requested a review from dekz March 3, 2021 18:07

dorothy-zbornak added 2 commits March 3, 2021 13:20

@0x/contracts-zero-ex: Add PancakeSwapFeature

d645f38

@0x/contracts-zero-ex: Remove tokenspender/allowance target/greedy …

0419100

…tokens stuff.' `@0x/contract-addresses`: Add BSC addresses. Remove exchangeProxyAllowanceTarget. `@0x/migrations`: Remove exchangeProxyAllowanceTarget.

dorothy-zbornak force-pushed the feat/bsc/initial-contracts branch from b754774 to 0419100 Compare March 3, 2021 18:20

moodlezoup approved these changes Mar 3, 2021

View reviewed changes

contracts/zero-ex/contracts/src/features/IPancakeSwapFeature.sol Outdated Show resolved Hide resolved

hysz reviewed Mar 3, 2021

View reviewed changes

hysz approved these changes Mar 3, 2021

View reviewed changes

Update contracts/zero-ex/contracts/src/features/IPancakeSwapFeature.sol

5152ee7

Co-authored-by: mzhu25 <mchl.zhu.96@gmail.com>

dorothy-zbornak changed the title ~~BSC initial contracts work~~ contracts cleanup Mar 4, 2021

dorothy-zbornak added 3 commits March 3, 2021 21:24

@0x/contracts-zero-ex: Add sushiswap support to PancakeSwap

8b3203f

@0x/contract-artifacts: Regenerate artifacts

ebf13a4

`@0x/contract-wrappers`: Regenerate wrappers

@0x/contract-addresses: Add BSC addresses

4396e8f

dorothy-zbornak force-pushed the feat/bsc/initial-contracts branch from 2792ad3 to 4396e8f Compare March 4, 2021 04:20

dorothy-zbornak merged commit 141708b into feat/BridgeAdapter-BridgeFill-event-2 Mar 4, 2021

dorothy-zbornak deleted the feat/bsc/initial-contracts branch March 4, 2021 04:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

contracts cleanup #164

contracts cleanup #164

dorothy-zbornak commented Mar 3, 2021 •

edited

Loading

dorothy-zbornak Mar 3, 2021 •

edited

Loading

dorothy-zbornak Mar 3, 2021

dorothy-zbornak Mar 3, 2021

dorothy-zbornak Mar 3, 2021

moodlezoup left a comment

hysz Mar 3, 2021

dorothy-zbornak Mar 3, 2021

hysz Mar 3, 2021

dorothy-zbornak Mar 3, 2021

hysz left a comment

		@@ -39,12 +39,8 @@ contract UniswapFeature is
		string public constant override FEATURE_NAME = "UniswapFeature";

contracts cleanup #164

contracts cleanup #164

Conversation

dorothy-zbornak commented Mar 3, 2021 • edited Loading

Description

TODO

Testing instructions

Types of changes

Checklist:

dorothy-zbornak Mar 3, 2021 • edited Loading

Choose a reason for hiding this comment

dorothy-zbornak Mar 3, 2021

Choose a reason for hiding this comment

dorothy-zbornak Mar 3, 2021

Choose a reason for hiding this comment

dorothy-zbornak Mar 3, 2021

Choose a reason for hiding this comment

moodlezoup left a comment

Choose a reason for hiding this comment

hysz Mar 3, 2021

Choose a reason for hiding this comment

dorothy-zbornak Mar 3, 2021

Choose a reason for hiding this comment

hysz Mar 3, 2021

Choose a reason for hiding this comment

dorothy-zbornak Mar 3, 2021

Choose a reason for hiding this comment

hysz left a comment

Choose a reason for hiding this comment

dorothy-zbornak commented Mar 3, 2021 •

edited

Loading

dorothy-zbornak Mar 3, 2021 •

edited

Loading