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

Return FillResults[] for batch fill methods

Browse Source
This commit is contained in:
Amir Bandeali 2019-05-23 22:37:32 -05:00
parent d6c1bf691c
commit 11a25cb1ae
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
contracts/exchange/contracts/src/MixinWrapperFunctions.sol
View File

@ -106,8 +106,7 @@ contract MixinWrapperFunctions is
/// @param orders Array of order specifications.
/// @param takerAssetFillAmounts Array of desired amounts of takerAsset to sell in orders.
/// @param signatures Proofs that orders have been created by makers.
/// @return Amounts filled and fees paid by makers and taker.
/// NOTE: makerAssetFilledAmount and takerAssetFilledAmount may include amounts filled of different assets.
/// @return Array of amounts filled and fees paid by makers and taker.
function batchFillOrders(
LibOrder.Order[] memory orders,
uint256[] memory takerAssetFillAmounts,
@ -115,26 +114,25 @@ contract MixinWrapperFunctions is
)
public
nonReentrant
returns (FillResults memory totalFillResults)
returns (FillResults[] memory)
{
uint256 ordersLength = orders.length;
FillResults[] memory fillResults = new FillResults[](ordersLength);
for (uint256 i = 0; i != ordersLength; i++) {
FillResults memory singleFillResults = _fillOrder(
fillResults[i] = _fillOrder(
orders[i],
takerAssetFillAmounts[i],
signatures[i]
);
_addFillResults(totalFillResults, singleFillResults);
}
return totalFillResults;
return fillResults;
}
/// @dev Synchronously executes multiple calls of fillOrKill.
/// @param orders Array of order specifications.
/// @param takerAssetFillAmounts Array of desired amounts of takerAsset to sell in orders.
/// @param signatures Proofs that orders have been created by makers.
/// @return Amounts filled and fees paid by makers and taker.
/// NOTE: makerAssetFilledAmount and takerAssetFilledAmount may include amounts filled of different assets.
/// @return Array of amounts filled and fees paid by makers and taker.
function batchFillOrKillOrders(
LibOrder.Order[] memory orders,
uint256[] memory takerAssetFillAmounts,
@ -142,18 +140,18 @@ contract MixinWrapperFunctions is
)
public
nonReentrant
returns (FillResults memory totalFillResults)
returns (FillResults[] memory)
{
uint256 ordersLength = orders.length;
FillResults[] memory fillResults = new FillResults[](ordersLength);
for (uint256 i = 0; i != ordersLength; i++) {
FillResults memory singleFillResults = _fillOrKillOrder(
fillResults[i] = _fillOrKillOrder(
orders[i],
takerAssetFillAmounts[i],
signatures[i]
);
_addFillResults(totalFillResults, singleFillResults);
}
return totalFillResults;
return fillResults;
}
/// @dev Fills an order with specified parameters and ECDSA signature.
@ -161,26 +159,25 @@ contract MixinWrapperFunctions is
/// @param orders Array of order specifications.
/// @param takerAssetFillAmounts Array of desired amounts of takerAsset to sell in orders.
/// @param signatures Proofs that orders have been created by makers.
/// @return Amounts filled and fees paid by makers and taker.
/// NOTE: makerAssetFilledAmount and takerAssetFilledAmount may include amounts filled of different assets.
/// @return Array of amounts filled and fees paid by makers and taker.
function batchFillOrdersNoThrow(
LibOrder.Order[] memory orders,
uint256[] memory takerAssetFillAmounts,
bytes[] memory signatures
)
public
returns (FillResults memory totalFillResults)
returns (FillResults[] memory)
{
uint256 ordersLength = orders.length;
FillResults[] memory fillResults = new FillResults[](ordersLength);
for (uint256 i = 0; i != ordersLength; i++) {
FillResults memory singleFillResults = fillOrderNoThrow(
fillResults[i] = fillOrderNoThrow(
orders[i],
takerAssetFillAmounts[i],
signatures[i]
);
_addFillResults(totalFillResults, singleFillResults);
}
return totalFillResults;
return fillResults;
}
/// @dev Synchronously executes multiple calls of fillOrder until total amount of takerAsset is sold by taker.

12
contracts/exchange/contracts/src/interfaces/IWrapperFunctions.sol
View File

@ -55,41 +55,41 @@ contract IWrapperFunctions {
/// @param orders Array of order specifications.
/// @param takerAssetFillAmounts Array of desired amounts of takerAsset to sell in orders.
/// @param signatures Proofs that orders have been created by makers.
/// @return Amounts filled and fees paid by makers and taker.
/// @return Array of amounts filled and fees paid by makers and taker.
function batchFillOrders(
LibOrder.Order[] memory orders,
uint256[] memory takerAssetFillAmounts,
bytes[] memory signatures
)
public
returns (LibFillResults.FillResults memory totalFillResults);
returns (LibFillResults.FillResults[] memory);
/// @dev Synchronously executes multiple calls of fillOrKill.
/// @param orders Array of order specifications.
/// @param takerAssetFillAmounts Array of desired amounts of takerAsset to sell in orders.
/// @param signatures Proofs that orders have been created by makers.
/// @return Amounts filled and fees paid by makers and taker.
/// @return Array of amounts filled and fees paid by makers and taker.
function batchFillOrKillOrders(
LibOrder.Order[] memory orders,
uint256[] memory takerAssetFillAmounts,
bytes[] memory signatures
)
public
returns (LibFillResults.FillResults memory totalFillResults);
returns (LibFillResults.FillResults[] memory);
/// @dev Fills an order with specified parameters and ECDSA signature.
/// Returns false if the transaction would otherwise revert.
/// @param orders Array of order specifications.
/// @param takerAssetFillAmounts Array of desired amounts of takerAsset to sell in orders.
/// @param signatures Proofs that orders have been created by makers.
/// @return Amounts filled and fees paid by makers and taker.
/// @return Array of amounts filled and fees paid by makers and taker.
function batchFillOrdersNoThrow(
LibOrder.Order[] memory orders,
uint256[] memory takerAssetFillAmounts,
bytes[] memory signatures
)
public
returns (LibFillResults.FillResults memory totalFillResults);
returns (LibFillResults.FillResults[] memory);
/// @dev Synchronously executes multiple calls of fillOrder until total amount of takerAsset is sold by taker.
/// @param orders Array of order specifications.