diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-07-25 17:59:29 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-07-25 17:59:29 +0800 |
| commit | e5aa03da64c45a8a777226ff82f497ecbbdaacae (patch) | |
| tree | af6ff4addb155f47673b0f41890e0d173549d96d /packages/contracts | |
| parent | 47c0195b07556de25118c8f418163ad84a0d869d (diff) | |
| parent | fac90c446cc3a79ffe57ae13c685e7555714cf23 (diff) | |
| download | dexon-sol-tools-e5aa03da64c45a8a777226ff82f497ecbbdaacae.tar dexon-sol-tools-e5aa03da64c45a8a777226ff82f497ecbbdaacae.tar.gz dexon-sol-tools-e5aa03da64c45a8a777226ff82f497ecbbdaacae.tar.bz2 dexon-sol-tools-e5aa03da64c45a8a777226ff82f497ecbbdaacae.tar.lz dexon-sol-tools-e5aa03da64c45a8a777226ff82f497ecbbdaacae.tar.xz dexon-sol-tools-e5aa03da64c45a8a777226ff82f497ecbbdaacae.tar.zst dexon-sol-tools-e5aa03da64c45a8a777226ff82f497ecbbdaacae.zip | |
merge v2-prototype
Diffstat (limited to 'packages/contracts')
| -rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol | 2 | ||||
| -rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol index 6f435892b..354d0e9c3 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol @@ -46,7 +46,7 @@ contract MixinExchangeCore is mapping (bytes32 => bool) public cancelled; // Mapping of makerAddress => senderAddress => lowest salt an order can have in order to be fillable - // Orders with specified senderAddress and with a salt less than their epoch to are considered cancelled + // Orders with specified senderAddress and with a salt less than their epoch are considered cancelled mapping (address => mapping (address => uint256)) public orderEpoch; /// @dev Cancels all orders created by makerAddress with a salt less than or equal to the targetOrderEpoch diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol index 9e3b5a2e2..c165b647c 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/mixins/MExchangeCore.sol @@ -56,7 +56,7 @@ contract MExchangeCore is event CancelUpTo( address indexed makerAddress, // Orders cancelled must have been created by this address. address indexed senderAddress, // Orders cancelled must have a `senderAddress` equal to this address. - uint256 orderEpoch // Orders specified makerAddress and senderAddress with a salt <= this value are considered cancelled. + uint256 orderEpoch // Orders with specified makerAddress and senderAddress with a salt less than this value are considered cancelled. ); /// @dev Updates state with results of a fill order. |