diff options
| author | Jacob Evans <dekz@dekz.net> | 2017-11-23 11:37:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-23 11:37:34 +0800 |
| commit | 437ac301db3c03c0abd0f741a17c56a4eebc2aa4 (patch) | |
| tree | 2bd3276289578e99140f8f1168af58f07d566476 /packages/0x.js/src/utils | |
| parent | 9c9ce9752537122df51b935bf1f63f128414fc0f (diff) | |
| parent | 215740fab27d75630f55e7a3194b9e498b511c08 (diff) | |
| download | dexon-sol-tools-437ac301db3c03c0abd0f741a17c56a4eebc2aa4.tar dexon-sol-tools-437ac301db3c03c0abd0f741a17c56a4eebc2aa4.tar.gz dexon-sol-tools-437ac301db3c03c0abd0f741a17c56a4eebc2aa4.tar.bz2 dexon-sol-tools-437ac301db3c03c0abd0f741a17c56a4eebc2aa4.tar.lz dexon-sol-tools-437ac301db3c03c0abd0f741a17c56a4eebc2aa4.tar.xz dexon-sol-tools-437ac301db3c03c0abd0f741a17c56a4eebc2aa4.tar.zst dexon-sol-tools-437ac301db3c03c0abd0f741a17c56a4eebc2aa4.zip | |
Merge branch 'development' into feature/calculate-remaining-proportions
Diffstat (limited to 'packages/0x.js/src/utils')
| -rw-r--r-- | packages/0x.js/src/utils/order_validation_utils.ts | 4 | ||||
| -rw-r--r-- | packages/0x.js/src/utils/utils.ts | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/packages/0x.js/src/utils/order_validation_utils.ts b/packages/0x.js/src/utils/order_validation_utils.ts index f03703c4e..ed723e3d4 100644 --- a/packages/0x.js/src/utils/order_validation_utils.ts +++ b/packages/0x.js/src/utils/order_validation_utils.ts @@ -102,7 +102,7 @@ export class OrderValidationUtils { if (order.takerTokenAmount.eq(unavailableTakerTokenAmount)) { throw new Error(ExchangeContractErrs.OrderAlreadyCancelledOrFilled); } - const currentUnixTimestampSec = utils.getCurrentUnixTimestamp(); + const currentUnixTimestampSec = utils.getCurrentUnixTimestampSec(); if (order.expirationUnixTimestampSec.lessThan(currentUnixTimestampSec)) { throw new Error(ExchangeContractErrs.OrderCancelExpired); } @@ -150,7 +150,7 @@ export class OrderValidationUtils { } } private validateOrderNotExpiredOrThrow(expirationUnixTimestampSec: BigNumber) { - const currentUnixTimestampSec = utils.getCurrentUnixTimestamp(); + const currentUnixTimestampSec = utils.getCurrentUnixTimestampSec(); if (expirationUnixTimestampSec.lessThan(currentUnixTimestampSec)) { throw new Error(ExchangeContractErrs.OrderFillExpired); } diff --git a/packages/0x.js/src/utils/utils.ts b/packages/0x.js/src/utils/utils.ts index 280f3e979..5370c3b4b 100644 --- a/packages/0x.js/src/utils/utils.ts +++ b/packages/0x.js/src/utils/utils.ts @@ -49,7 +49,10 @@ export const utils = { const hashHex = ethUtil.bufferToHex(hashBuff); return hashHex; }, - getCurrentUnixTimestamp(): BigNumber { - return new BigNumber(Date.now() / 1000); + getCurrentUnixTimestampSec(): BigNumber { + return new BigNumber(Date.now() / 1000).round(); + }, + getCurrentUnixTimestampMs(): BigNumber { + return new BigNumber(Date.now()); }, }; |