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

temp

Browse Source
This commit is contained in:
Amir Bandeali
2019-06-07 16:26:57 -07:00
parent 949946589f
commit 39bed4d306
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
contracts/dev-utils/contracts/src/OrderValidationUtils.sol
View File

@@ -67,8 +67,8 @@ contract OrderValidationUtils is
// Validate the maker's signature // Validate the maker's signature
address makerAddress = order.makerAddress; address makerAddress = order.makerAddress;
isValidSignature = _EXCHANGE.isValidSignature( isValidSignature = _EXCHANGE.isValidOrderSignature(
orderInfo.orderHash, order,
makerAddress, makerAddress,
signature signature
); );
@@ -87,9 +87,9 @@ contract OrderValidationUtils is
if (order.makerAssetData.equals(zrxAssetData)) { if (order.makerAssetData.equals(zrxAssetData)) {
// If `makerAsset` equals `makerFeeAsset`, the % that can be filled is // If `makerAsset` equals `makerFeeAsset`, the % that can be filled is
// transferableMakerAssetAmount / (makerAssetAmount + makerFee) // transferableMakerAssetAmount / (makerAssetAmount + makerFee)
transferableTakerAssetAmount = getPartialAmountFloor( transferableTakerAssetAmount = _getPartialAmountFloor(
transferableMakerAssetAmount, transferableMakerAssetAmount,
safeAdd(order.makerAssetAmount, makerFee), _safeAdd(order.makerAssetAmount, makerFee),
takerAssetAmount takerAssetAmount
); );
} else { } else {
@@ -98,7 +98,7 @@ contract OrderValidationUtils is
// If `makerFee` is 0, the % that can be filled is (transferableMakerAssetAmount / makerAssetAmount) // If `makerFee` is 0, the % that can be filled is (transferableMakerAssetAmount / makerAssetAmount)
if (makerFee == 0) { if (makerFee == 0) {
transferableTakerAssetAmount = getPartialAmountFloor( transferableTakerAssetAmount = _getPartialAmountFloor(
transferableMakerAssetAmount, transferableMakerAssetAmount,
order.makerAssetAmount, order.makerAssetAmount,
takerAssetAmount takerAssetAmount
@@ -107,23 +107,23 @@ contract OrderValidationUtils is
// If `makerAsset` does not equal `makerFeeAsset`, the % that can be filled is the lower of // If `makerAsset` does not equal `makerFeeAsset`, the % that can be filled is the lower of
// (transferableMakerAssetAmount / makerAssetAmount) and (transferableMakerAssetFeeAmount / makerFee) // (transferableMakerAssetAmount / makerAssetAmount) and (transferableMakerAssetFeeAmount / makerFee)
} else { } else {
uint256 transferableMakerToTakerAmount = getPartialAmountFloor( uint256 transferableMakerToTakerAmount = _getPartialAmountFloor(
transferableMakerAssetAmount, transferableMakerAssetAmount,
order.makerAssetAmount, order.makerAssetAmount,
takerAssetAmount takerAssetAmount
); );
uint256 transferableMakerFeeToTakerAmount = getPartialAmountFloor( uint256 transferableMakerFeeToTakerAmount = _getPartialAmountFloor(
transferableMakerFeeAssetAmount, transferableMakerFeeAssetAmount,
makerFee, makerFee,
takerAssetAmount takerAssetAmount
); );
transferableTakerAssetAmount = min256(transferableMakerToTakerAmount, transferableMakerFeeToTakerAmount); transferableTakerAssetAmount = _min256(transferableMakerToTakerAmount, transferableMakerFeeToTakerAmount);
} }
} }
// `fillableTakerAssetAmount` is the lower of the order's remaining `takerAssetAmount` and the `transferableTakerAssetAmount` // `fillableTakerAssetAmount` is the lower of the order's remaining `takerAssetAmount` and the `transferableTakerAssetAmount`
fillableTakerAssetAmount = min256( fillableTakerAssetAmount = _min256(
safeSub(takerAssetAmount, orderInfo.orderTakerAssetFilledAmount), _safeSub(takerAssetAmount, orderInfo.orderTakerAssetFilledAmount),
transferableTakerAssetAmount transferableTakerAssetAmount
); );
@@ -178,7 +178,7 @@ contract OrderValidationUtils is
returns (uint256 transferableAssetAmount) returns (uint256 transferableAssetAmount)
{ {
(uint256 balance, uint256 allowance) = getBalanceAndAssetProxyAllowance(ownerAddress, assetData); (uint256 balance, uint256 allowance) = getBalanceAndAssetProxyAllowance(ownerAddress, assetData);
transferableAssetAmount = min256(balance, allowance); transferableAssetAmount = _min256(balance, allowance);
return transferableAssetAmount; return transferableAssetAmount;
} }
} }