aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
Commit message (Expand)AuthorAgeFilesLines
* Fix testsFabio Berger2018-06-221-2/+2
* Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2239-382/+894
|\
| * Merge pull request #752 from 0xProject/make-promises-safe-preloaderFabio Berger2018-06-2211-11/+1
| |\
| | * Use make-promises-safe as a preloader instead of manually importingAlex Browne2018-06-2211-11/+1
| * | Merge pull request #751 from 0xProject/feature/contracts/compilerRunsAmir Bandeali2018-06-221-1/+1
| |\ \ | | |/ | |/|
| | * Updated compiler runs to be 1,000,000Greg Hysen2018-06-221-1/+1
| * | Add event to setSignatureValidatorApproval, rename signer => signerAddress ac...Amir Bandeali2018-06-2215-70/+144
| * | Add senderAddress to Fill and Cancel logs, add comments to events and typesAmir Bandeali2018-06-225-44/+47
| * | Remove unreachable PreSigned checkAustin Roberts2018-06-221-4/+0
| |/
| * Set settleOrder and settleMatchedOrders to privateGreg Hysen2018-06-214-25/+2
| * Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `se...Greg Hysen2018-06-218-238/+205
| * LinterGreg Hysen2018-06-211-2/+1
| * Renamed constants in test wallet/validatorGreg Hysen2018-06-212-11/+11
| * Few more minor #nit wording changesGreg Hysen2018-06-212-5/+5
| * Changed wording of two tests #nitGreg Hysen2018-06-211-2/+2
| * Minor improvements to MixinSignatureValidator testsGreg Hysen2018-06-211-14/+8
| * Remove .onlyGreg Hysen2018-06-211-1/+1
| * Fixed two mislabelled revert reasons + Signature Validator revert tests worki...Greg Hysen2018-06-213-8/+17
| * Minor style tweaksGreg Hysen2018-06-213-8/+8
| * Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported t...Greg Hysen2018-06-219-27/+530
* | Check revert reason in dispatcher testsFabio Berger2018-06-222-5/+13
* | remove unused importFabio Berger2018-06-221-1/+0
* | Test revert reasons in proxy testsFabio Berger2018-06-211-11/+23
* | remove onlyFabio Berger2018-06-211-1/+1
* | Check revert reasons in Authorizable testsFabio Berger2018-06-212-6/+15
* | Change revert reason in ownable to be similar to all other revert reasonsFabio Berger2018-06-211-1/+1
* | remove .onlyFabio Berger2018-06-211-1/+1
* | Update core tests to actually check revert messageFabio Berger2018-06-213-34/+97
|/
* Merge pull request #637 from 0xProject/bug/contracts/eip712-191-prefixJacob Evans2018-06-207-45/+166
|\
| * Fix closing parens in liborderJacob Evans2018-06-201-16/+15
| * Assembler orderHash functionRemco Bloemen2018-06-191-18/+22
| * Optimize and remove redundant encodePackedJacob Evans2018-06-194-13/+23
| * Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefixJacob Evans2018-06-1870-929/+2461
| |\
| * | Rebase and update feedbackJacob Evans2018-06-184-81/+85
| * | Basic EIP712 encoderJacob Evans2018-06-081-10/+11
| * | Update Order utils to use eip712Jacob Evans2018-06-069-178/+50
| * | Add missing EIP191 prefix for EIP712Jacob Evans2018-06-0510-50/+279
* | | Update after rebaseJacob Evans2018-06-201-7/+1
* | | ERC721Proxy Always call safeTransferFromJacob Evans2018-06-201-2/+6
* | | Rename makerEpoch => orderEpochAmir Bandeali2018-06-207-46/+49
* | | Make cancelOrdersUpTo compatible with sender abstractionAmir Bandeali2018-06-208-8/+225
* | | Merge pull request #683 from 0xProject/fix/contracts/memcpyRemco Bloemen2018-06-191-10/+12
|\ \ \
| * | | Simplified handling of source < 32 edge caseRemco Bloemen2018-06-111-10/+12
* | | | Merge pull request #728 from 0xProject/fix/post-dev-publishFabio Berger2018-06-191-12/+12
|\ \ \ \
| * | | | Fix additional versions and update yarn.lockFabio Berger2018-06-191-1/+1
| * | | | Update all package versions to match latest published to NPMFabio Berger2018-06-191-11/+11
* | | | | Merge pull request #659 from 0xProject/feature/contracts/split-proxy-internal...Jacob Evans2018-06-196-129/+206
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rebase with latest removing PROXY_ID from transferJacob Evans2018-06-185-95/+111
| * | | | Split transfer impl and AssetProxyMixinJacob Evans2018-06-184-95/+156
| | |_|/ | |/| |
* | | | Make isValidSignature publicAmir Bandeali2018-06-193-15/+15
* | | | Make batchFill methods return FIllResults structAmir Bandeali2018-06-192-10/+28
|/ / /
* | | Merge pull request #700 from 0xProject/fix/contracts/tokenbugsRemco Bloemen2018-06-161-1/+29
|\ \ \
| * | | Handle tokens that do not return boolRemco Bloemen2018-06-141-1/+29
* | | | Change wording of error message when you try to use more than one subproviderAlex Browne2018-06-151-1/+1
* | | | Fix linter errors and remove coverage.jsonAlex Browne2018-06-151-2/+1
* | | | Remove unused variables and other small fixesAlex Browne2018-06-152-6/+7
* | | | Fix a bug in revert_trace.tsAlex Browne2018-06-151-23/+23
* | | | Introduce subprovider for printing revert stack tracesAlex Browne2018-06-153-22/+51
|/ / /
* | | Rename popByte and popAddressAmir Bandeali2018-06-135-18/+18
* | | Hard code test addresses/bytes32 instead of generating pseudorandom onesAmir Bandeali2018-06-131-19/+16
* | | Unpop byte rather than making deep copyAmir Bandeali2018-06-134-90/+95
* | | Pass gas in to marketBuyOrdersNoThrowAmir Bandeali2018-06-131-1/+1
* | | Looks up the memory location of makerAssetData/takerAssetDataGreg Hysen2018-06-131-0/+2
* | | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATAAmir Bandeali2018-06-135-23/+13
* | | Add tests for deepCopyBytes and missing write methods from LibBytesAmir Bandeali2018-06-133-70/+201
* | | Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-1320-209/+268
* | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts t...Alex Browne2018-06-121-1/+4
* | | Fix no-unused-variable tslint rule to include parameters and fix issuesFabio Berger2018-06-122-2/+2
* | | Implement SolidityProfiler & adapt sol-cov to work with GethLeonid Logvinov2018-06-096-1/+58
|/ /
* | Linter changes to contractsGreg Hysen2018-06-094-21/+6
* | Updated LibBytes error messagesGreg Hysen2018-06-083-28/+36
* | Cleanup after last rebaseGreg Hysen2018-06-084-6/+5
* | Updated tests to use new revert handlerGreg Hysen2018-06-082-13/+13
* | Minor fixes after rebaseGreg Hysen2018-06-081-14/+6
* | Camelcase in memCopyGreg Hysen2018-06-084-23/+23
* | Style updates to contractsGreg Hysen2018-06-086-26/+20
* | Union types for generalized decodeAssetDataGreg Hysen2018-06-081-2/+2
* | Fixed a styling throughout contracts. Moved closing parenthesis for long list...Greg Hysen2018-06-088-31/+62
* | Removed setting makerAssetData/takerAssetData from tests where values are sam...Greg Hysen2018-06-081-34/+0
* | Fixed merge error when rebasing wrt length variable in asset data decodersGreg Hysen2018-06-082-4/+4
* | Style updates to ERC721 onReceiverGreg Hysen2018-06-086-12/+21
* | Fixed after rebaseGreg Hysen2018-06-083-5/+5
* | Fixes after rebasingGreg Hysen2018-06-083-8/+6
* | Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-087-50/+30
* | Style audit for proxies + libmem + libbytesGreg Hysen2018-06-088-50/+72
* | Style audit proxiesGreg Hysen2018-06-083-20/+64
* | Call safeTransferFrom only when there is receiver data presentGreg Hysen2018-06-083-13/+20
* | Fixed formatting in memory layoutGreg Hysen2018-06-081-6/+6
* | Resolved edge case in Memcpy where where send would eventually turn "negative...Greg Hysen2018-06-082-144/+154
* | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. T...Greg Hysen2018-06-089-95/+64
* | Converged on naming scheme for asset data: renamed all instances of assetMeta...Greg Hysen2018-06-0822-290/+257
* | proxyData -> assetDataGreg Hysen2018-06-082-12/+12
* | Implement memcpy using masking and end-aligned wordsRemco Bloemen2018-06-081-59/+85
* | Add tests for word loop iterationRemco Bloemen2018-06-081-2/+6
* | Add test for zero-size overlapRemco Bloemen2018-06-081-1/+3
* | Add test casesRemco Bloemen2018-06-081-17/+133
* | Cleanup test scriptRemco Bloemen2018-06-081-16/+1
* | Convert Solidity tests to vectorsRemco Bloemen2018-06-082-232/+6
* | Generate tests from vectorsRemco Bloemen2018-06-082-5/+64
* | Tests for writing bytes to nested bytesGreg Hysen2018-06-081-9/+91
* | Fixed up wording in memcpyGreg Hysen2018-06-081-3/+3
* | Tons of tests around nested byte arrays and ERC721 receiverGreg Hysen2018-06-085-28/+197
* | Test for onReceived erc721 callbackGreg Hysen2018-06-086-5/+126
* | LibAssetProxyDecoder testsGreg Hysen2018-06-082-27/+31
* | Foundation for TestLibAssetProxyDecoderGreg Hysen2018-06-087-2/+128
* | Tests for libMemGreg Hysen2018-06-085-16/+80
* | LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721ReceiverGreg Hysen2018-06-088-27/+581
* | Add missing awaitTransactionSuccessAsync callsAlex Browne2018-06-082-23/+53
* | Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changesFabio Berger2018-06-081-0/+1
|\ \
| * | Fix tslint failureFabio Berger2018-06-083-2/+3
* | | Merge pull request #670 from 0xProject/fix/generated-nestingFabio Berger2018-06-0823-56/+56
|\ \ \
| * | | Fix tslint issuesFabio Berger2018-06-082-2/+2
| * | | Fix missing pathsFabio Berger2018-06-081-4/+4
| * | | Fixed pathFabio Berger2018-06-073-11/+11
| * | | merge v2-prototypeFabio Berger2018-06-0732-335/+465
| |\| |
| * | | move generated contract wrappers from `contract_wrappers/generated/` to `gene...Fabio Berger2018-06-0624-60/+60
* | | | Merge pull request #676 from 0xProject/feature/mocha-source-mapsAlex Browne2018-06-081-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Use source-map-support package to include correct line numbers in mochaAlex Browne2018-06-071-1/+1
* | | | Merge pull request #673 from mohoff/patch-1Fabio Berger2018-06-071-1/+1
|\ \ \ \
| * | | | typomohoff2018-06-071-1/+1
| |/ / /
* | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-0719-214/+416
|\| | |
| * | | Apply prettierAlex Browne2018-06-072-3/+10
| * | | Update contracts tests after rebaseAlex Browne2018-06-072-14/+14
| * | | Apply various fixes based on PR feedbackAlex Browne2018-06-073-12/+55
| * | | Use an enum for ProviderType in contracts/src/utils/web3_wrapperAlex Browne2018-06-071-4/+21
| * | | Update contracts package READMEAlex Browne2018-06-071-0/+9
| * | | Add Async suffix to relevant assertionsAlex Browne2018-06-0714-112/+112
| * | | Fix linter errorsAlex Browne2018-06-073-8/+38
| * | | Update more things to work with both Geth and GanacheAlex Browne2018-06-073-38/+42
| * | | Small fixes and cleanupAlex Browne2018-06-073-8/+4
| * | | Add additional gas to calls to fillOrderNoThrowAlex Browne2018-06-073-152/+55
| * | | Throw in web3-wrapper when rawCallResult is '0x'Alex Browne2018-06-073-6/+17
| * | | Fix some more test cases, especially those that call increaseTimeAlex Browne2018-06-074-55/+84
| * | | Add support for TEST_PROVIDER env varAlex Browne2018-06-071-3/+4
| * | | Update more tests to pass on GethAlex Browne2018-06-074-21/+29
| * | | Get LibBytes tests working on both Ganache and GethAlex Browne2018-06-073-25/+34
| * | | Add ability to quickly switch between Geth and Ganache by changing a constAlex Browne2018-06-071-3/+16
| * | | Update exchange/transactions tests for Geth error messagesAlex Browne2018-06-071-4/+4
| * | | Update some tests after rebaseAlex Browne2018-06-073-20/+29
| * | | Add more transactions to Geth on init. Skip tests that are failing.Alex Browne2018-06-076-20/+135
| * | | Replace constant.REVERT test assertions with expectRevertOrAlwaysFailingTrans...Alex Browne2018-06-0712-170/+143
| * | | Update code after rebaseAlex Browne2018-06-073-3/+8
| * | | Use Geth for contract testsAlex Browne2018-06-071-0/+20
* | | | Get build and tests to passfragosti2018-06-071-1/+2
* | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-071-2/+1
|\| | |
| * | | Stop running prettier on generated filesLeonid Logvinov2018-06-071-2/+1
| |/ /
* | | Use CLI for excludefragosti2018-06-072-4/+1
* | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-071-3/+3
|\| |
| * | Merge v2-prototypeFabio Berger2018-06-061-1/+1
| |\ \
| * | | - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ...Fabio Berger2018-06-051-3/+3
* | | | merge v2-prototypeFabio Berger2018-06-061-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Replace `-` with `_` in yarn script name so that we are consistent across yar...Fabio Berger2018-06-051-1/+1
| |/ /
| * | Merge pull request #658 from 0xProject/dont-automatically-rebuild-for-testsAlex Browne2018-06-051-1/+2
| |\ \ | | |/ | |/|
| | * Don't automatically rebuild when running yarn testAlex Browne2018-06-051-1/+2
* | | Linter now passesfragosti2018-06-0627-104/+35
|/ /
* | rename GT to GREATER_THANJacob Evans2018-06-053-3/+3
* | Rebase from v2-prototypeJacob Evans2018-06-052-38/+2
* | Update Exchange statuses, revert instead of emmitting event on fill/cancel fa...Amir Bandeali2018-06-0530-702/+491
|/
* Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-023-55/+52
|\
| * Set contract expiration time to a constant 10 minutesAlex Browne2018-06-021-1/+2
| * Remove unused promises arrayAlex Browne2018-06-022-6/+0
| * Make erc20_wrapper and erc721_wrapper serialAlex Browne2018-06-022-48/+50
* | Improve comments and remove unused importsFabio Berger2018-06-021-1/+1
* | Fix tslint issuesFabio Berger2018-06-023-5/+3
* | Fix types versionFabio Berger2018-06-021-1/+1
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-0219-42/+91
|\|
| * Fix linter errorsLeonid Logvinov2018-06-016-6/+6
| * Add ethereum-types to extraFileIncludesLeonid Logvinov2018-06-011-2/+9
| * Introduce ethereum-types packageLeonid Logvinov2018-06-0115-20/+20
| * Merge pull request #641 from 0xProject/feature/remove-typesLeonid Logvinov2018-06-011-0/+2
| |\
| | * Remove some typesLeonid Logvinov2018-06-011-0/+2
| * | Fix buildAmir Bandeali2018-06-011-1/+1
| |/
| * Merge pull request #640 from 0xProject/await-transaction-successAlex Browne2018-05-315-25/+64
| |\
| | * Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapperAlex Browne2018-05-312-5/+7
| | * Add awaitTransactionSuccess where neededAlex Browne2018-05-314-22/+59
* | | fix method renameFabio Berger2018-06-011-1/+1
* | | Rename Ecrecover to EthSignFabio Berger2018-06-013-6/+3
* | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-0142-188/+717
|\| |
| * | Check length before accessing indices, add awaitTransactionSuccess where need...Amir Bandeali2018-05-315-25/+43
| * | Add back before/after snapshots for each testAmir Bandeali2018-05-3116-0/+97
| * | Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMITAmir Bandeali2018-05-313-4/+4
| * | Make preSigned and allowedValidators mappings publicAmir Bandeali2018-05-311-2/+2
| * | Change names of signature typesAmir Bandeali2018-05-312-6/+6
| * | Fix formatting and testsAmir Bandeali2018-05-3118-94/+16
| * | Make AssetProxyId last byte of assetDataAmir Bandeali2018-05-3118-37/+74
| * | Add signer to txHash, allow approveValidator to be used with executeTransactionAmir Bandeali2018-05-313-7/+10
| * | Update WhitelistAmir Bandeali2018-05-316-24/+55
| * | Fix Exchange interfaceAmir Bandeali2018-05-311-7/+5
| * | Use last byte of signature as signature typeAmir Bandeali2018-05-318-106/+103
| * | Remove TxOrigin signature type, modify whitelist to use Validator signature typeAmir Bandeali2018-05-317-35/+35
| * | Update Whitelist contract with comments, also require maker to be whitelistedAmir Bandeali2018-05-315-16/+72
| * | Fix buildAmir Bandeali2018-05-313-19/+24
| * | Add example whitelist contract and minimum testsAmir Bandeali2018-05-313-11/+121
| * | Add sample whitelist contractAmir Bandeali2018-05-313-1/+60
| * | Add TxOrigin signature type and rearrange order of typesAmir Bandeali2018-05-313-63/+77
| * | Add approveValidator functionAmir Bandeali2018-05-312-2/+17
| * | Add Validator signature typeAmir Bandeali2018-05-314-3/+69
| * | Add deepCopyBytes method to LibBytesAmir Bandeali2018-05-313-0/+92
| * | Change logDecoder back into class, remove awaitTransactionMined from multiSig...Amir Bandeali2018-05-313-50/+62
| |/
* | Introduce OrderWithoutExchangeAddress type since this is what get's sent to t...Fabio Berger2018-05-314-32/+28
* | Initial refactor of order-utils. Move many utils from contracts into this pac...Fabio Berger2018-05-3020-382/+64
* | Freeze order-utils at 0.0.5 for all packages except contractsFabio Berger2018-05-301-1/+1
|/
* Remove contracts -> @0xproject/order-utils dependencyLeonid Logvinov2018-05-265-103/+86
* Fix imports in order_utilsLeonid Logvinov2018-05-251-1/+1
* Merge pull request #571 from 0xProject/feature/contracts/proxyOwnerAmir Bandeali2018-05-2520-387/+629
|\
| * Use web3-wrapper instead of 0x.js, update logDecoderAmir Bandeali2018-05-257-49/+48
| * Cleanup testsAmir Bandeali2018-05-254-6/+12
| * Move readFirst4 to LibBytesAmir Bandeali2018-05-255-39/+53
| * Add old MultiSig to previous contracts, cleanup file structureAmir Bandeali2018-05-257-16/+16
| * Fix buildAmir Bandeali2018-05-254-4/+91
| * Address feedback, rename contract to AssetProxyOwnerAmir Bandeali2018-05-256-33/+37
| * Update multisig tests and utilsAmir Bandeali2018-05-254-253/+355
| * Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress to use a mappi...Amir Bandeali2018-05-251-18/+48
* | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hashFabio Berger2018-05-2512-48/+26
|\ \
| * \ Merge pull request #618 from 0xProject/feature/v2-migrationsLeonid Logvinov2018-05-2512-49/+27
| |\ \ | | |/ | |/|
| | * Fix linter issuesLeonid Logvinov2018-05-253-3/+3
| | * Migrate migrations to v2Leonid Logvinov2018-05-2512-49/+27
* | | Use domain separator for exchange addressJacob Evans2018-05-254-8/+41
* | | publicGetOrderSchemaHash -> getOrderSchemaHashJacob Evans2018-05-252-2/+2
* | | Update order hash to match latest eip712Jacob Evans2018-05-254-34/+57
|/ /
* / Disable contracts coverage on CILeonid Logvinov2018-05-251-1/+1
|/
* Check transaction receipt status codes where applicableAlex Browne2018-05-2412-61/+85
* Move contract utilsLeonid Logvinov2018-05-245-19/+19
* Merge branch 'v2-prototype' into feature/truffle-sol-covLeonid Logvinov2018-05-2423-293/+280
|\
| * Fix Tslint error caused by "PromiseLike" valueFabio Berger2018-05-231-0/+6
| * fix contract-wrappers versionFabio Berger2018-05-231-1/+1
| * merge v2-prototypeFabio Berger2018-05-231-11/+11
| |\
| | * Merge branch 'development' into v2-prototypeLeonid Logvinov2018-05-231-11/+11
| | |\
| | | * PublishLeonid Logvinov2018-05-231-11/+11
| * | | Fix dep versionFabio Berger2018-05-231-1/+1
| * | | Fix importFabio Berger2018-05-231-1/+1
| * | | Fix await callsFabio Berger2018-05-231-12/+3
| * | | Refactor etherToken test to use contract-wrappersFabio Berger2018-05-231-22/+36
| * | | Fix ExchangeWrapperFabio Berger2018-05-236-14/+10
| * | | Fix importsFabio Berger2018-05-232-2/+1
| * | | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-2323-207/+478
| |\| |
| * | | Remove 0x.js dep from contractsFabio Berger2018-05-2323-266/+235
* | | | Parse compiler.json in SolCompilerArtifactsAdapterLeonid Logvinov2018-05-231-3/+1
* | | | Fix a bug in CALL-like opcode handlingLeonid Logvinov2018-05-232-4/+5
* | | | PublishLeonid Logvinov2018-05-231-11/+11
* | | | Rename ZeroExArtifactAdapter to SolCompilerArtifactAdapterLeonid Logvinov2018-05-231-2/+2
* | | | Assign then returnLeonid Logvinov2018-05-231-1/+2
* | | | Introduce CONFIG_FILELeonid Logvinov2018-05-231-1/+2
* | | | Remove web3Factory.create and remove dev-tools dependency on sol-covLeonid Logvinov2018-05-234-4/+35
| |/ / |/| |
* | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto...Fabio Berger2018-05-2316-175/+419
|\ \ \
| * \ \ Merge pull request #601 from 0xProject/contracts-test-fixesAlex Browne2018-05-2316-175/+419
| |\ \ \
| | * | | Rename some variables in multi_sig_with_time_lock.tsAlex Browne2018-05-231-10/+10
| | * | | Remove extra awaitTransactionMinedAsync callsAlex Browne2018-05-231-4/+2
| | * | | Apply changes to test/exchange/match_orders.tsAlex Browne2018-05-221-6/+18
| | * | | Fix some unhandled promise rejectionsAlex Browne2018-05-222-4/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 03:22:27 +0800