diff options
| author | Remco Bloemen <remco@wicked.ventures> | 2018-06-22 13:03:42 +0800 |
|---|---|---|
| committer | Amir Bandeali <abandeali1@gmail.com> | 2018-06-26 07:19:07 +0800 |
| commit | 7b0c13c1219fbe2d47b540476eaebb1f6358213d (patch) | |
| tree | 7b81f105b09ed2ea458513c94297486e7efc3319 /packages/contracts | |
| parent | a98ecc05af5b264f981087005bb3fa041d5c8756 (diff) | |
| download | dexon-sol-tools-7b0c13c1219fbe2d47b540476eaebb1f6358213d.tar dexon-sol-tools-7b0c13c1219fbe2d47b540476eaebb1f6358213d.tar.gz dexon-sol-tools-7b0c13c1219fbe2d47b540476eaebb1f6358213d.tar.bz2 dexon-sol-tools-7b0c13c1219fbe2d47b540476eaebb1f6358213d.tar.lz dexon-sol-tools-7b0c13c1219fbe2d47b540476eaebb1f6358213d.tar.xz dexon-sol-tools-7b0c13c1219fbe2d47b540476eaebb1f6358213d.tar.zst dexon-sol-tools-7b0c13c1219fbe2d47b540476eaebb1f6358213d.zip | |
WIP
Diffstat (limited to 'packages/contracts')
3 files changed, 3 insertions, 2 deletions
diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol index 69e2dc913..002e8b662 100644 --- a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol +++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC20Proxy.sol @@ -30,7 +30,7 @@ contract ERC20Proxy is MixinERC20Transfer { // Id of this proxy. - bytes4 constant PROXY_ID = 1; + bytes4 constant PROXY_ID = 0xf47261b0; /// @dev Gets the proxy id associated with the proxy address. /// @return Proxy id. diff --git a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol index 7a1b13d80..f6bdf2a5f 100644 --- a/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol +++ b/packages/contracts/src/contracts/current/protocol/AssetProxy/ERC721Proxy.sol @@ -30,7 +30,7 @@ contract ERC721Proxy is MixinERC721Transfer { // Id of this proxy. - bytes4 constant PROXY_ID = 2; + bytes4 constant PROXY_ID = 0xf47261b0; /// @dev Gets the proxy id associated with the proxy address. /// @return Proxy id. diff --git a/packages/contracts/test/asset_proxy/decoder.ts b/packages/contracts/test/asset_proxy/decoder.ts index 98d18aa38..f671f495e 100644 --- a/packages/contracts/test/asset_proxy/decoder.ts +++ b/packages/contracts/test/asset_proxy/decoder.ts @@ -44,6 +44,7 @@ describe('TestAssetDataDecoders', () => { it('should correctly decode ERC721 asset data', async () => { const tokenId = generatePseudoRandomSalt(); const encodedAssetData = assetProxyUtils.encodeERC721AssetData(testAddress, tokenId); + console.log(encodedAssetData); const encodedAssetDataWithoutProxyId = encodedAssetData.slice(0, -2); const expectedDecodedAssetData = assetProxyUtils.decodeERC721AssetData(encodedAssetData); let decodedTokenAddress: string; |