diff options
| author | Remco Bloemen <remco@wicked.ventures> | 2018-08-25 08:29:52 +0800 |
|---|---|---|
| committer | Remco Bloemen <remco@wicked.ventures> | 2018-08-25 08:29:52 +0800 |
| commit | 6b866d60533c7e46446bfb69639b07affd1aeb17 (patch) | |
| tree | c12c4d55d56e209569649f3a5292943ca8085476 /packages/contracts/src | |
| parent | e21599285941a092a6c6f2dbf58f14f467dcca85 (diff) | |
| download | dexon-sol-tools-6b866d60533c7e46446bfb69639b07affd1aeb17.tar dexon-sol-tools-6b866d60533c7e46446bfb69639b07affd1aeb17.tar.gz dexon-sol-tools-6b866d60533c7e46446bfb69639b07affd1aeb17.tar.bz2 dexon-sol-tools-6b866d60533c7e46446bfb69639b07affd1aeb17.tar.lz dexon-sol-tools-6b866d60533c7e46446bfb69639b07affd1aeb17.tar.xz dexon-sol-tools-6b866d60533c7e46446bfb69639b07affd1aeb17.tar.zst dexon-sol-tools-6b866d60533c7e46446bfb69639b07affd1aeb17.zip | |
Revert maker not equal taker check
Diffstat (limited to 'packages/contracts/src')
| -rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol index dc62db448..515606cb9 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol @@ -303,12 +303,6 @@ contract MixinExchangeCore is ); } - // Orders can not be self-filled (use cancel instead) - require( - order.makerAddress != takerAddress, - "INVALID_TAKER" - ); - // Validate Maker signature (check only if first time seen) if (orderInfo.orderTakerAssetFilledAmount == 0) { require( @@ -339,6 +333,7 @@ contract MixinExchangeCore is view { // Revert if fill amount is invalid + // TODO: reconsider necessity for v2.1 require( takerAssetFillAmount != 0, "INVALID_TAKER_AMOUNT" |