diff options
| author | fragosti <francesco.agosti93@gmail.com> | 2018-07-25 07:02:21 +0800 |
|---|---|---|
| committer | fragosti <francesco.agosti93@gmail.com> | 2018-07-25 07:02:21 +0800 |
| commit | 9c81692d48fed4942fe6482949d6eed3629d4037 (patch) | |
| tree | aefc2a71dcfce2589c1e8505e6b64f2e6c9a9dfe /packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol | |
| parent | c505ba6f3e05f4bb415f50352fbb124fec3a71ad (diff) | |
| parent | fac90c446cc3a79ffe57ae13c685e7555714cf23 (diff) | |
| download | dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.tar dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.tar.gz dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.tar.bz2 dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.tar.lz dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.tar.xz dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.tar.zst dexon-sol-tools-9c81692d48fed4942fe6482949d6eed3629d4037.zip | |
Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/website/upgrade-allowance-toggles-to-locks-and-checks
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol')
| -rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/MixinExchangeCore.sol | 2 |
1 files changed, 1 insertions, 1 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 |