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

Removed receiverData from ERC721 Proxy Id generation

Browse Source
This commit is contained in:
Greg Hysen
2018-07-16 17:11:14 +02:00
parent 9f74feb347
commit e1a9f3435f
7 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/contracts/src/2.0.0/forwarder/MixinForwarderCore.sol vendored
View File

@@ -40,7 +40,7 @@ contract MixinForwarderCore is
MForwarderCore
{
bytes4 constant internal ERC20_DATA_ID = bytes4(keccak256("ERC20Token(address)"));
bytes4 constant internal ERC721_DATA_ID = bytes4(keccak256("ERC721Token(address,uint256,bytes)"));
bytes4 constant internal ERC721_DATA_ID = bytes4(keccak256("ERC721Token(address,uint256)"));
uint256 constant internal MAX_UINT = 2**256 - 1;
constructor ()

6
packages/contracts/src/2.0.0/forwarder/MixinTransfer.sol vendored
View File

@@ -109,12 +109,10 @@ contract MixinTransfer is
// Decode asset data.
address token = assetData.readAddress(16);
uint256 tokenId = assetData.readUint256(36);
bytes memory receiverData = assetData.readBytesWithLength(100);
IERC721Token(token).safeTransferFrom(
IERC721Token(token).transferFrom(
address(this),
to,
tokenId,
receiverData
tokenId
);
}
}

2
packages/contracts/src/2.0.0/protocol/AssetProxy/ERC721Proxy.sol vendored
View File

@@ -26,7 +26,7 @@ contract ERC721Proxy is
MixinAuthorizable
{
// Id of this proxy.
bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC721Token(address,uint256,bytes)"));
bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC721Token(address,uint256)"));
// solhint-disable-next-line payable-fallback
function ()

4
packages/contracts/test/asset_proxy/proxies.ts
View File

@@ -377,9 +377,9 @@ describe('Asset Transfer Proxies', () => {
});
});
it('should have an id of 0x08e937fa', async () => {
it('should have an id of 0x02571792', async () => {
const proxyId = await erc721Proxy.getProxyId.callAsync();
const expectedProxyId = '0x08e937fa';
const expectedProxyId = '0x02571792';
expect(proxyId).to.equal(expectedProxyId);
});
});