diff options
| author | Greg Hysen <greg.hysen@gmail.com> | 2018-04-13 08:44:06 +0800 |
|---|---|---|
| committer | Amir Bandeali <abandeali1@gmail.com> | 2018-04-21 04:56:17 +0800 |
| commit | b3b29f527e3e3e435b5fe97dd7eb4a42f0fa182c (patch) | |
| tree | f3f8ed82c9d749b1a9051370e2192b13f6fec950 /packages/contracts/src | |
| parent | 37cfeed0f5f17d6231c25327c13e528a2f30610a (diff) | |
| download | dexon-sol-tools-b3b29f527e3e3e435b5fe97dd7eb4a42f0fa182c.tar dexon-sol-tools-b3b29f527e3e3e435b5fe97dd7eb4a42f0fa182c.tar.gz dexon-sol-tools-b3b29f527e3e3e435b5fe97dd7eb4a42f0fa182c.tar.bz2 dexon-sol-tools-b3b29f527e3e3e435b5fe97dd7eb4a42f0fa182c.tar.lz dexon-sol-tools-b3b29f527e3e3e435b5fe97dd7eb4a42f0fa182c.tar.xz dexon-sol-tools-b3b29f527e3e3e435b5fe97dd7eb4a42f0fa182c.tar.zst dexon-sol-tools-b3b29f527e3e3e435b5fe97dd7eb4a42f0fa182c.zip | |
Minor fixes to the contracts
Diffstat (limited to 'packages/contracts/src')
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); } } |