Skip to content

Commit a32f3b5

Browse files
committed
Move external view methods below the external ones
1 parent 3343e6a commit a32f3b5

File tree

1 file changed

+29
-31
lines changed

1 file changed

+29
-31
lines changed

contracts/interfaces/IOrderMixin.sol

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -72,37 +72,6 @@ interface IOrderMixin {
7272
uint256 slotValue
7373
);
7474

75-
/**
76-
* @notice Returns bitmask for double-spend invalidators based on lowest byte of order.info and filled quotes
77-
* @param maker Maker address
78-
* @param slot Slot number to return bitmask for
79-
* @return result Each bit represents whether corresponding was already invalidated
80-
*/
81-
function bitInvalidatorForOrder(address maker, uint256 slot) external view returns(uint256 result);
82-
83-
/**
84-
* @notice Returns bitmask for double-spend invalidators based on lowest byte of order.info and filled quotes
85-
* @param maker Address of the order maker
86-
* @param orderHash Hash of the order
87-
* @return remaining Remaining amount of the order
88-
*/
89-
function remainingInvalidatorForOrder(address maker, bytes32 orderHash) external view returns(uint256 remaining);
90-
91-
/**
92-
* @notice Returns bitmask for double-spend invalidators based on lowest byte of order.info and filled quotes
93-
* @param maker Address of the order maker
94-
* @param orderHash Hash of the order
95-
* @return remainingRaw Inverse of the remaining amount of the order if order was filled at least once, otherwise 0
96-
*/
97-
function rawRemainingInvalidatorForOrder(address maker, bytes32 orderHash) external view returns(uint256 remainingRaw);
98-
99-
/**
100-
* @notice Returns order hash, hashed with limit order protocol contract EIP712
101-
* @param order Order
102-
* @return orderHash Hash of the order
103-
*/
104-
function hashOrder(IOrderMixin.Order calldata order) external view returns(bytes32 orderHash);
105-
10675
/**
10776
* @notice Delegates execution to custom implementation. Could be used to validate if `transferFrom` works properly
10877
* @dev The function always reverts and returns the simulation results in revert data.
@@ -213,4 +182,33 @@ interface IOrderMixin {
213182
TakerTraits takerTraits,
214183
bytes calldata args
215184
) external returns(uint256 makingAmount, uint256 takingAmount, bytes32 orderHash);
185+
186+
/**
187+
* @notice Returns bitmask for double-spend invalidators based on lowest byte of order.info and filled quotes
188+
* @param maker Maker address
189+
* @param slot Slot number to return bitmask for
190+
* @return result Each bit represents whether corresponding was already invalidated
191+
*/
192+
function bitInvalidatorForOrder(address maker, uint256 slot) external view returns(uint256 result);
193+
194+
/**
195+
* @notice Returns bitmask for double-spend invalidators based on lowest byte of order.info and filled quotes
196+
* @param orderHash Hash of the order
197+
* @return remaining Remaining amount of the order
198+
*/
199+
function remainingInvalidatorForOrder(address maker, bytes32 orderHash) external view returns(uint256 remaining);
200+
201+
/**
202+
* @notice Returns bitmask for double-spend invalidators based on lowest byte of order.info and filled quotes
203+
* @param orderHash Hash of the order
204+
* @return remainingRaw Inverse of the remaining amount of the order if order was filled at least once, otherwise 0
205+
*/
206+
function rawRemainingInvalidatorForOrder(address maker, bytes32 orderHash) external view returns(uint256 remainingRaw);
207+
208+
/**
209+
* @notice Returns order hash, hashed with limit order protocol contract EIP712
210+
* @param order Order
211+
* @return orderHash Hash of the order
212+
*/
213+
function hashOrder(IOrderMixin.Order calldata order) external view returns(bytes32 orderHash);
216214
}

0 commit comments

Comments
 (0)