diff options
author | Remco Bloemen <remco@wicked.ventures> | 2018-08-25 09:54:15 +0800 |
---|---|---|
committer | Remco Bloemen <remco@wicked.ventures> | 2018-08-25 09:54:15 +0800 |
commit | d652deea232417bbef223bde46d8c12e9922b277 (patch) | |
tree | f40e28c1231fa6646aae3354f3e58d98fa000e14 /packages/contracts/src/2.0.0/protocol/Exchange/mixins/MWrapperFunctions.sol | |
parent | 6b866d60533c7e46446bfb69639b07affd1aeb17 (diff) | |
parent | f938c989e3e07161de20dd865baf59eecdde872d (diff) | |
download | dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar.gz dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar.bz2 dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar.lz dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar.xz dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.tar.zst dexon-sol-tools-d652deea232417bbef223bde46d8c12e9922b277.zip |
Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js into fix/contracts/robustMatching
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/mixins/MWrapperFunctions.sol')
-rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/mixins/MWrapperFunctions.sol | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MWrapperFunctions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MWrapperFunctions.sol new file mode 100644 index 000000000..e04d4a429 --- /dev/null +++ b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MWrapperFunctions.sol @@ -0,0 +1,40 @@ +/* + + Copyright 2018 ZeroEx Intl. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +*/ + +pragma solidity 0.4.24; +pragma experimental ABIEncoderV2; + +import "../libs/LibOrder.sol"; +import "../libs/LibFillResults.sol"; +import "../interfaces/IWrapperFunctions.sol"; + + +contract MWrapperFunctions { + + /// @dev Fills the input order. Reverts if exact takerAssetFillAmount not filled. + /// @param order LibOrder.Order struct containing order specifications. + /// @param takerAssetFillAmount Desired amount of takerAsset to sell. + /// @param signature Proof that order has been created by maker. + function fillOrKillOrderInternal( + LibOrder.Order memory order, + uint256 takerAssetFillAmount, + bytes memory signature + ) + internal + returns (LibFillResults.FillResults memory fillResults); +} |