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

Return MAX_UINT256 for unlimited allowances in all token standards

Browse Source
This commit is contained in:
Amir Bandeali
2019-05-28 17:01:54 -07:00
parent 3c08f5b86a
commit 066f3bb646
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
contracts/asset-proxy/contracts/src/libs/LibAssetData.sol
View File

@@ -29,6 +29,8 @@ import "./LibAssetProxyIds.sol";
contract LibAssetData is
LibAssetProxyIds
{
uint256 constant internal _MAX_UINT256 = uint256(-1);
using LibBytes for bytes;
/// @dev Returns the owner's balance of the token(s) specified in
@@ -132,10 +134,14 @@ contract LibAssetData is
} else if (proxyId == ERC721_PROXY_ID) {
(, address tokenAddress, uint256 tokenId) = decodeERC721AssetData(assetData);
IERC721Token token = IERC721Token(tokenAddress);
allowance = (token.getApproved(tokenId) != address(0) || token.isApprovedForAll(owner, spender)) ? 1 : 0;
if (token.isApprovedForAll(owner, spender)) {
allowance = _MAX_UINT256;
} else if (token.getApproved(tokenId) == spender) {
allowance = 1;
}
} else if (proxyId == ERC1155_PROXY_ID) {
(, address tokenAddress, , , ) = decodeERC1155AssetData(assetData);
allowance = IERC1155(tokenAddress).isApprovedForAll(owner, spender) ? 1 : 0;
allowance = IERC1155(tokenAddress).isApprovedForAll(owner, spender) ? _MAX_UINT256 : 0;
} else if (proxyId == MULTI_ASSET_PROXY_ID) {
(
,

4
contracts/asset-proxy/test/lib_asset_data.ts
View File

@@ -325,7 +325,7 @@ describe('LibAssetData', () => {
anotherApprovedSpenderAddress,
await libAssetData.encodeERC721AssetData.callAsync(erc721TokenAddress, firstERC721TokenId),
),
).to.bignumber.equal(1);
).to.bignumber.equal(constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS);
});
it('should query ERC1155 allowances by asset data', async () => {
@@ -348,7 +348,7 @@ describe('LibAssetData', () => {
'0x',
),
),
).to.bignumber.equal(1);
).to.bignumber.equal(constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS);
});
it('should query multi-asset allowances by asset data', async () => {