aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol
diff options
context:
space:
mode:
authorRemco Bloemen <remco@wicked.ventures>2018-08-25 07:13:17 +0800
committerRemco Bloemen <remco@wicked.ventures>2018-08-25 07:46:24 +0800
commite21599285941a092a6c6f2dbf58f14f467dcca85 (patch)
tree39af43f14d83cbcdf47e2dceb274f7996296e4a9 /packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol
parente6f5cac87887709b5a3baaec059005301723f0a5 (diff)
downloaddexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.tar
dexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.tar.gz
dexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.tar.bz2
dexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.tar.lz
dexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.tar.xz
dexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.tar.zst
dexon-sol-tools-e21599285941a092a6c6f2dbf58f14f467dcca85.zip
Fix mixin api
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol')
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol22
1 files changed, 16 insertions, 6 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol
index eccb6a29d..708cb329e 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol
@@ -83,23 +83,33 @@ contract MExchangeCore is
bytes32 orderHash
)
internal;
-
+
/// @dev Validates context for fillOrder. Succeeds or throws.
/// @param order to be filled.
- /// @param orderInfo Status, orderHash, and amount already filled of order.
+ /// @param orderInfo OrderStatus, orderHash, and amount already filled of order.
/// @param takerAddress Address of order taker.
+ /// @param signature Proof that the orders was created by its maker.
+ function assertFillableOrder(
+ LibOrder.Order memory order,
+ LibOrder.OrderInfo memory orderInfo,
+ address takerAddress,
+ bytes memory signature
+ )
+ internal
+ view;
+
+ /// @dev Validates context for fillOrder. Succeeds or throws.
+ /// @param order to be filled.
+ /// @param orderInfo Status, orderHash, and amount already filled of order.
/// @param takerAssetFillAmount Desired amount of order to fill by taker.
/// @param takerAssetFilledAmount Amount of takerAsset that will be filled.
/// @param makerAssetFilledAmount Amount of makerAsset that will be transfered.
- /// @param signature Proof that the orders was created by its maker.
function assertValidFill(
LibOrder.Order memory order,
LibOrder.OrderInfo memory orderInfo,
- address takerAddress,
uint256 takerAssetFillAmount,
uint256 takerAssetFilledAmount,
- uint256 makerAssetFilledAmount,
- bytes memory signature
+ uint256 makerAssetFilledAmount
)
internal
view;