aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* style fixLianaHus2015-09-231-1/+0
* fixed-sized arrays as return typeLianaHus2015-09-235-10/+54
* Merge pull request #89 from chriseth/fixCombinedJsonchriseth2015-09-231-2/+6
|\
| * Fix "combined json" output.chriseth2015-09-231-2/+6
* | Merge pull request #85 from chriseth/warningschriseth2015-09-2336-1814/+2460
|\ \ | |/ |/|
| * Style fix.chriseth2015-09-221-1/+2
| * Build fix for MacOS.chriseth2015-09-221-4/+4
| * Error formatting.chriseth2015-09-226-51/+64
| * Refactored annotations.chriseth2015-09-228-45/+186
| * Refactoring: Check types outside of AST and recover from some errors.chriseth2015-09-2233-1800/+2293
* | Merge pull request #88 from chriseth/versionBumpchriseth2015-09-231-1/+1
|\ \
| * | Version 0.1.3.chriseth2015-09-231-1/+1
|/ /
* | Merge pull request #87 from chriseth/fixVersionchriseth2015-09-232-3/+5
|\ \
| * | Add libevmasm version string.chriseth2015-09-222-3/+5
| |/
* | Merge pull request #81 from LianaHus/sol_strings_in_structchriseth2015-09-223-4/+49
|\ \ | |/ |/|
| * fixed the testLianaHus2015-09-221-4/+1
| * fixed using string as a type for struct memberLianaHus2015-09-173-10/+13
| * testLianaHus2015-09-171-0/+45
|/
* Merge pull request #79 from arkpar/cmakeMarek Kotewicz2015-09-173-4/+3
|\
| * per project versioningarkpar2015-09-163-4/+3
* | Merge pull request #77 from LianaHus/sol_throwchriseth2015-09-1614-1/+90
|\ \
| * | styleLianaHus2015-09-161-6/+2
| * | style fixesLianaHus2015-09-163-5/+5
| * | throw statement implementationLianaHus2015-09-1614-1/+94
|/ /
* | Merge pull request #32 from LianaHus/sol_compiletime_check_for_out_of_bound_a...chriseth2015-09-154-36/+71
|\ \
| * | style fixLianaHus2015-09-152-7/+7
| * | fixed rebaseLianaHus2015-09-151-17/+0
| * | moved the testLianaHus2015-09-152-1/+17
| * | returned test for exceptions in constructorLianaHus2015-09-151-0/+17
| * | removed unneccessary check from ExpresiionCompilerLianaHus2015-09-151-14/+0
| * | style fixesLianaHus2015-09-151-2/+3
| * | fixed conflict mergeingLianaHus2015-09-151-2/+2
| * | - changed implementationLianaHus2015-09-151-1/+1
| * | - changed implementationLianaHus2015-09-151-36/+53
| * | some fixes in testsLianaHus2015-09-151-48/+5
| * | Update ExpressionCompiler.cppLianaHus2015-09-151-1/+2
| * | added compile time check for out of bounds access for ordinary arraysLianaHus2015-09-151-26/+52
| * | added compile time check for out of bounds access for ordinary arraysLianaHus2015-09-151-0/+14
| * | testLianaHus2015-09-151-0/+17
* | | Merge pull request #75 from chriseth/exportRuntimeBytecodeForJsonchriseth2015-09-151-0/+6
|\ \ \ | |/ / |/| |
| * | Export runtime bytecode and version.chriseth2015-09-151-0/+6
* | | Merge pull request #73 from chriseth/emscriptenArkadiy Paronyan2015-09-152-3/+11
|\| |
| * | Changes required to compile on emscripten target.chriseth2015-09-152-3/+11
| |/
* | Merge pull request #70 from chriseth/sol_libraries2chriseth2015-09-145-6/+148
|\ \ | |/ |/|
| * Commandline interface for the linker.chriseth2015-09-124-4/+143
| * Small fixes to the type system concerning libraries.chriseth2015-09-111-2/+5
* | Merge pull request #66 from chriseth/sol_librarieschriseth2015-09-1227-113/+280
|\|
| * Style.chriseth2015-09-111-1/+2
| * Possibility to call library functions.chriseth2015-09-117-23/+105
| * Transition from bytecode to more general linker objects.chriseth2015-09-1116-78/+90
| * Parsing and type checking of libraries without inheritance.chriseth2015-09-118-13/+85
* | Merge pull request #69 from LianaHus/sol_enum_too_many_indexed_argschriseth2015-09-112-3/+5
|\ \ | |/ |/|
| * add call for EventDefinition::checkTypeRequirements()LianaHus2015-09-113-17/+5
| * added testLianaHus2015-09-111-0/+14
* | Merge pull request #65 from LianaHus/sol_Creating_a_contract_from_within_itselfchriseth2015-09-113-3/+24
|\ \
| * | style fixesLianaHus2015-09-112-2/+2
| * | added type check if the type of the var decl is one of base contract typeLianaHus2015-09-104-14/+24
| * | added testLianaHus2015-09-101-0/+11
* | | Merge pull request #68 from LefterisJP/add_cmake_defaultschriseth2015-09-111-0/+4
|\ \ \ | |_|/ |/| |
| * | Add cmake defaults for split repo builds.Lefteris Karapetsas2015-09-111-0/+4
|/ /
* | Merge pull request #64 from LianaHus/sol_empty_commentchriseth2015-09-105-4/+43
|\ \ | |/ |/|
| * - added tests to test empty commentLianaHus2015-09-105-4/+43
|/
* Merge pull request #51 from ethereum/revert-25-sol_strings_as_mapping_keyschriseth2015-09-091-7/+4
|\
| * Revert "added check for string as mapping key for local var."chriseth2015-09-081-7/+4
* | Merge pull request #54 from chriseth/sol_fixConstantStringschriseth2015-09-094-7/+61
|\ \
| * | Stylistic corrections.chriseth2015-09-092-2/+2
| * | Fix for constant strings.chriseth2015-09-084-6/+60
* | | Merge pull request #57 from ethereum/reflect_namesMarek Kotewicz2015-09-091-1/+1
|\ \ \ | |/ / |/| |
| * | reflect_namesdebris2015-09-091-1/+1
|/ /
* | Merge pull request #41 from LianaHus/sol_rename_getterschriseth2015-09-0854-1652/+1678
|\ \
| * | - renamed AST to ast and ABI to abiLianaHus2015-09-0810-24/+31
| * | removed get prefixLianaHus2015-09-0815-60/+72
| * | renamed getter functionsLianaHus2015-09-0851-1608/+1615
| |/
* | Merge pull request #56 from ethereum/splitGav Wood2015-09-083-7/+2
|\ \ | |/ |/|
| * changed location of cmake filesdebris2015-09-081-1/+1
| * Merge branch 'develop' of https://github.com/ethereum/solidity into HEADdebris2015-09-041-1/+1
| |\ | |/ |/|
* | Merge pull request #46 from ethers/patch-1Liana Husikyan2015-09-041-1/+1
|\ \
| * | fix title typoethers2015-09-041-1/+1
|/ /
| * changes required to compile solidity in a single projectdebris2015-09-013-7/+2
|/
* Merge pull request #27 from LianaHus/sol_runtime_binary_by_-solcGav Wood2015-08-281-1/+14
|\
| * added option to solc to output runtimr part of the contractLianaHus2015-08-241-1/+14
* | Merge pull request #25 from LianaHus/sol_strings_as_mapping_keysGav Wood2015-08-281-4/+7
|\ \
| * | added check for string as mapping key for local var.LianaHus2015-08-241-4/+7
| |/
* | Merge pull request #24 from LianaHus/sol_fix_error_checkGav Wood2015-08-271-1/+1
|\ \
| * | added check for having type in VariableDeclaration::checkTypeRequirements()LianaHus2015-08-241-1/+1
* | | Merge pull request #31 from debris/client_refArkadiy Paronyan2015-08-274-16/+7
|\ \ \
| * | | client refactordebris2015-08-274-16/+7
|/ / /
* | | Merge pull request #29 from ethereum/cmake-add_sourcesArkadiy Paronyan2015-08-251-1/+3
|\ \ \
| * | | Fix "add_sources" cmake macro.Paweł Bylica2015-08-251-1/+3
|/ / /
* | | Merge pull request #26 from arkpar/cmakeMarek Kotewicz2015-08-244-55/+26
|\ \ \ | |_|/ |/| |
| * | Refactoreed CMakeLists for new module systemarkpar2015-08-244-55/+26
* | | added test to check string as mapping keyLianaHus2015-08-241-0/+16
| |/ |/|
* | Merge pull request #22 from LianaHus/sol_accessors_for_const_state_varchriseth2015-08-226-4/+45
|\ \
| * | add tests for state variables accessors. normal and constantLianaHus2015-08-216-4/+45
| |/
* | Merge pull request #20 from ethereum/readme.md-addedchriseth2015-08-211-2/+35
|\ \
| * | Update README.mdLiana Husikyan2015-08-211-3/+1
| * | Update README.mdchriseth2015-08-211-5/+5
| * | Update README.mdLiana Husikyan2015-08-211-3/+3
| * | Update README.mdLiana Husikyan2015-08-211-0/+3
| * | Update README.mdLiana Husikyan2015-08-211-0/+32
| |/
* | Merge pull request #18 from chriseth/sol_fixCloneExceptionPropagationchriseth2015-08-211-0/+3
|\ \ | |/ |/|
| * Propagate exceptions in clone calls.chriseth2015-08-211-0/+3
|/
* Merge pull request #7 from chriseth/moreInfoForCommandlineOptionsGav Wood2015-08-203-77/+87
|\
| * More information for help screen, some fixes for argument parsing.chriseth2015-08-203-77/+87
* | Merge pull request #6 from chriseth/cmakeUpdateTestsGav Wood2015-08-208-1369/+34
|\ \ | |/ |/|
| * Modularise CMakeLists files and integrate tests.chriseth2015-08-208-1369/+34
|/
* Merge pull request #5 from chriseth/addTestschriseth2015-08-2024-0/+15261
|\
| * Move Solidity tests.chriseth2015-08-2024-0/+15261
|/|
| * Move Solidity tests.chriseth2015-08-2024-0/+0
| * Merge pull request #2850 from winsvega/block2Gav Wood2015-08-191-1/+1
| |\
| | * BlockTests: restore corelibs and miningDimitry2015-08-171-1/+1
| | * Merge remote-tracking branch 'winsvega/block2' into winsvegaBlock2CJentzsch2015-08-170-0/+0
| | |\
| | | * Fill testsDimitry2015-08-170-0/+0
| | | * MiningDimitry2015-08-170-0/+0
| | | * BlockChainTests miningDimitry2015-08-170-0/+0
| | | * restore lost changes blockminingDimitry2015-08-170-0/+0
| | | * BLock2: state test filling issueDimitry2015-08-170-0/+0
| | * | fix coinbase rewards in blockChainTestsCJentzsch2015-08-170-0/+0
| | * | styleCJentzsch2015-08-170-0/+0
| | * | Merge remote-tracking branch 'winsvega/block2' into winsvegaBlock2CJentzsch2015-08-170-0/+0
| | |\ \
| | | * | Fill testsDimitry2015-08-150-0/+0
| | | * | MiningDimitry2015-08-150-0/+0
| | | * | BlockChainTests miningDimitry2015-08-150-0/+0
| | | * | restore lost changes blockminingDimitry2015-08-150-0/+0
| | | * | BLock2: state test filling issueDimitry2015-08-150-0/+0
| | | |/
| | * | Merge remote-tracking branch 'upstream/develop' into winsvegaBlock2CJentzsch2015-08-154-12/+118
| | |\|
| | * | clean upCJentzsch2015-08-150-0/+0
| | * | MiningDimitry2015-08-140-0/+0
| | * | BlockChainTests miningDimitry2015-08-140-0/+0
| | * | restore lost changes blockminingDimitry2015-08-120-0/+0
| | * | BLock2: state test filling issueDimitry2015-08-120-0/+0
| * | | Cleaned up some of network. Added HostSpec.Gav Wood2015-08-190-0/+0
| * | | Merge pull request #2848 from LefterisJP/eth_submitWork_strGav Wood2015-08-180-0/+0
| |\ \ \
| | * | | eth_submitWork's hash rate is now a hex stringLefteris Karapetsas2015-08-170-0/+0
| | | |/ | | |/|
| * | | use bytesCondtRef version of import secretCJentzsch2015-08-170-0/+0
| * | | add test SEC 013CJentzsch2015-08-170-0/+0
| |/ /
| * | Merge pull request #2604 from winsvega/verbosityGav Wood2015-08-134-12/+118
| |\ \
| | * | error report: styleDimitry2015-08-131-6/+13
| | * | Error report: style issuesDimitry2015-08-132-7/+6
| | * | boost issueDimitry2015-08-121-1/+1
| | * | nice error report mergeDimitry2015-08-120-0/+0
| | * | error report: merge with latesd developDimitry2015-08-122-2/+2
| | * | Error logsDimitry2015-08-124-21/+89
| | * | Nice Error ReportDimitry2015-08-122-1/+33
| | |/
| * | Merge pull request #2812 from ethereum/nameregnamerGav Wood2015-08-130-0/+0
| |\ \
| | * | NameReg integration.Gav Wood2015-08-130-0/+0
| | |/
| * | Merge pull request #2602 from chfast/evmjit_stackGav Wood2015-08-130-0/+0
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'upstream/develop' into evmjit_stackPaweł Bylica2015-08-1112-174/+1032
| | |\
| | * \ Merge remote-tracking branch 'upstream/develop' into evmjit_stackPaweł Bylica2015-07-283-4/+64
| | |\ \
| | * | | Add test for global stack underflow.Paweł Bylica2015-07-280-0/+0
| | * | | Test dynamic jumps.Paweł Bylica2015-07-270-0/+0
| * | | | Merge pull request #2740 from ethereum/hashrateGav Wood2015-08-120-0/+0
| |\ \ \ \
| | * \ \ \ Merge branch 'hashrate' of github.com:ethereum/cpp-ethereum into hashrateGav Wood2015-08-070-0/+0
| | |\ \ \ \
| | | * | | | Introduce basic API for hashrate.Gav Wood2015-08-060-0/+0
| | * | | | | More on hashrate API.Gav Wood2015-08-060-0/+0
| | * | | | | Introduce basic API for hashrate.Gav Wood2015-08-060-0/+0
| | |/ / / /
| * | | | | Merge pull request #2777 from CJentzsch/fixStateTestsFillingGav Wood2015-08-121-3/+14
| |\ \ \ \ \
| | * | | | | clean upCJentzsch2015-08-110-0/+0
| | * | | | | Merge remote-tracking branch 'upstream/develop' into fixStateTestsFillingCJentzsch2015-08-111-0/+28
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | compile code in accounts when importing stateCJentzsch2015-08-101-3/+14
| * | | | | | Merge pull request #2714 from winsvega/coverage_whezz2Gav Wood2015-08-112-31/+36
| |\ \ \ \ \ \
| | * | | | | | Cover: remove unit.cppDimitry2015-08-110-0/+0
| | * | | | | | Coverage: testsDimitry2015-08-112-31/+36
| | * | | | | | CodeCoverage: libethereumDimitry Khokhlov2015-08-110-0/+0
| | * | | | | | Coverage: libethereum::AccountDiffDimitry Khokhlov2015-08-110-0/+0
| * | | | | | | Reduce usage of "new".chriseth2015-08-110-0/+0
| |/ / / / / /
| * | / / / / Add a JS console command for exiting the clientLefteris Karapetsas2015-08-110-0/+0
| | |/ / / / | |/| | | |
| * | | | | Fix an error in a type resolution SOL testLefteris Karapetsas2015-08-111-1/+1
| * | | | | Merge pull request #2734 from chriseth/sol_fixOperatorsGav Wood2015-08-111-0/+28
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Disallow comparison for reference types.chriseth2015-08-071-0/+12
| | * | | | Do not allow boolean operators for integers.chriseth2015-08-071-0/+16
| * | | | | Merge pull request #2768 from debris/icap_testsGav Wood2015-08-100-0/+0
| |\ \ \ \ \
| | * | | | | fixed header filesdebris2015-08-100-0/+0
| | * | | | | fixed boost % bugdebris2015-08-100-0/+0
| | * | | | | icap encoding and decoding testsdebris2015-08-100-0/+0
| * | | | | | remove MoveNonceToTempDirsubtly2015-08-102-13/+0
| |/ / / / /
| * | | | | Merge pull request #2717 from gluk256/_shhrpcGav Wood2015-08-080-0/+0
| |\ \ \ \ \
| | * | | | | a small updateVlad Gluhovsky2015-08-070-0/+0
| | * | | | | nonetwork check addedVlad Gluhovsky2015-08-070-0/+0
| | * | | | | style updateVlad Gluhovsky2015-08-070-0/+0
| | * | | | | tests for whisper apiVlad Gluhovsky2015-08-060-0/+0
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #2750 from gluk256/_nonetworkGav Wood2015-08-080-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | bugfixVlad Gluhovsky2015-08-070-0/+0
| | * | | | nonetwork check addedVlad Gluhovsky2015-08-070-0/+0
| | |/ / /
| * | | | compile fix, missing includeCJentzsch2015-08-070-0/+0
| * | | | disable whisper tests which need networkingCJentzsch2015-08-070-0/+0
| * | | | Merge pull request #2736 from chriseth/sol_auctionRegistrarTestsGav Wood2015-08-072-6/+89
| |\ \ \ \
| | * | | | Actual auction tests.chriseth2015-08-062-6/+89
| * | | | | Merge pull request #2731 from subtly/cryptoFixGav Wood2015-08-072-6/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Simplify/remove unused methods.subtly2015-08-052-6/+2
| * | | | | Fix key manager test.chriseth2015-08-060-0/+0
| | |/ / / | |/| | |
| * | | | Merge pull request #2716 from gluk256/_peer_testGav Wood2015-08-060-0/+0
| |\ \ \ \
| | * | | | peer test updatedVlad Gluhovsky2015-08-060-0/+0
| * | | | | Merge pull request #2620 from gluk256/_web3_testGav Wood2015-08-060-0/+0
| |\ \ \ \ \
| | * | | | | small bugfixVlad Gluhovsky2015-08-030-0/+0
| | * | | | | style fixVlad Gluhovsky2015-08-030-0/+0
| | * | | | | web3 test completeVlad Gluhovsky2015-08-030-0/+0
| | * | | | | tests updatedVlad Gluhovsky2015-08-030-0/+0
| | * | | | | shh rpc test, initial versionVlad Gluhovsky2015-08-030-0/+0
| * | | | | | Merge pull request #2553 from winsvega/cover1Gav Wood2015-08-060-0/+0
| |\ \ \ \ \ \
| | * | | | | | StyleDimitry2015-08-060-0/+0
| | * | | | | | cover1: ExtraData1024 Test FillerDimitry2015-08-060-0/+0
| | * | | | | | Cover: styleDimitry2015-08-060-0/+0
| | * | | | | | Tests - ExtraData32Dimitry2015-08-060-0/+0
| | * | | | | | Coverage: TransactionDimitry2015-08-060-0/+0
| | * | | | | | cover1: TransactionDimitry2015-08-060-0/+0
| | * | | | | | cover1: toTransactionExceptionConvertDimitry2015-08-060-0/+0
| | * | | | | | libethereum:Transaction coverageDimitry2015-08-060-0/+0
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #2705 from chriseth/sol_auctionRegistrarTestsGav Wood2015-08-063-0/+487
| |\ \ \ \ \ \
| | * | | | | | Basic tests for auction registrar.chriseth2015-08-053-0/+487
| | |/ / / / /
| * | | | | | readd solidity testsCJentzsch2015-08-062-0/+42
| * | | | | | update test to new Block/State refactoring - credit to winsvega and chrisethCJentzsch2015-08-067-92/+87
| * | | | | | First draft at splitting State.Gav Wood2015-08-063-115/+36
| |/ / / / /
| * | | | | Merge pull request #2688 from chriseth/toBytesConversionchriseth2015-08-052-0/+42
| |\ \ \ \ \
| | * | | | | Allow explicit conversions bytes <-> string.chriseth2015-08-042-0/+42
| * | | | | | Merge pull request #2710 from ethereum/subtly-patch-2Gav Wood2015-08-050-0/+0
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | disable failing deadlinetimer testsubtly2015-08-050-0/+0
| * | | | | | Merge pull request #2708 from CJentzsch/difficultyTestsGav Wood2015-08-050-0/+0
| |\ \ \ \ \ \
| | * | | | | | get block number for parent in difficulty testCJentzsch2015-08-050-0/+0
| | * | | | | | add difficutly testsCJentzsch2015-08-050-0/+0
| * | | | | | | Merge pull request #2704 from ethereum/CJentzsch-thawingGav Wood2015-08-050-0/+0
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge branch 'thawing' of https://github.com/CJentzsch/cpp-ethereum into CJen...Gav Wood2015-08-040-0/+0
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | typo - trigger buildbotCJentzsch2015-08-040-0/+0
| | | * | | | | use global constant for defsultGasPriceCJentzsch2015-08-030-0/+0
| | | * | | | | adjust gasPricerTests to 50 shannonCJentzsch2015-08-030-0/+0
| | | | |/ / / | | | |/| | |
| * | | | | | Avoid doing the deadline timer test.Gav Wood2015-08-050-0/+0
| | |_|/ / / | |/| | | |
| * | | | | Break off contract tests.chriseth2015-08-044-0/+6
| |/ / / /
| * / / / strings as mapping keys.chriseth2015-08-041-0/+33
| |/ / /
| * | | Merge pull request #2676 from gluk256/_bugfix_testGav Wood2015-08-010-0/+0
| |\ \ \
| | * | | bugfixVlad Gluhovsky2015-08-010-0/+0
| * | | | Disable network test by default.Gav Wood2015-07-311-1/+1
| |/ / /
| * | | temp. remove bruncle testCJentzsch2015-07-300-0/+0
| * | | Version bump.Gav Wood2015-07-300-0/+0
| * | | Merge pull request #2593 from gluk256/_test_refactoringGav Wood2015-07-300-0/+0
| |\ \ \
| | * | | minor updateVlad Gluhovsky2015-07-270-0/+0
| | * | | updated test topic advertisingVlad Gluhovsky2015-07-270-0/+0
| | * | | refactoring of topic testVlad Gluhovsky2015-07-270-0/+0
| * | | | Merge pull request #2635 from CJentzsch/timeStampTestsGav Wood2015-07-300-0/+0
| |\ \ \ \
| | * | | | adjust blockGasLimit in order to get same result for gasPricer test in olympi...CJentzsch2015-07-300-0/+0
| | * | | | add timestamp testsCJentzsch2015-07-290-0/+0
| * | | | | Merge pull request #2638 from chriseth/sol_fixedFeeRegistrarGav Wood2015-07-302-0/+238
| |\ \ \ \ \
| | * | | | | Tests for FixedFeeRegistrar.chriseth2015-07-302-0/+238
| | |/ / / /
| * | | | | Merge pull request #2630 from ethereum/securenonceGav Wood2015-07-300-0/+0
| |\ \ \ \ \
| | * | | | | Make Nonce use Secret.Gav Wood2015-07-290-0/+0
| | |/ / / /
| * | | | | Merge pull request #2633 from chfast/evmjit_stacklimit_fixGav Wood2015-07-300-0/+0
| |\ \ \ \ \
| | * | | | | Fix EVM JIT stack limit checking.Paweł Bylica2015-07-290-0/+0
| | |/ / / /
| * | | | | Modify code to prepare for rebaseLefteris Karapetsas2015-07-300-0/+0
| * | | | | Add new js admin nodeInfo commandLefteris Karapetsas2015-07-300-0/+0
| |/ / / /
| * | | | style fix.Gav Wood2015-07-290-0/+0
| * | | | Merge pull request #2624 from CJentzsch/FrontierTestsGav Wood2015-07-291-3/+3
| |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 11:20:46 +0800