aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2018-07-18 02:51:18 +0800
committerAmir Bandeali <abandeali1@gmail.com>2018-07-23 23:00:23 +0800
commit3506ec1caa2a6c7ee2d68970553ca53d8ceb5c64 (patch)
tree3afb70f53b247b83a0d0d54fe1304b0f2c9bd9bf /packages/contracts
parent1f0e819756ea247e592a8a05c53561894c8ca87a (diff)
downloaddexon-0x-contracts-3506ec1caa2a6c7ee2d68970553ca53d8ceb5c64.tar
dexon-0x-contracts-3506ec1caa2a6c7ee2d68970553ca53d8ceb5c64.tar.gz
dexon-0x-contracts-3506ec1caa2a6c7ee2d68970553ca53d8ceb5c64.tar.bz2
dexon-0x-contracts-3506ec1caa2a6c7ee2d68970553ca53d8ceb5c64.tar.lz
dexon-0x-contracts-3506ec1caa2a6c7ee2d68970553ca53d8ceb5c64.tar.xz
dexon-0x-contracts-3506ec1caa2a6c7ee2d68970553ca53d8ceb5c64.tar.zst
dexon-0x-contracts-3506ec1caa2a6c7ee2d68970553ca53d8ceb5c64.zip
Use transferFrom instead of safeTransferFrom
Diffstat (limited to 'packages/contracts')
-rw-r--r--packages/contracts/src/2.0.0/forwarder/MixinAssets.sol7
-rw-r--r--packages/contracts/test/forwarder/forwarder.ts1
2 files changed, 2 insertions, 6 deletions
diff --git a/packages/contracts/src/2.0.0/forwarder/MixinAssets.sol b/packages/contracts/src/2.0.0/forwarder/MixinAssets.sol
index cd150764e..44809ed85 100644
--- a/packages/contracts/src/2.0.0/forwarder/MixinAssets.sol
+++ b/packages/contracts/src/2.0.0/forwarder/MixinAssets.sol
@@ -163,15 +163,12 @@ contract MixinAssets is
// Decode asset data.
address token = assetData.readAddress(16);
uint256 tokenId = assetData.readUint256(36);
- bytes memory receiverData = assetData.readBytesWithLength(100);
// Perform transfer.
- // TODO: Do we want to use `transferFrom` here?
- IERC721Token(token).safeTransferFrom(
+ IERC721Token(token).transferFrom(
address(this),
msg.sender,
- tokenId,
- receiverData
+ tokenId
);
}
}
diff --git a/packages/contracts/test/forwarder/forwarder.ts b/packages/contracts/test/forwarder/forwarder.ts
index f2966fe75..7b110b61f 100644
--- a/packages/contracts/test/forwarder/forwarder.ts
+++ b/packages/contracts/test/forwarder/forwarder.ts
@@ -18,7 +18,6 @@ import { constants } from '../utils/constants';
import { ERC20Wrapper } from '../utils/erc20_wrapper';
import { ERC721Wrapper } from '../utils/erc721_wrapper';
import { ExchangeWrapper } from '../utils/exchange_wrapper';
-import { formatters } from '../utils/formatters';
import { ForwarderWrapper } from '../utils/forwarder_wrapper';
import { OrderFactory } from '../utils/order_factory';
import { ContractName, ERC20BalancesByOwner } from '../utils/types';