diff --git a/contracts/zero-ex/contracts/src/features/INativeOrdersFeature.sol b/contracts/zero-ex/contracts/src/features/INativeOrdersFeature.sol index 8e65340956..53943909fd 100644 --- a/contracts/zero-ex/contracts/src/features/INativeOrdersFeature.sol +++ b/contracts/zero-ex/contracts/src/features/INativeOrdersFeature.sol @@ -76,13 +76,26 @@ interface INativeOrdersFeature { address maker ); - /// @dev Emitted whenever limit or RFQ orders are cancelled by pair by a maker. + /// @dev Emitted whenever Limit orders are cancelled by pair by a maker. /// @param maker The maker of the order. /// @param makerToken The maker token in a pair for the orders cancelled. /// @param takerToken The taker token in a pair for the orders cancelled. /// @param minValidSalt The new minimum valid salt an order with this pair must /// have. - event PairOrdersCancelled( + event PairCancelledLimitOrders( + address maker, + address makerToken, + address takerToken, + uint256 minValidSalt + ); + + /// @dev Emitted whenever RFQ orders are cancelled by pair by a maker. + /// @param maker The maker of the order. + /// @param makerToken The maker token in a pair for the orders cancelled. + /// @param takerToken The taker token in a pair for the orders cancelled. + /// @param minValidSalt The new minimum valid salt an order with this pair must + /// have. + event PairCancelledRfqOrders( address maker, address makerToken, address takerToken, diff --git a/contracts/zero-ex/contracts/src/features/NativeOrdersFeature.sol b/contracts/zero-ex/contracts/src/features/NativeOrdersFeature.sol index d089e41c48..fb529af11c 100644 --- a/contracts/zero-ex/contracts/src/features/NativeOrdersFeature.sol +++ b/contracts/zero-ex/contracts/src/features/NativeOrdersFeature.sol @@ -467,7 +467,7 @@ contract NativeOrdersFeature is [address(makerToken)] [address(takerToken)] = minValidSalt; - emit PairOrdersCancelled( + emit PairCancelledLimitOrders( msg.sender, address(makerToken), address(takerToken), @@ -541,7 +541,7 @@ contract NativeOrdersFeature is [address(makerToken)] [address(takerToken)] = minValidSalt; - emit PairOrdersCancelled( + emit PairCancelledRfqOrders( msg.sender, address(makerToken), address(takerToken), diff --git a/contracts/zero-ex/test/features/native_orders_feature_test.ts b/contracts/zero-ex/test/features/native_orders_feature_test.ts index c170ac8a8c..332b08dbf1 100644 --- a/contracts/zero-ex/test/features/native_orders_feature_test.ts +++ b/contracts/zero-ex/test/features/native_orders_feature_test.ts @@ -587,7 +587,7 @@ blockchainTests.resets('NativeOrdersFeature', env => { minValidSalt, }, ], - IZeroExEvents.PairOrdersCancelled, + IZeroExEvents.PairCancelledLimitOrders, ); const statuses = (await Promise.all(orders.map(o => zeroEx.getLimitOrderInfo(o).callAsync()))).map( oi => oi.status, @@ -624,7 +624,7 @@ blockchainTests.resets('NativeOrdersFeature', env => { minValidSalt, }, ], - IZeroExEvents.PairOrdersCancelled, + IZeroExEvents.PairCancelledRfqOrders, ); const statuses = (await Promise.all(orders.map(o => zeroEx.getRfqOrderInfo(o).callAsync()))).map( oi => oi.status, @@ -680,7 +680,7 @@ blockchainTests.resets('NativeOrdersFeature', env => { minValidSalt, }, ], - IZeroExEvents.PairOrdersCancelled, + IZeroExEvents.PairCancelledLimitOrders, ); const statuses = (await Promise.all(orders.map(o => zeroEx.getLimitOrderInfo(o).callAsync()))).map( oi => oi.status, @@ -722,7 +722,7 @@ blockchainTests.resets('NativeOrdersFeature', env => { minValidSalt, }, ], - IZeroExEvents.PairOrdersCancelled, + IZeroExEvents.PairCancelledRfqOrders, ); const statuses = (await Promise.all(orders.map(o => zeroEx.getRfqOrderInfo(o).callAsync()))).map( oi => oi.status,