3 files changed, 41 insertions, 4 deletions
diff --git a/packages/contracts/src/utils/asset_wrapper.ts b/packages/contracts/src/utils/asset_wrapper.ts
index fd543621f..9c683054d 100644
--- a/packages/contracts/src/utils/asset_wrapper.ts
+++ b/packages/contracts/src/utils/asset_wrapper.ts
@@ -110,16 +110,20 @@ export class AssetWrapper {
             case constants.ERC721_PROXY_ID: {
                 const assetWrapper = this._proxyIdToAssetWrappers[proxyId] as ERC721Wrapper;
                 const erc721ProxyData = assetProxyUtils.decodeERC721AssetData(assetData);
-                const isProxyApproved = await assetWrapper.isProxyApprovedAsync(
+                const isProxyApprovedForAll = await assetWrapper.isProxyApprovedForAllAsync(
+                    userAddress,
                     erc721ProxyData.tokenAddress,
                     erc721ProxyData.tokenId,
                 );
-                const isProxyApprovedForAllAsync = await assetWrapper.isProxyApprovedForAllAsync(
-                    userAddress,
+                if (isProxyApprovedForAll) {
+                    return constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
+                }
+
+                const isProxyApproved = await assetWrapper.isProxyApprovedAsync(
                     erc721ProxyData.tokenAddress,
                     erc721ProxyData.tokenId,
                 );
-                const allowance = isProxyApproved || isProxyApprovedForAllAsync ? new BigNumber(1) : new BigNumber(0);
+                const allowance = isProxyApproved ? new BigNumber(1) : new BigNumber(0);
                 return allowance;
             }
             default:
diff --git a/packages/contracts/src/utils/core_combinatorial_utils.ts b/packages/contracts/src/utils/core_combinatorial_utils.ts
index f1a5599ef..7e9d18e46 100644
--- a/packages/contracts/src/utils/core_combinatorial_utils.ts
+++ b/packages/contracts/src/utils/core_combinatorial_utils.ts
@@ -630,6 +630,14 @@ export class CoreCombinatorialUtils {
                 );
                 break;
 
+            case AllowanceAmountScenario.Unlimited:
+                await this.assetWrapper.setProxyAllowanceAsync(
+                    signedOrder.makerAddress,
+                    signedOrder.makerAssetData,
+                    constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS,
+                );
+                break;
+
             default:
                 throw errorUtils.spawnSwitchErr(
                     'makerStateScenario.traderAssetAllowance',
@@ -659,6 +667,14 @@ export class CoreCombinatorialUtils {
                 );
                 break;
 
+            case AllowanceAmountScenario.Unlimited:
+                await this.assetWrapper.setProxyAllowanceAsync(
+                    signedOrder.makerAddress,
+                    this.zrxAssetData,
+                    constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS,
+                );
+                break;
+
             default:
                 throw errorUtils.spawnSwitchErr(
                     'makerStateScenario.zrxFeeAllowance',
@@ -738,6 +754,14 @@ export class CoreCombinatorialUtils {
                 );
                 break;
 
+            case AllowanceAmountScenario.Unlimited:
+                await this.assetWrapper.setProxyAllowanceAsync(
+                    this.takerAddress,
+                    signedOrder.takerAssetData,
+                    constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS,
+                );
+                break;
+
             default:
                 throw errorUtils.spawnSwitchErr(
                     'takerStateScenario.traderAssetAllowance',
@@ -767,6 +791,14 @@ export class CoreCombinatorialUtils {
                 );
                 break;
 
+            case AllowanceAmountScenario.Unlimited:
+                await this.assetWrapper.setProxyAllowanceAsync(
+                    signedOrder.takerAddress,
+                    this.zrxAssetData,
+                    constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS,
+                );
+                break;
+
             default:
                 throw errorUtils.spawnSwitchErr(
                     'takerStateScenario.zrxFeeAllowance',
diff --git a/packages/contracts/src/utils/types.ts b/packages/contracts/src/utils/types.ts
index 0b419d672..7d9217c50 100644
--- a/packages/contracts/src/utils/types.ts
+++ b/packages/contracts/src/utils/types.ts
@@ -211,6 +211,7 @@ export enum AllowanceAmountScenario {
     Exact = 'EXACT',
     TooLow = 'TOO_LOW',
     Higher = 'HIGHER',
+    Unlimited = 'UNLIMITED',
 }
 
 export interface TraderStateScenario {