crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes to the contracts

Browse Source
This commit is contained in:
Greg Hysen
2018-04-12 17:44:06 -07:00
committed by Amir Bandeali
parent 37cfeed0f5
commit b3b29f527e
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/contracts/src/contracts/current/protocol/Exchange/MixinSettlementProxy.sol
View File

@@ -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;

2
packages/contracts/src/contracts/current/protocol/Exchange/MixinWrapperFunctions.sol
View File

@@ -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 |

3
packages/contracts/src/contracts/current/test/DummyERC721Token/DummyERC721Token.sol
View File

@@ -41,6 +41,7 @@ contract DummyERC721Token is
public
onlyOwner
{
super._mint(to, tokenId);
require(!exists(tokenId));
_mint(to, tokenId);
}
}