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-18 03:11:51 +0800
committerRemco Bloemen <remco@wicked.ventures>2018-08-25 07:46:23 +0800
commite706fa76acfbf933479f767749755446cdaf438a (patch)
treedbdbd25998f3e3d9ee0541ae903fb201218b4194 /packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol
parentcd5e9a51159a985508dc6223e3adb826a822e73f (diff)
downloaddexon-0x-contracts-e706fa76acfbf933479f767749755446cdaf438a.tar
dexon-0x-contracts-e706fa76acfbf933479f767749755446cdaf438a.tar.gz
dexon-0x-contracts-e706fa76acfbf933479f767749755446cdaf438a.tar.bz2
dexon-0x-contracts-e706fa76acfbf933479f767749755446cdaf438a.tar.lz
dexon-0x-contracts-e706fa76acfbf933479f767749755446cdaf438a.tar.xz
dexon-0x-contracts-e706fa76acfbf933479f767749755446cdaf438a.tar.zst
dexon-0x-contracts-e706fa76acfbf933479f767749755446cdaf438a.zip
Add overfill and price assertion to assertValidFill
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.sol2
1 files changed, 2 insertions, 0 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 c165b647c..eccb6a29d 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
@@ -90,6 +90,7 @@ contract MExchangeCore is
/// @param takerAddress Address of order taker.
/// @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,
@@ -97,6 +98,7 @@ contract MExchangeCore is
address takerAddress,
uint256 takerAssetFillAmount,
uint256 takerAssetFilledAmount,
+ uint256 makerAssetFilledAmount,
bytes memory signature
)
internal