aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol2
-rw-r--r--packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol2
-rw-r--r--packages/contracts/src/contracts/current/test/DummyERC721Token/DummyERC721Token.sol3
3 files changed, 5 insertions, 2 deletions
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol
index e8a7a148f..de00c4843 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol
@@ -30,6 +30,8 @@ contract MixinSettlementProxy is
LibPartialAmount
{
IAssetProxy TRANSFER_PROXY;
+ // TODO: Is there a way to encode ZRX_PROXY_DATA into takerAssetData/makerAssetData?
+ // As it stands, only one of the ERC20 proxies can be used.
bytes ZRX_PROXY_DATA;
IToken ZRX_TOKEN;
diff --git a/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol b/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol
index d4e4d453b..24bf78322 100644
--- a/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol
+++ b/packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol
@@ -86,7 +86,7 @@ contract MixinWrapperFunctions is
// | | 0x120 | | 10. expirationTimeSeconds |
// | | 0x140 | | 11. salt |
// | | 0x160 | | 12. Offset to makerAssetProxyMetadata (*) |
- // | | 0x180 | | 13. Offset to takerAssetProxyMetadata (* |
+ // | | 0x180 | | 13. Offset to takerAssetProxyMetadata (*) |
// | | 0x1A0 | 32 | makerAssetProxyMetadata Length |
// | | 0x1C0 | ** | makerAssetProxyMetadata Contents |
// | | 0x1E0 | 32 | takerAssetProxyMetadata Length |
diff --git a/packages/contracts/src/contracts/current/test/DummyERC721Token/DummyERC721Token.sol b/packages/contracts/src/contracts/current/test/DummyERC721Token/DummyERC721Token.sol
index 72d0b9855..1d80521f1 100644
--- a/packages/contracts/src/contracts/current/test/DummyERC721Token/DummyERC721Token.sol
+++ b/packages/contracts/src/contracts/current/test/DummyERC721Token/DummyERC721Token.sol
@@ -41,6 +41,7 @@ contract DummyERC721Token is
public
onlyOwner
{
- super._mint(to, tokenId);
+ require(!exists(tokenId));
+ _mint(to, tokenId);
}
}