crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

@0x/contracts-asset-proxy: Address review comments.

Browse Source
This commit is contained in:
Lawrence Forman 2020-03-26 03:00:19 -04:00 committed by Lawrence Forman
parent 4bdaa48303
commit 338c358df2
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contracts/asset-proxy/contracts/src/bridges/DexForwarderBridge.sol
View File

@ -62,10 +62,11 @@ contract DexForwarderBridge is
uint256 outputTokenAmount uint256 outputTokenAmount
); );
/// @dev Executes a series of calls, forwarding . /// @dev Spends this contract's entire balance of input tokens by forwarding
/// them to other bridges. Reverts if the entire balance is not spent.
/// @param outputToken The token being bought. /// @param outputToken The token being bought.
/// @param to The recipient of the bought tokens. /// @param to The recipient of the bought tokens.
/// @param bridgeData The abi-encoeded input token address. /// @param bridgeData The abi-encoded input token address.
/// @return success The magic bytes if successful. /// @return success The magic bytes if successful.
function bridgeTransferFrom( function bridgeTransferFrom(
address outputToken, address outputToken,
@ -103,6 +104,8 @@ contract DexForwarderBridge is
call.outputTokenAmount call.outputTokenAmount
); );
// Execute the call in a new context so we can recoup transferred
// funds by reverting.
(bool didSucceed, ) = address(this) (bool didSucceed, ) = address(this)
.call(abi.encodeWithSelector( .call(abi.encodeWithSelector(
this.executeBridgeCall.selector, this.executeBridgeCall.selector,
@ -134,7 +137,7 @@ contract DexForwarderBridge is
// Revert if we were not able to sell our entire input token balance. // Revert if we were not able to sell our entire input token balance.
require( require(
state.totalInputTokenSold >= state.initialInputTokenBalance, state.totalInputTokenSold >= state.initialInputTokenBalance,
"DexForwaderBridge/INCOMPLETE_FILL" "DexForwarderBridge/INCOMPLETE_FILL"
); );
// Always succeed. // Always succeed.
return BRIDGE_SUCCESS; return BRIDGE_SUCCESS;
@ -163,9 +166,9 @@ contract DexForwarderBridge is
external external
{ {
// Must be called through `bridgeTransferFrom()`. // Must be called through `bridgeTransferFrom()`.
require(msg.sender == address(this), "DexForwaderBridge/ONLY_SELF"); require(msg.sender == address(this), "DexForwarderBridge/ONLY_SELF");
// `bridge` must not be this contract. // `bridge` must not be this contract.
require(bridge != address(this), "DexForwaderBridge/ILLEGAL_BRIDGE"); require(bridge != address(this), "DexForwarderBridge/ILLEGAL_BRIDGE");
// Get the starting balance of output tokens for `to`. // Get the starting balance of output tokens for `to`.
uint256 initialRecipientBalance = IERC20Token(outputToken).balanceOf(to); uint256 initialRecipientBalance = IERC20Token(outputToken).balanceOf(to);