aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-08-25 07:58:46 +0800
committerGitHub <noreply@github.com>2018-08-25 07:58:46 +0800
commit94e01be9ed5bfe2d0ace4cd0562fced889b34108 (patch)
treee51d45ed16fc07960b4a86f7d1d3f043148be2a4 /packages/contracts
parentcd5e9a51159a985508dc6223e3adb826a822e73f (diff)
parent11328bd93d498abfcfbfa38ed69db8cb268f12be (diff)
downloaddexon-sol-tools-94e01be9ed5bfe2d0ace4cd0562fced889b34108.tar
dexon-sol-tools-94e01be9ed5bfe2d0ace4cd0562fced889b34108.tar.gz
dexon-sol-tools-94e01be9ed5bfe2d0ace4cd0562fced889b34108.tar.bz2
dexon-sol-tools-94e01be9ed5bfe2d0ace4cd0562fced889b34108.tar.lz
dexon-sol-tools-94e01be9ed5bfe2d0ace4cd0562fced889b34108.tar.xz
dexon-sol-tools-94e01be9ed5bfe2d0ace4cd0562fced889b34108.tar.zst
dexon-sol-tools-94e01be9ed5bfe2d0ace4cd0562fced889b34108.zip
Merge pull request #1021 from 0xProject/feature/contracts/skipselftransfer
[Contracts] Skip self transfers
Diffstat (limited to 'packages/contracts')
-rw-r--r--packages/contracts/src/2.0.0/protocol/Exchange/MixinAssetProxyDispatcher.sol2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinAssetProxyDispatcher.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinAssetProxyDispatcher.sol
index e9f882194..80475e6e3 100644
--- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinAssetProxyDispatcher.sol
+++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinAssetProxyDispatcher.sol
@@ -83,7 +83,7 @@ contract MixinAssetProxyDispatcher is
internal
{
// Do nothing if no amount should be transferred.
- if (amount > 0) {
+ if (amount > 0 && from != to) {
// Ensure assetData length is valid
require(
assetData.length > 3,