aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 0.10.2Leonid Logvinov2017-08-241-1/+1
* Add v0.10.2 CHANGELOGLeonid Logvinov2017-08-241-0/+4
* Hot fix the checksummed addresses in artifactsLeonid Logvinov2017-08-242-2/+2
* Merge pull request #134 from 0xProject/release-scriptLeonid2017-08-241-1/+1
|\
| * Specify tag and other values in the release scriptLeonid Logvinov2017-08-241-1/+1
|/
* 0.10.1v0.10.1Leonid Logvinov2017-08-241-1/+1
* Bump patch version due to the publishing issue with 0.10.0Leonid Logvinov2017-08-241-1/+1
* 0.10.0v0.10.0Leonid Logvinov2017-08-241-1/+1
* Merge pull request #132 from 0xProject/token-registryLeonid2017-08-244-5/+135
|\
| * Change the unregistered token in testsLeonid Logvinov2017-08-241-2/+2
| * Rename _getTokenByMetadata to _createTokenFromMetadataLeonid Logvinov2017-08-241-4/+4
| * Remove redundant else'sLeonid Logvinov2017-08-241-4/+2
| * Document changes in a CHANGELOGLeonid Logvinov2017-08-241-1/+6
| * Add tests for tokenRegistry public gettersLeonid Logvinov2017-08-242-4/+58
| * Add all public tokenRegistry functionsLeonid Logvinov2017-08-242-0/+50
| * Add test for getTokenAddressesAsyncLeonid Logvinov2017-08-241-0/+14
| * Add zeroEx.tokenRegistry.getTokenAddressesAsync()Leonid Logvinov2017-08-241-1/+10
|/
* Merge pull request #128 from 0xProject/verifyOrderLeonid2017-08-246-184/+291
|\
| * Add validation for the case where the order is fully filled or canceled and a...Leonid Logvinov2017-08-243-0/+15
| * Simplify the validation check for ExchangeContractErrs.OrderAlreadyCancelledO...Leonid Logvinov2017-08-241-1/+1
| * Remove unused varLeonid Logvinov2017-08-241-1/+0
| * Add newlineLeonid Logvinov2017-08-241-1/+2
| * Fix commentsLeonid Logvinov2017-08-241-5/+7
| * Update CHANGELOGLeonid Logvinov2017-08-241-1/+2
| * Fix order validation testsLeonid Logvinov2017-08-241-19/+20
| * Add a comment for isRoundingErrorAsyncLeonid Logvinov2017-08-241-5/+12
| * Fix isRoundingError name in CHANGELOGLeonid Logvinov2017-08-241-5/+4
| * Remove And's from namesLeonid Logvinov2017-08-243-62/+65
| * Separate order validation errors tests from exchange testsLeonid Logvinov2017-08-242-84/+95
| * Add the changes to CHANGELOGLeonid Logvinov2017-08-241-2/+6
| * Move order validation functions to orderValidationUtils and make isRoundingEr...Leonid Logvinov2017-08-242-53/+88
| * Add initial implementation for public order validation functionsLeonid Logvinov2017-08-241-48/+77
|/
* Merge pull request #131 from 0xProject/addTokenRegistryMethodFabio Berger2017-08-242-12/+42
|\
| * rename method for clarity since we return a Token and not tokenMetadataFabio Berger2017-08-242-5/+5
| * Add assertion to public methodFabio Berger2017-08-241-0/+3
| * use non-checksummed addressFabio Berger2017-08-241-1/+1
| * Add public method `getTokenMetadataIfExistsAsync` to TokenRegistry wrapper, r...Fabio Berger2017-08-232-12/+39
* | Merge pull request #130 from 0xProject/addProxyAddressMethodFabio Berger2017-08-234-3/+15
|\ \ | |/ |/|
| * Return variable instead of expressionFabio Berger2017-08-232-2/+4
| * Add PR numbers to changelog itemsFabio Berger2017-08-231-3/+3
| * Add note about the added public method in CHANGELOGFabio Berger2017-08-231-0/+1
| * Add getContractAddressAsync public method to proxy instanceFabio Berger2017-08-231-0/+9
| * rename proxy_wrapper_test to token_transfer_proxy_wrapper_testFabio Berger2017-08-231-0/+0
|/
* Merge pull request #127 from 0xProject/shouldThrowOnInsufficientBalanceOrAllo...Leonid2017-08-236-42/+49
|\
| * Rename shouldCheckTransfer to shouldThrowOnInsufficientBalanceOrAllowance in ...Leonid Logvinov2017-08-224-37/+41
| * Update CHANGELOGLeonid Logvinov2017-08-221-1/+2
| * Fix the docs for shouldThrowOnInsufficientBalanceOrAllowanceLeonid Logvinov2017-08-221-4/+6
|/
* Merge pull request #126 from 0xProject/token-transfer-proxy-renameLeonid2017-08-226-50/+50
|\
| * Rename internally Proxy to TokenTransferProxyLeonid Logvinov2017-08-226-50/+50
|/
* Merge pull request #124 from 0xProject/reject-checksummed-addressesLeonid2017-08-228-10/+24
|\
| * Fix merge conflicts in a changelogLeonid Logvinov2017-08-221-5/+0
| * Include variableName in error message for checksummed addressLeonid Logvinov2017-08-221-1/+1
| * Put the last test address on it's own lineLeonid Logvinov2017-08-221-1/+3
| * Change CHANGELOG textLeonid Logvinov2017-08-221-1/+6
| * Use lowercase address in testsLeonid Logvinov2017-08-221-1/+1
| * Update CHANGELOG.mdLeonid Logvinov2017-08-221-0/+4
| * Reject checksummed addressesLeonid Logvinov2017-08-226-9/+17
|/
* 0.9.3v0.9.3Leonid Logvinov2017-08-221-1/+1
* Merge pull request #125 from 0xProject/0.9.3Leonid2017-08-221-1/+5
|\
| * Update CHANGELOG.mdLeonid Logvinov2017-08-221-1/+5
|/
* Merge branch 'master' of github.com:0xProject/0x.jsFabio Berger2017-08-221-1/+1
|\
| * Add subproviders to the list of folders required by UMD testsLeonid Logvinov2017-08-221-1/+1
* | 0.9.2v0.9.2Fabio Berger2017-08-211-1/+1
|/
* Merge branch 'master' of github.com:0xProject/0x.jsFabio Berger2017-08-211-1/+1
|\
| * Merge pull request #123 from 0xProject/fixCiFabio Berger2017-08-211-1/+1
| |\
| | * try 4000 timeoutFabio Berger2017-08-211-1/+1
| | * try longer timeoutFabio Berger2017-08-211-1/+1
| |/
* / Update changelogFabio Berger2017-08-211-0/+5
|/
* Update testrpc snapshot and testrpc artifactsFabio Berger2017-08-216-39/+39
* Update artifacts and rename proxy to tokenTransferProxyFabio Berger2017-08-217-217/+248
* Merge pull request #118 from 0xProject/artifacts-updateFabio Berger2017-08-2112-521/+401
|\
| * Remove url from token registryLeonid Logvinov2017-08-154-21/+4
| * Update testrpc artifactsLeonid Logvinov2017-08-153-3/+3
| * Update contracts snapshot hashLeonid Logvinov2017-08-151-1/+1
| * --no-editLeonid Logvinov2017-08-151-1/+1
| * Update Exchange artifacts and adjust ExchangeWrapperLeonid Logvinov2017-08-153-94/+89
| * Update TokenRegistry artifactsLeonid Logvinov2017-08-151-205/+245
| * Update EtherToken artifactsLeonid Logvinov2017-08-151-8/+59
| * Update Token artifactsLeonid Logvinov2017-08-151-2/+2
| * Remove Mintable artifactsLeonid Logvinov2017-08-152-190/+1
* | 0.9.1v0.9.1Leonid Logvinov2017-08-171-1/+1
* | Update CHANGELOG.md before v0.9.1Leonid Logvinov2017-08-171-0/+4
* | Merge pull request #120 from 0xProject/addTestWithWeb3WithoutAddressesLeonid2017-08-177-62/+148
|\ \ | |/ |/|
| * Add JSONRPCPayload type and remove unused importLeonid Logvinov2017-08-172-3/+8
| * set default value to hasAddresses booleanFabio Berger2017-08-171-1/+1
| * remove unnecessary assertion and add regression testFabio Berger2017-08-172-18/+40
| * remove unneeded assertion from _isRoundingErrorAsync since one can make stati...Fabio Berger2017-08-171-1/+0
| * Remove isUserAddressAvailable assertion from getBalanceAsync and add regressi...Fabio Berger2017-08-174-22/+68
| * Update yarn.lockFabio Berger2017-08-171-22/+36
|/
* Merge pull request #117 from 0xProject/greenkeeper/sinon-3.0.0Leonid2017-08-041-1/+1
|\
| * chore(package): update sinon to version 3.0.0greenkeeper[bot]2017-08-031-1/+1
|/
* Merge pull request #116 from 0xProject/greenkeeper/typedoc-0.8.0Leonid2017-07-281-1/+1
|\
| * chore(package): update typedoc to version 0.8.0greenkeeper[bot]2017-07-281-1/+1
|/
* Add PR links to CHANGELOG.mdLeonid Logvinov2017-07-261-2/+2
* 0.9.0v0.9.0Leonid Logvinov2017-07-261-1/+1
* Add release date for 0.9.0Leonid Logvinov2017-07-261-1/+1
* Merge pull request #115 from 0xProject/pre-0.9.0-CHANGELOGLeonid2017-07-261-0/+3
|\
| * Update CHANGELOG.mdLeonid Logvinov2017-07-261-0/+3
|/
* Merge branch 'greenkeeper/web3-typescript-typings-0.3.0'Leonid Logvinov2017-07-261-3/+3
|\
| * Update yarn.lockLeonid Logvinov2017-07-261-3/+3
|/
* Merge pull request #114 from 0xProject/greenkeeper/web3-typescript-typings-0.3.0Leonid2017-07-261-1/+1
|\
| * chore(package): update web3-typescript-typings to version 0.3.0greenkeeper[bot]2017-07-261-1/+1
|/
* Merge pull request #109 from 0xProject/fees-balance-allowance-validationLeonid2017-07-2612-165/+291
|\
| * Indent callbacksLeonid Logvinov2017-07-261-2/+2
| * Rearrange importsLeonid Logvinov2017-07-261-1/+1
| * Simplify order checksLeonid Logvinov2017-07-261-30/+18
| * Store tokenWrapper inside of OrdervalidationUtilsLeonid Logvinov2017-07-262-23/+29
| * Remove and from namesLeonid Logvinov2017-07-262-6/+6
| * Remove unused importsLeonid Logvinov2017-07-2610-15/+1
| * Fix testsLeonid Logvinov2017-07-261-1/+1
| * Factor out order validation testsLeonid Logvinov2017-07-262-147/+203
| * Cover all possible branches of order validation errors with testsLeonid Logvinov2017-07-262-25/+67
| * Refactor OrderValidationUtils to check for the case when ZRX is one of the to...Leonid Logvinov2017-07-262-55/+81
| * Pass tokenWrapper to validateFillOrderBalancesAndAllowancesAndThrowIfInvalidA...Leonid Logvinov2017-07-262-12/+12
| * Move _validateFillOrderBalancesAndAllowancesAndThrowIfInvalidAsync to orderVa...Leonid Logvinov2017-07-262-63/+70
| * Add a test: should throw when maker has balance to cover fees or transfer but...Leonid Logvinov2017-07-261-0/+15
|/
* Merge pull request #113 from 0xProject/ethereumjs-util-typesLeonid2017-07-224-19/+29
|\
| * Add ethereumjs-utils typesLeonid Logvinov2017-07-224-19/+29
|/
* Merge pull request #112 from 0xProject/bn.js-typesLeonid2017-07-225-3/+10
|\
| * Add bn.js typesLeonid Logvinov2017-07-225-3/+10
|/
* Merge pull request #108 from 0xProject/greenkeeper/web3-0.20.0Leonid2017-07-191-1/+1
|\
| * fix(package): update web3 to version 0.20.0greenkeeper[bot]2017-07-171-1/+1
* | Merge pull request #110 from 0xProject/greenkeeper/web3-typescript-typings-0.2.1Leonid2017-07-191-1/+1
|\ \ | |/ |/|
| * chore(package): update web3-typescript-typings to version 0.2.1greenkeeper[bot]2017-07-191-1/+1
|/
* Merge pull request #104 from 0xProject/ts-2.4Leonid2017-07-1215-148/+140
|\
| * Use actual exception values in test namesLeonid Logvinov2017-07-121-3/+3
| * Add a comment explaining anyLeonid Logvinov2017-07-121-1/+2
| * Add forgotten meger conflict resolutionLeonid Logvinov2017-07-121-19/+0
| * Use PascalCase names as string enum keysLeonid Logvinov2017-07-1213-117/+144
| * Migrate to using native string enumsLeonid Logvinov2017-07-121-67/+50
| * Update to typescript@2.4Leonid Logvinov2017-07-122-2/+2
|/
* Merge pull request #107 from 0xProject/static-get-order-hash-hexLeonid2017-07-125-35/+36
|\
| * Reformat CHANGELOG to use past tenseLeonid Logvinov2017-07-121-14/+14
| * Update CHANGELOG.mdLeonid Logvinov2017-07-121-0/+1
| * Make getOrderHashHex staticLeonid Logvinov2017-07-124-21/+21
|/
* Merge pull request #106 from 0xProject/single-exchangeLeonid2017-07-1210-199/+67
|\
| * Fix the commentLeonid Logvinov2017-07-121-1/+3
| * Update CHANGELOG.mdLeonid Logvinov2017-07-121-2/+1
| * Migrate to using a single Exchange contractLeonid Logvinov2017-07-127-191/+64
| * Remove exchange artifacts by nameLeonid Logvinov2017-07-121-6/+0
| * Flatten artifactsLeonid Logvinov2017-07-121-0/+0
|/
* Merge pull request #105 from 0xProject/chai-bignumberLeonid2017-07-122-21/+13
|\
| * Stop using custom chai-bignumber forkLeonid Logvinov2017-07-122-21/+13
|/
* Merge pull request #103 from 0xProject/jsonschema-typesLeonid2017-07-123-14/+62
|\
| * Add the source for the schemaLeonid2017-07-121-0/+1
| * Use custom Schema typesLeonid Logvinov2017-07-122-14/+13
| * Add jsonschema Schema declarationLeonid Logvinov2017-07-121-0/+48
|/
* Merge pull request #101 from 0xProject/new-contractsFabio Berger2017-07-110-0/+0
|\
| * Fix a typoLeonid Logvinov2017-07-111-4/+4
| * Fix a typo in commentLeonid Logvinov2017-07-111-2/+2
| * Rename shouldCheckTransfer to shouldThrowOnInsufficientBalanceOrAllowanceLeonid Logvinov2017-07-111-10/+11
| * Simplify BigNumber hackLeonid Logvinov2017-07-081-5/+2
| * use yarn on CILeonid Logvinov2017-07-081-4/+11
| * Upgrade to a new node versionLeonid Logvinov2017-07-081-1/+1
| * Make CONTRACTS_COMMIT_HASH a stringLeonid Logvinov2017-07-081-1/+1
| * Use never testrpc snapshotLeonid Logvinov2017-07-081-1/+1
| * Migrate the rest of the artifactsLeonid Logvinov2017-07-081-184/+40
| * Change arguments order at isRoundingErrorLeonid Logvinov2017-07-081-3/+3
| * Migrate eventsLeonid Logvinov2017-07-084-27/+28
| * Migrate constructor argumentsLeonid Logvinov2017-07-081-2/+2
| * Migrate fillOrKillOrderLeonid Logvinov2017-07-083-14/+15
| * Migrate ZRX_TOKEN_AMOUNTLeonid Logvinov2017-07-083-3/+3
| * Migrate getUnavailableTakerTokenAmountLeonid Logvinov2017-07-083-6/+6
| * Migrate PROXY_CONTRACTLeonid Logvinov2017-07-081-1/+1
| * Migrate batchFillOrKillOrdersLeonid Logvinov2017-07-083-10/+11
| * Migrate batchFillOrdersLeonid Logvinov2017-07-083-24/+31
| * Migrate fillOrderLeonid Logvinov2017-07-083-29/+35
| * Migrate fillOrdersUpTo and remove minLeonid Logvinov2017-07-083-44/+26
| * Migrate batchCancelOrdersLeonid Logvinov2017-07-083-10/+11
| * Migrate getPartialAmountLeonid Logvinov2017-07-081-3/+3
| * Migrate cencelOrderLeonid Logvinov2017-07-083-15/+16
| * Revert "Migrate isRoundingError parameter changes"Leonid Logvinov2017-07-083-9/+9
| * Revert "Rename ZRX to ZRX_TOKEN_CONTRACT"Leonid Logvinov2017-07-083-28/+2
| * Update binaries and timestampsLeonid Logvinov2017-07-081-4/+4
| * Migrate isRoundingError parameter changesLeonid Logvinov2017-07-083-9/+9
| * Rename ZRX to ZRX_TOKEN_CONTRACTLeonid Logvinov2017-07-083-2/+28
| * Add contracts artifacts for contracts that didn't changeLeonid Logvinov2017-07-085-13/+17
* | Merge branch 'new-contracts'Fabio Berger2017-07-1111-411/+276
|\ \
| * | Fix a typoLeonid Logvinov2017-07-111-4/+4
| * | Fix a typo in commentLeonid Logvinov2017-07-111-2/+2
| * | Rename shouldCheckTransfer to shouldThrowOnInsufficientBalanceOrAllowanceLeonid Logvinov2017-07-111-10/+11
| * | Simplify BigNumber hackLeonid Logvinov2017-07-111-5/+2
| * | use yarn on CILeonid Logvinov2017-07-111-4/+11
| * | Upgrade to a new node versionLeonid Logvinov2017-07-111-1/+1
| * | Make CONTRACTS_COMMIT_HASH a stringLeonid Logvinov2017-07-111-1/+1
| * | Use never testrpc snapshotLeonid Logvinov2017-07-111-1/+1
| * | Migrate the rest of the artifactsLeonid Logvinov2017-07-111-184/+40
| * | Change arguments order at isRoundingErrorLeonid Logvinov2017-07-111-3/+3
| * | Migrate eventsLeonid Logvinov2017-07-114-27/+28
| * | Migrate constructor argumentsLeonid Logvinov2017-07-111-2/+2
| * | Migrate fillOrKillOrderLeonid Logvinov2017-07-113-14/+15
| * | Migrate ZRX_TOKEN_AMOUNTLeonid Logvinov2017-07-113-3/+3
| * | Migrate getUnavailableTakerTokenAmountLeonid Logvinov2017-07-113-6/+6
| * | Migrate PROXY_CONTRACTLeonid Logvinov2017-07-111-1/+1
| * | Migrate batchFillOrKillOrdersLeonid Logvinov2017-07-113-10/+11
| * | Migrate batchFillOrdersLeonid Logvinov2017-07-113-24/+31
| * | Migrate fillOrderLeonid Logvinov2017-07-113-29/+35
| * | Migrate fillOrdersUpTo and remove minLeonid Logvinov2017-07-113-44/+26
| * | Migrate batchCancelOrdersLeonid Logvinov2017-07-113-10/+11
| * | Migrate getPartialAmountLeonid Logvinov2017-07-111-3/+3
| * | Migrate cencelOrderLeonid Logvinov2017-07-113-15/+16
| * | Revert "Migrate isRoundingError parameter changes"Leonid Logvinov2017-07-113-9/+9
| * | Revert "Rename ZRX to ZRX_TOKEN_CONTRACT"Leonid Logvinov2017-07-113-28/+2
| * | Update binaries and timestampsLeonid Logvinov2017-07-111-4/+4
| * | Migrate isRoundingError parameter changesLeonid Logvinov2017-07-113-9/+9
| * | Rename ZRX to ZRX_TOKEN_CONTRACTLeonid Logvinov2017-07-113-2/+28
| * | Add contracts artifacts for contracts that didn't changeLeonid Logvinov2017-07-115-13/+17
|/ /
* | Merge pull request #102 from 0xProject/greenkeeper/dirty-chai-2.0.1Leonid2017-07-111-1/+1
|\ \ | |/ |/|
| * chore(package): update dirty-chai to version 2.0.1greenkeeper[bot]2017-07-101-1/+1
|/
* Merge branch 'master' of github.com:0xProject/0x.jsLeonid Logvinov2017-07-083-38/+51
|\
| * Merge pull request #100 from 0xProject/improveSignOrderFabio Berger2017-07-083-38/+51
| |\
| | * Move private helper methods into signatureUtils so that they don't show up in...Fabio Berger2017-07-082-24/+30
| | * Remove duplication of 27, 28 v valuesFabio Berger2017-07-081-4/+5
| | * Modify signOrderHashAsync to parse the signatureHex string as V + R + S AND R...Fabio Berger2017-07-082-38/+44
* | | Update yarn.lock to include latest webpack versionLeonid Logvinov2017-07-081-649/+723
|/ /
* | Add --bail option to mocha run commandLeonid Logvinov2017-07-081-1/+1
* | Merge pull request #95 from 0xProject/cache_net_versionLeonid2017-07-084-1/+39
|\ \
| * | Refactor net_version caching logicLeonid Logvinov2017-07-081-10/+10
| * | Merge branch 'master' into cache_net_versionLeonid2017-07-086-54/+56
| |\ \ | |/ / |/| |
* | | Merge pull request #97 from 0xProject/speedup-testsLeonid2017-07-081-30/+30
|\ \ \
| * | | Add noop commentLeonid2017-07-081-1/+1
| * | | Paralellize fill scenariosLeonid Logvinov2017-07-081-30/+30
* | | | Merge pull request #98 from 0xProject/typosLeonid2017-07-083-9/+11
|\ \ \ \
| * | | | Update CHANGELOG.mdLeonid Logvinov2017-07-081-0/+2
| * | | | Rename batchCancelOrderAsync to batchCancelOrdersAsyncLeonid Logvinov2017-07-082-4/+4
| * | | | Rename batchFillOrderAsync to batchFillOrdersAsyncLeonid Logvinov2017-07-082-5/+5
| |/ / /
* | | | Merge pull request #99 from 0xProject/greenkeeper/web3-typescript-typings-0.0.11Leonid2017-07-081-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | chore(package): update web3-typescript-typings to version 0.0.11greenkeeper[bot]2017-07-081-1/+1
| |/ /
* / / Remove space after `it` keywork in testsFabio Berger2017-07-082-13/+13
|/ /
* | Merge pull request #96 from 0xProject/greenkeeper/webpack-3.1.0Leonid2017-07-081-1/+1
|\ \
| * | chore(package): update webpack to version 3.1.0greenkeeper[bot]2017-07-071-1/+1
|/ /
| * Rename networkId to networkIdIfExistsLeonid Logvinov2017-07-071-2/+2
| * Fix a typo in a filenameLeonid Logvinov2017-07-071-0/+0
| * Rename RPC_NETWORK_ID to TESTRPC_NETWORK_IDLeonid Logvinov2017-07-072-3/+3
| * Fix CHANGELOG.md commentLeonid Logvinov2017-07-071-1/+1
| * Remove onlyLeonid Logvinov2017-07-071-1/+1
| * Update CHANGELOG.mdLeonid Logvinov2017-07-071-0/+1
| * Add tests for networkId caching and invalidationLeonid Logvinov2017-07-072-0/+30
| * Cache networkId in web3WrapperLeonid Logvinov2017-07-071-5/+12
|/
* Merge pull request #94 from 0xProject/moveExchangeAddressGettersLeonid2017-07-079-84/+79
|\
| * Inline _isExchangeContractAddressProxyAuthorizedAsyncLeonid Logvinov2017-07-071-5/+1
| * Fix comments to use web3 provider instead of web3 instanceLeonid Logvinov2017-07-074-9/+10
| * Update CHANGELOG.mdLeonid Logvinov2017-07-061-0/+5
| * Move zeroEx.exchange.getAvailableContractAddressesAsync to zeroEx.getAvailabl...Leonid Logvinov2017-07-066-78/+71
|/
* 0.8.0v0.8.0Leonid Logvinov2017-07-051-1/+1
* Add publish date for 0.8.0 in CHANGELOG.mdLeonid Logvinov2017-07-051-1/+1
* Merge pull request #90 from 0xProject/subscribe-tokenLeonid2017-07-0520-72/+410
|\
| * Merge branch 'master' into subscribe-tokenLeonid Logvinov2017-07-051-1/+1
| |\ | |/ |/|
* | Run umd tests only on masterLeonid Logvinov2017-07-051-1/+1
| * Add order hash schemaLeonid Logvinov2017-07-051-0/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 05:35:38 +0800