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

Remove revertIfIncomplete from batchMatch

Browse Source
This commit is contained in:
Michael Zhu
2022-01-11 11:59:17 -08:00
parent cc70ad9d3c
commit 2005054ec8
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/zero-ex/contracts/src/features/ERC721OrdersFeature.sol
View File

@@ -481,7 +481,6 @@ contract ERC721OrdersFeature is
/// @param buyOrders Orders buying ERC721 assets. /// @param buyOrders Orders buying ERC721 assets.
/// @param sellOrderSignatures Signatures for the sell orders. /// @param sellOrderSignatures Signatures for the sell orders.
/// @param buyOrderSignatures Signatures for the buy orders. /// @param buyOrderSignatures Signatures for the buy orders.
/// @param revertIfIncomplete Revert if any match operation fails.
/// @return profits The amount of profit earned by the caller /// @return profits The amount of profit earned by the caller
/// of this function for each pair of matched orders /// of this function for each pair of matched orders
/// (denominated in the ERC20 token of the order pair). /// (denominated in the ERC20 token of the order pair).
@@ -491,8 +490,7 @@ contract ERC721OrdersFeature is
LibERC721Order.ERC721Order[] memory sellOrders, LibERC721Order.ERC721Order[] memory sellOrders,
LibERC721Order.ERC721Order[] memory buyOrders, LibERC721Order.ERC721Order[] memory buyOrders,
LibSignature.Signature[] memory sellOrderSignatures, LibSignature.Signature[] memory sellOrderSignatures,
LibSignature.Signature[] memory buyOrderSignatures, LibSignature.Signature[] memory buyOrderSignatures
bool revertIfIncomplete
) )
public public
override override
@@ -524,8 +522,6 @@ contract ERC721OrdersFeature is
// If the matching succeeded, record the profit. // If the matching succeeded, record the profit.
(uint256 profit) = abi.decode(returnData, (uint256)); (uint256 profit) = abi.decode(returnData, (uint256));
profits[i] = profit; profits[i] = profit;
} else if (revertIfIncomplete) {
returnData.rrevert();
} }
} }
} }

4
contracts/zero-ex/contracts/src/features/interfaces/IERC721OrdersFeature.sol
View File

@@ -179,7 +179,6 @@ interface IERC721OrdersFeature {
/// @param buyOrders Orders buying ERC721 assets. /// @param buyOrders Orders buying ERC721 assets.
/// @param sellOrderSignatures Signatures for the sell orders. /// @param sellOrderSignatures Signatures for the sell orders.
/// @param buyOrderSignatures Signatures for the buy orders. /// @param buyOrderSignatures Signatures for the buy orders.
/// @param revertIfIncomplete Revert if any match operation fails.
/// @return profits The amount of profit earned by the caller /// @return profits The amount of profit earned by the caller
/// of this function for each pair of matched orders /// of this function for each pair of matched orders
/// (denominated in the ERC20 token of the order pair). /// (denominated in the ERC20 token of the order pair).
@@ -189,8 +188,7 @@ interface IERC721OrdersFeature {
LibERC721Order.ERC721Order[] calldata sellOrders, LibERC721Order.ERC721Order[] calldata sellOrders,
LibERC721Order.ERC721Order[] calldata buyOrders, LibERC721Order.ERC721Order[] calldata buyOrders,
LibSignature.Signature[] calldata sellOrderSignatures, LibSignature.Signature[] calldata sellOrderSignatures,
LibSignature.Signature[] calldata buyOrderSignatures, LibSignature.Signature[] calldata buyOrderSignatures
bool revertIfIncomplete
) )
external external
returns (uint256[] memory profits, bool[] memory successes); returns (uint256[] memory profits, bool[] memory successes);