This repository has been archived by the owner on Jul 9, 2021. It is now read-only.
@0x/contracts-exchange-forwarder: ERC20Bridge buy support in Forwarder
#2356
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
moodlezoup
force-pushed
the
feature/forwarder/erc20-bridge-buy
branch
2 times, most recently
from
e05d09f to
91774b1
Compare
abandeali1
suggested changes
Nov 21, 2019
contracts/exchange-forwarder/contracts/src/MixinExchangeWrapper.sol
Outdated
Show resolved
Hide resolved
contracts/exchange-forwarder/contracts/src/libs/LibConstants.sol
Outdated
Show resolved
Hide resolved
contracts/exchange-forwarder/contracts/src/MixinExchangeWrapper.sol
Outdated
Show resolved
Hide resolved
contracts/exchange-forwarder/contracts/src/MixinExchangeWrapper.sol
Outdated
Show resolved
Hide resolved
|
| "pr": 2356 | ||
| } | ||
| ], | ||
| "timestamp": 1574461784 |
There was a problem hiding this comment.
No timestamp for unpublished versions.
abandeali1
approved these changes
Nov 25, 2019
dorothy-zbornak
approved these changes
Nov 25, 2019
| .transferAssetToSender(erc721AssetData, invalidAmount) | ||
| .awaitTransactionSuccessAsync({ from: receiver }); | ||
| const expectedError = new ForwarderRevertErrors.Erc721AmountMustEqualOneError(invalidAmount); | ||
| expect(tx).to.revertWith(expectedError); |
There was a problem hiding this comment.
Suggested change
| expect(tx).to.revertWith(expectedError); | |
| return expect(tx).to.revertWith(expectedError); |
| .transferAssetToSender(randomBytes, TRANSFER_AMOUNT) | ||
| .awaitTransactionSuccessAsync({ from: receiver }); | ||
| const expectedError = new ForwarderRevertErrors.UnsupportedAssetProxyError(hexSlice(randomBytes, 0, 4)); | ||
| expect(tx).to.revertWith(expectedError); |
There was a problem hiding this comment.
Suggested change
| expect(tx).to.revertWith(expectedError); | |
| return expect(tx).to.revertWith(expectedError); |
| import { deployForwarderAsync } from './deploy_forwarder'; | ||
| import { ForwarderTestFactory } from './forwarder_test_factory'; | ||
|
|
||
| blockchainTests.resets.only('Forwarder <> ERC20Bridge integration tests', env => { |
There was a problem hiding this comment.
Suggested change
| blockchainTests.resets.only('Forwarder <> ERC20Bridge integration tests', env => { | |
| blockchainTests.resets('Forwarder <> ERC20Bridge integration tests', env => { |
| // Account for the ERC20Bridge transfering more of the maker asset than expected. | ||
| if (makerAssetProxyId == erc20BridgeProxyId) { | ||
| uint256 balanceAfter = IERC20Token(tokenAddress).balanceOf(address(this)); | ||
| makerAssetAcquiredAmount = LibSafeMath.max256( |
There was a problem hiding this comment.
Why don't we just set makerAssetAcquiredAmount to max(makerAssetAcquiredAmount, balanceAfter)? Would that be so wrong?
There was a problem hiding this comment.
two edge cases:
- someone accidentally transfers tokens to the Forwarder
makerAssetis WETH, which seems silly but given the flexibility of the bridge pattern I could see there being a use case for this at some point 🤷♂
moodlezoup
changed the title
@0x/contracts-exchange-forwarder: ERC20Bridge buy support in Forwarder
moodlezoup
force-pushed
the
feature/forwarder/erc20-bridge-buy
branch
from
210bc91 to
4157665
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Adds support for ERC20Bridge orders in the Forwarder. The changes to the Forwarder contracts themselves are pretty small, the only notable exception is the addition of an
_isPercentageFeefunction which checks whether thetakerFeeAssetDatais equalish to themakerAssetData, e.g. we support orders where the maker asset if from an ERC20 bridge and the taker fee asset is the non-bridge equivalent.The bulk of the code additions are from test stuff, including:
_isPercentageFeeand_transferAssetToSenderERC20BridgeProxyto theDeploymentManagerTesting instructions
Types of changes
Checklist:
[WIP]if necessary.