Revalidate affected orders regardless of ERC721 approval operator (#782)

0xProject · Apr 8, 2020 · c5213dd · c5213dd
1 parent 9613b42
commit c5213dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/scenario/scenario.go b/scenario/scenario.go
@@ -324,9 +324,7 @@ func setDummyERC721BalanceAndAllowance(t *testing.T, traderAddress common.Addres
 	waitTxnSuccessfullyMined(t, txn)
 
 	// Set allowance
-	// HACK(albrow): Our tests rely on unapproving/unsetting the allowance. You can't do
-	// that for individual tokens, so we use SetApprovalForAll here.
-	txn, err = dummyERC721Token.SetApprovalForAll(opts, ganacheAddresses.ERC721Proxy, true)
+	txn, err = dummyERC721Token.Approve(opts, ganacheAddresses.ERC721Proxy, tokenID)
 	require.NoError(t, err)
 	waitTxnSuccessfullyMined(t, txn)
 }

diff --git a/zeroex/orderwatch/order_watcher.go b/zeroex/orderwatch/order_watcher.go
@@ -582,10 +582,6 @@ func (w *Watcher) handleBlockEvents(
 					}
 					return err
 				}
-				// Ignores approvals set to anyone except the AssetProxy
-				if approvalEvent.Approved != w.contractAddresses.ERC721Proxy {
-					continue
-				}
 				contractEvent.Parameters = approvalEvent
 				orders, err = w.findOrdersByTokenAddressAndTokenID(approvalEvent.Owner, log.Address, approvalEvent.TokenId)
 				if err != nil {

diff --git a/zeroex/orderwatch/order_watcher_test.go b/zeroex/orderwatch/order_watcher_test.go
@@ -261,7 +261,8 @@ func TestOrderWatcherUnfundedInsufficientERC721Allowance(t *testing.T) {
 	meshDB, err := meshdb.New("/tmp/leveldb_testing/"+uuid.New().String(), ganacheAddresses)
 	require.NoError(t, err)
 
-	makerAssetData := scenario.GetDummyERC721AssetData(big.NewInt(1))
+	tokenID := big.NewInt(1)
+	makerAssetData := scenario.GetDummyERC721AssetData(tokenID)
 	signedOrder := scenario.NewSignedTestOrder(t,
 		orderopts.SetupMakerState(true),
 		orderopts.MakerAssetAmount(big.NewInt(1)),
@@ -271,12 +272,13 @@ func TestOrderWatcherUnfundedInsufficientERC721Allowance(t *testing.T) {
 	defer cancelFn()
 	blockWatcher, orderEventsChan := setupOrderWatcherScenario(ctx, t, ethClient, meshDB, signedOrder)
 
-	// Remove Maker's NFT approval to ERC721Proxy
+	// Remove Maker's NFT approval to ERC721Proxy. We do this by setting the
+	// operator/spender to the null address.
 	opts := &bind.TransactOpts{
 		From:   signedOrder.MakerAddress,
 		Signer: scenario.GetTestSignerFn(signedOrder.MakerAddress),
 	}
-	txn, err := dummyERC721Token.SetApprovalForAll(opts, ganacheAddresses.ERC721Proxy, false)
+	txn, err := dummyERC721Token.Approve(opts, constants.NullAddress, tokenID)
 	require.NoError(t, err)
 	waitTxnSuccessfullyMined(t, ethClient, txn)