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

Replace PairOrdersCancelled event with PairCancelledLimitOrders and PairCancelledRfqOrders (#54)

Browse Source
This commit is contained in:
Greg Hysz 2020-11-27 13:31:12 -08:00 committed by GitHub
parent 88d7e73eba
commit 6307ebc3a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contracts/zero-ex/contracts/src/features/INativeOrdersFeature.sol
View File

@ -76,13 +76,26 @@ interface INativeOrdersFeature {
address maker 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 maker The maker of the order.
/// @param makerToken The maker token in a pair for the orders cancelled. /// @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 takerToken The taker token in a pair for the orders cancelled.
/// @param minValidSalt The new minimum valid salt an order with this pair must /// @param minValidSalt The new minimum valid salt an order with this pair must
/// have. /// 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 maker,
address makerToken, address makerToken,
address takerToken, address takerToken,

4
contracts/zero-ex/contracts/src/features/NativeOrdersFeature.sol
View File

@ -467,7 +467,7 @@ contract NativeOrdersFeature is
[address(makerToken)] [address(makerToken)]
[address(takerToken)] = minValidSalt; [address(takerToken)] = minValidSalt;
emit PairOrdersCancelled( emit PairCancelledLimitOrders(
msg.sender, msg.sender,
address(makerToken), address(makerToken),
address(takerToken), address(takerToken),
@ -541,7 +541,7 @@ contract NativeOrdersFeature is
[address(makerToken)] [address(makerToken)]
[address(takerToken)] = minValidSalt; [address(takerToken)] = minValidSalt;
emit PairOrdersCancelled( emit PairCancelledRfqOrders(
msg.sender, msg.sender,
address(makerToken), address(makerToken),
address(takerToken), address(takerToken),

8
contracts/zero-ex/test/features/native_orders_feature_test.ts
View File

@ -587,7 +587,7 @@ blockchainTests.resets('NativeOrdersFeature', env => {
minValidSalt, minValidSalt,
}, },
], ],
IZeroExEvents.PairOrdersCancelled, IZeroExEvents.PairCancelledLimitOrders,
); );
const statuses = (await Promise.all(orders.map(o => zeroEx.getLimitOrderInfo(o).callAsync()))).map( const statuses = (await Promise.all(orders.map(o => zeroEx.getLimitOrderInfo(o).callAsync()))).map(
oi => oi.status, oi => oi.status,
@ -624,7 +624,7 @@ blockchainTests.resets('NativeOrdersFeature', env => {
minValidSalt, minValidSalt,
}, },
], ],
IZeroExEvents.PairOrdersCancelled, IZeroExEvents.PairCancelledRfqOrders,
); );
const statuses = (await Promise.all(orders.map(o => zeroEx.getRfqOrderInfo(o).callAsync()))).map( const statuses = (await Promise.all(orders.map(o => zeroEx.getRfqOrderInfo(o).callAsync()))).map(
oi => oi.status, oi => oi.status,
@ -680,7 +680,7 @@ blockchainTests.resets('NativeOrdersFeature', env => {
minValidSalt, minValidSalt,
}, },
], ],
IZeroExEvents.PairOrdersCancelled, IZeroExEvents.PairCancelledLimitOrders,
); );
const statuses = (await Promise.all(orders.map(o => zeroEx.getLimitOrderInfo(o).callAsync()))).map( const statuses = (await Promise.all(orders.map(o => zeroEx.getLimitOrderInfo(o).callAsync()))).map(
oi => oi.status, oi => oi.status,
@ -722,7 +722,7 @@ blockchainTests.resets('NativeOrdersFeature', env => {
minValidSalt, minValidSalt,
}, },
], ],
IZeroExEvents.PairOrdersCancelled, IZeroExEvents.PairCancelledRfqOrders,
); );
const statuses = (await Promise.all(orders.map(o => zeroEx.getRfqOrderInfo(o).callAsync()))).map( const statuses = (await Promise.all(orders.map(o => zeroEx.getRfqOrderInfo(o).callAsync()))).map(
oi => oi.status, oi => oi.status,