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

Fixed merge error when rebasing wrt length variable in asset data decoders

Browse Source
This commit is contained in:
Greg Hysen
2018-06-05 16:44:47 -07:00
parent 774d831fae
commit b19276bb0f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol
View File

@@ -91,13 +91,13 @@ contract ERC20Proxy is
// Validate encoded data length
uint256 length = assetData.length;
require(
assetData.length == 21,
length == 21,
LENGTH_21_REQUIRED
);
// Decode data
token = readAddress(assetData, 0);
proxyId = uint8(assetData[length-1]);
proxyId = uint8(assetData[length - 1]);
return (proxyId, token);
}

4
packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol
View File

@@ -106,14 +106,14 @@ contract ERC721Proxy is
// Validate encoded data length
uint256 length = assetData.length;
require(
assetData.length >= 53,
length >= 53,
LENGTH_AT_LEAST_53_REQUIRED
);
// Decode asset data.
token = readAddress(assetData, 0);
tokenId = readUint256(assetData, 20);
if (assetData.length > 53) {
if (length > 53) {
receiverData = readBytes(assetData, 52);
}
proxyId = uint8(assetData[length-1]);