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

Create internal function that calculates orderHash and orderTakerAssetFilledAmount

Browse Source
This commit is contained in:
Amir Bandeali 2019-09-07 22:10:05 -07:00
parent 3a503c61b3
commit 8317628c61
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contracts/exchange/contracts/src/MixinExchangeCore.sol
View File

@ -136,11 +136,8 @@ contract MixinExchangeCore is
view view
returns (LibOrder.OrderInfo memory orderInfo) returns (LibOrder.OrderInfo memory orderInfo)
{ {
// Compute the order hash // Compute the order hash and fetch the amount of takerAsset that has already been filled
orderInfo.orderHash = order.getTypedDataHash(EIP712_EXCHANGE_DOMAIN_HASH); (orderInfo.orderHash, orderInfo.orderTakerAssetFilledAmount) = _getOrderHashAndFilledAmount(order);
// Fetch filled amount
orderInfo.orderTakerAssetFilledAmount = filled[orderInfo.orderHash];
// If order.makerAssetAmount is zero, we also reject the order. // If order.makerAssetAmount is zero, we also reject the order.
// While the Exchange contract handles them correctly, they create // While the Exchange contract handles them correctly, they create
@ -488,4 +485,17 @@ contract MixinExchangeCore is
fillResults.protocolFeePaid = 0; fillResults.protocolFeePaid = 0;
} }
} }
/// @dev Gets the order's hash and amount of takerAsset that has already been filled.
/// @param order Order struct containing order specifications.
/// @return The typed data hash and amount filled of the order.
function _getOrderHashAndFilledAmount(LibOrder.Order memory order)
internal
view
returns (bytes32 orderHash, uint256 orderTakerAssetFilledAmount)
{
orderHash = order.getTypedDataHash(EIP712_EXCHANGE_DOMAIN_HASH);
orderTakerAssetFilledAmount = filled[orderHash];
return (orderHash, orderTakerAssetFilledAmount);
}
} }