aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-08-22 07:06:21 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-08-25 08:30:56 +0800
commit6f88e9bdbdd8f44c45053b8c17c84411f9499084 (patch)
tree54130461d0a157ccc89a0c018bb6d341a9d0262b /packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
parentd8cb56caa33885397f557afac5a4ccb24efb47d0 (diff)
downloaddexon-sol-tools-6f88e9bdbdd8f44c45053b8c17c84411f9499084.tar
dexon-sol-tools-6f88e9bdbdd8f44c45053b8c17c84411f9499084.tar.gz
dexon-sol-tools-6f88e9bdbdd8f44c45053b8c17c84411f9499084.tar.bz2
dexon-sol-tools-6f88e9bdbdd8f44c45053b8c17c84411f9499084.tar.lz
dexon-sol-tools-6f88e9bdbdd8f44c45053b8c17c84411f9499084.tar.xz
dexon-sol-tools-6f88e9bdbdd8f44c45053b8c17c84411f9499084.tar.zst
dexon-sol-tools-6f88e9bdbdd8f44c45053b8c17c84411f9499084.zip
Add internal fill functions, add reentrancy guard to public functions that make external calls
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol')
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
index 20f4b1c33..25220a673 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinMatchOrders.sol
@@ -14,6 +14,7 @@
pragma solidity 0.4.24;
pragma experimental ABIEncoderV2;
+import "../../utils/ReentrancyGuard/ReentrancyGuard.sol";
import "./libs/LibConstants.sol";
import "./libs/LibMath.sol";
import "./libs/LibOrder.sol";
@@ -25,6 +26,7 @@ import "./mixins/MAssetProxyDispatcher.sol";
contract MixinMatchOrders is
+ ReentrancyGuard,
LibConstants,
LibMath,
MAssetProxyDispatcher,
@@ -48,6 +50,7 @@ contract MixinMatchOrders is
bytes memory rightSignature
)
public
+ nonReentrant
returns (LibFillResults.MatchedFillResults memory matchedFillResults)
{
// We assume that rightOrder.takerAssetData == leftOrder.makerAssetData and rightOrder.makerAssetData == leftOrder.takerAssetData.