cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,138 Commits 348 Branches 121 Tags 100 MiB
160f3bf2ae
Commit Graph

1480 Commits

Author SHA1 Message Date
wbt
8aadc179ae
Fix small formatting issue 
in which a constant was not treated as code, inconsistent with surrounding examples.
 2018-03-30 15:28:15 -04:00
Alex Beregszaszi
b540ba527a Disallow empty structs 2018-03-27 15:49:41 +01:00
Alex Beregszaszi
8c1352ca75
Merge pull request #3772 from ethereum/docsTestingGuide 
Add syntax testing guide to docs
 2018-03-27 14:28:16 +01:00
Erik Kundt
80458b0420 Explains test structure and update mechanism more detailed. 2018-03-27 11:55:21 +02:00
bitshift
bddfa47e77 Updates docs for blockhash changes. 2018-03-27 03:30:03 +01:00
Erik Kundt
9d9c0bf908 Updates "How to contribute" 
Adds detailed description of  the new syntax test tool.
 2018-03-21 19:35:22 +01:00
Matías A. Ré Medina
6e730df036
Fix: Missing payable at function forceOwnerChange 
forceOwnerChange expects ether, and does not have the payable keyword.
 2018-03-19 16:38:20 -03:00
Daniel Kirchner
3232561d97 Refactoring; fuse SyntaxTestParser and SyntaxTester to SyntaxTest. 2018-03-13 11:20:11 +01:00
chriseth
5ad34e035e
Merge pull request #3702 from solidity-korea/develop 
Add Korean to Translations
 2018-03-12 15:07:46 +01:00
wbt
7d206ba64a Noted suicide is deprecated (#3692) 
According to the [changelog](b5e804b8ca/Changelog.md), `suicide` was deprecated before 0.4.3 (after 0.2.0) and warning by 0.4.17.
 2018-03-12 15:02:24 +01:00
dongsamb
a0907e90c6 Add Korean to Translation 2018-03-10 11:49:51 +09:00
Grzegorz Hasse
7ebd580954 Fix a typo. 2018-03-07 21:27:24 -08:00
chriseth
cbd8644f2d Update changelog for release. 2018-03-07 18:15:25 +01:00
chriseth
c1bf6fb96f
Merge pull request #3634 from ethereum/useCorrectVersionForEmit 
Use 0.4.21 pragma for documentation that uses "emit".
 2018-03-07 18:13:11 +01:00
ankit raj
7566787cd2 Some words on Remix 2018-03-06 19:39:53 +01:00
chriseth
3057aeece4 Document STATICCALL usage in experimental 0.5.0. 2018-03-06 15:32:45 +01:00
chriseth
6055bc250f Use coding style. 2018-03-06 10:32:58 +01:00
chriseth
5f5af650ce
Merge pull request #3653 from ethereum/docNegativeSourceIndex 
Document the meaning of sourceIndex "-1" in source mappings.
 2018-03-06 09:28:53 +01:00
Oleksii Matiiasevych
5d486b741f
Revert warning update about view modifier 2018-03-06 14:19:59 +07:00
Daniel Kirchner
154fd1d6cb Document the meaning of sourceIndex "-1" in source mappings. 2018-03-06 02:05:35 +01:00
chriseth
3793aa405b
Merge pull request #3643 from ethereum/gasleft 
Move msg.gas to global function gasleft(). Closes #2971.
 2018-03-05 20:11:37 +01:00
Daniel Kirchner
b8589fbe0f Use msg.value and gasleft() as an example in the docs. 2018-03-05 16:59:33 +01:00
chriseth
6dc137317f
Merge pull request #3569 from ethereum/evmVersion 
EVM version
 2018-03-05 12:10:49 +01:00
Daniel Kirchner
c633c0eacb Move msg.gas to global function gasleft(). Closes #2971. 2018-03-05 11:18:04 +01:00
Furkan Ayhan
c2730a4893
Correct warning message in Pure Functions doc 
wrong commit that caused this: (64eaff6420 (diff-754689a291c0a19b500c31eb6c1d30c7R506))
 2018-03-04 13:23:07 +03:00
bernard peh
cde4e3172b change the language so that it doesn't sound like send and transfer is providing the stipend 2018-03-02 23:40:17 +11:00
chriseth
66ee9aa2f1 Use 0.4.21 pragma for documentation that uses "emit". 2018-03-02 12:29:48 +01:00
bernard peh
2c086cb90b clarify 2300 gas stipend in fallback function section 2018-03-02 16:25:52 +11:00
chriseth
1246917e32 Explain json-io setting. 2018-03-01 17:19:35 +01:00
Elena Dimitrova
c9840c98f4 Documentation updates for internal constructors and function signature (#3365) 
* Add a note explaining return values not included in function signature

* Add section on Constructors in documentation

* Improve documented definition for abstract contract

* Add benefits of abstraction to documentation
 2018-03-01 16:59:47 +01:00
Oleksii Matiiasevych
a0d006015e Update Tips and Tricks on structs initialization. (#3626) 
* Update Tips and Tricks on structs initialization.
 2018-03-01 16:54:04 +01:00
chriseth
cf6720eab5
Merge pull request #3587 from OTTTO/develop 
Multiline output parameters and return statements
 2018-03-01 12:07:09 +01:00
Jordi Baylina
4f34d092ca
Update miscellaneous.rst 2018-02-28 09:35:07 +01:00
chriseth
908b46e9a7
Merge pull request #3476 from ethereum/scoping 
C99/C++ scoping rules
 2018-02-27 17:06:10 +01:00
Alex Beregszaszi
317e017849 Shift operands were swapped in accepted EIP145 2018-02-27 13:43:02 +01:00
Alex Beregszaszi
afa4a48e37 Remove ROL/ROR as they are not part of EIP145 anymore 2018-02-27 13:42:41 +01:00
Alex Beregszaszi
9e0446a22c Document bitwise shift operators in assembly 2018-02-27 13:42:28 +01:00
chriseth
6391a36a6c Documentation about new scoping rules. 2018-02-27 12:41:32 +01:00
Alex Beregszaszi
aeb75172d5 Fix builtin function formatting in julia 2018-02-27 11:16:12 +01:00
Alex Beregszaszi
8cebfb168b Introduce VM version ('hard fork') column for assembly opcodes 2018-02-27 11:16:12 +01:00
Alex Beregszaszi
e424bd1007 Fix some keyword highlighting in docs 2018-02-27 11:12:10 +01:00
Dax Bondye
e34d367593 Multiline output parameters and return statements 2018-02-26 19:32:55 -08:00
Alex Beregszaszi
3594f02d51 Fix link to solcjs in the installation section 2018-02-27 00:38:52 +01:00
Alex Beregszaszi
241134a881 Mention that solcjs is not compatible with solc in the using-the-compiler section 2018-02-27 00:36:01 +01:00
chriseth
1f5eb4ba59
Merge pull request #3335 from nisdas/ballot-contract 
Fixes the errors in the sample ballot contract
 2018-02-27 00:17:46 +01:00
wbt
92fe9e621e Note deprecation of constant keyword on functions 2018-02-27 00:08:17 +01:00
chriseth
098033c94a Fix name shadowing in ballot example contract. 2018-02-27 00:02:39 +01:00
Alex Beregszaszi
64eaff6420 Random documentation updates (assembly, faq) 2018-02-26 20:19:26 +01:00
Aaron Colaço
ef7fbf8d0c Fix example; closes #3582 2018-02-24 00:09:49 +05:30
Hongbin Zuo
02307235c5 add in progress 2018-02-23 16:44:05 +08:00
Hongbin Zuo
fc3473b282 Why you made this change: 
Talked with Chris and Matt, in order to develop stronger ethereum community in China, we decided to initiate the activity to translate Solidity documentation into Simplified Chinese version. We have invited over 10 experienced translators as a team to contribute on this effort.

What you did:
I finished translation of index.rst into Simplified Chinese and wanted it to be added into main doc index.
 2018-02-23 15:06:14 +08:00
chriseth
2b62c201be
Merge pull request #3538 from ethereum/emitEvents 
emit pseudo-keyword for events.
 2018-02-22 22:42:04 +01:00
chriseth
97d1c70491
Merge pull request #3575 from OTTTO/develop 
Recommend to explicitly label the visibility of functions.
 2018-02-22 22:41:29 +01:00
Dax Bondye
2ac49b3c2d Reccomend to explicitly label the visibility of functions. 2018-02-22 10:23:20 -08:00
chriseth
71a34abd87
Merge pull request #3513 from OTTTO/develop 
Add "Maximum Line Length" section
 2018-02-22 16:12:49 +01:00
DYLAN BECKWITH
187e50b14c Recommend consistent style for wrapping long lines. 2018-02-22 07:01:07 -08:00
chriseth
7d87aed5d0
Merge pull request #3552 from ethereum/chriseth-patch-1 
ABI: Clarify padding direction.
 2018-02-22 15:32:18 +01:00
chriseth
2ada9683dd
Use the term "trailing zero-bytes". 2018-02-22 15:24:14 +01:00
chriseth
f58024b974 Documentation about emitting events. 2018-02-22 15:17:42 +01:00
chriseth
388718b59f Introduce emit statement. 2018-02-22 15:17:30 +01:00
mirgj
d01786f0aa
Update solidity-by-example.rst 
highestBidder is the address.
it's highestBid that should be != 0 to be considered as pending return.

It's that right?
 2018-02-22 01:42:57 +08:00
chriseth
20d8254029
Merge pull request #3427 from duaraghav8/patch-3 
Abstract Contracts: Add note about function type
 2018-02-21 18:04:35 +01:00
chriseth
29d40ad42a
Clarify padding direction. 2018-02-20 12:19:19 +01:00
chriseth
2a58b44b8b
Merge pull request #3543 from medvedev1088/feature/add-gas-details-to-documentation 
Add gas forwarding details to address related functions in documentation
 2018-02-19 23:16:36 +01:00
William Entriken
360009c376
Typo 2018-02-19 15:38:55 -05:00
Evgeny Medvedev
bce545c990 Add adjustable/no adjustable gas details to address related functions in units-and-global-variables.rst 2018-02-20 02:06:42 +07:00
chriseth
59f5a31376
Merge pull request #3357 from federicobond/improve-asm-grammar 
docs: Improve assembly grammar definition
 2018-02-19 19:30:54 +01:00
chriseth
09887de266
Fix link. 2018-02-19 19:02:49 +01:00
chriseth
39f09a90f0
Merge pull request #3448 from fulldecent/patch-8 
Clarify name documentation for mixedCase
 2018-02-19 18:59:50 +01:00
chriseth
a938e39a9d
Merge pull request #3182 from janat08/patch-2 
Update introduction-to-smart-contracts.rst
 2018-02-19 16:52:45 +01:00
chriseth
2b23d02c83
Update introduction-to-smart-contracts.rst 2018-02-19 16:52:37 +01:00
Evgeny Medvedev
bfcf4a86c3 Add gas forwarding details to address related functions in units-and-global-variables.rst 2018-02-18 23:43:09 +07:00
chriseth
2b5a5a8669 Make addmod and mulmod revert if the last argument is zero. 2018-02-15 13:52:17 +01:00
Alexandre Bezroutchko
3804f29a8d fix a typo 2018-02-14 09:49:06 +01:00
chriseth
fccede62ce Prepare 0.4.20 release. 2018-02-13 17:17:46 +01:00
chriseth
01ba8b7e1f
Remind authors of best practices. 2018-02-01 17:13:46 +01:00
William Entriken
5497a85158
Clarify name documentation for mixedCase 2018-01-29 14:45:36 -05:00
William Entriken
b517ebb8bc
Fix new Solidity warnings, for #3379 2018-01-29 10:26:07 -05:00
chriseth
bd3692f1e6
Merge pull request #3431 from fulldecent/patch-7 
Add mutability declaration to example, for #3379
 2018-01-29 13:44:43 +01:00
William Entriken
1cc31bacef
Remove useless self assignment 2018-01-28 17:41:09 -05:00
YuShuangqi
0ef43978fd
update types 
correct the mistakes in writings
 2018-01-27 07:36:25 +08:00
chriseth
9028610b45
Merge pull request #3424 from wbt/addDecompilerLink 
Correct FAQ answer re: decompiler
 2018-01-26 19:22:15 +01:00
wbt
efcc8efffa
Respond to chriseth's suggestions 
https://github.com/ethereum/solidity/pull/3424#pullrequestreview-90873869
 2018-01-26 13:15:22 -05:00
hyperfekt
b4fb7255dd
fixes ethereum/solidity#1209 
This clears up a common and easy misunderstanding which seems to occur rather often.
(https://ethereum.stackexchange.com/questions/8263/trying-to-understand-libraries)
 2018-01-26 15:32:11 +01:00
chriseth
e7afde9587
Merge pull request #3203 from ethereum/nocall 
Prevent libraries from being called.
 2018-01-25 16:45:54 +01:00
ZoOgY-DoOgY
4f753233f7
Inheritance, "super" and DDD 
As explained in "Multiple Inheritance and Linearization" part, "a simple rule to remember is to specify the base classes in the order from “most base-like” to “most derived”". So "contract Final is Base1, Base2" means Final is derived from Base2, derived from Base1, so the final inheritance sequence should be, starting with the most derived contract : Final, Base2, Base1, mortal, owned.
 2018-01-24 13:38:47 +01:00
William Entriken
053e634276
Add mutability declaration to example, for #3379 2018-01-23 21:52:58 -05:00
Raghav Dua
694fc6835f
correct terminology 2018-01-23 23:43:04 +05:30
Raghav Dua
18539e5353
Abstract Contracts: Add note about function type 2018-01-23 23:23:18 +05:30
Maurelian
31aaf4336a Add comment to clarify example (#3415) 
* Add comment to clarify example

* Reverse bases.
 2018-01-23 18:14:56 +01:00
chriseth
b24de1c29c
Some more clarifications. 2018-01-23 17:53:13 +01:00
wbt
a396572f57
Update FAQ answer re decompiler 2018-01-23 09:53:00 -05:00
Li Xuanji
d555c82db4
clarify address in function selector 
I found that the canonical form for `address` in computing the function selector calldata tag is `uint160`. Update the abi specs to explicitly mention this.
 2018-01-22 17:34:58 -05:00
Sawyer
530b47a01b
Update using-the-compiler.rst 
in outputSelection section of Compiler Input and Output JSON Description:
"evm.sourceMap" should be "evm.bytecode.sourceMap"
"evm.opcodes"  should be "evm.bytecode.opcodes"
 2018-01-21 16:35:59 +08:00
chriseth
f7315d19bd Document call protector. 2018-01-19 16:52:23 +01:00
Raghav Dua
95bafbc4e0
update solium description 2018-01-18 16:32:46 +05:30
wbt
1948b9687f
Case convention clarification 
Constructors follow the contract naming convention, using CapWords, instead of mixedCase.
 2018-01-16 13:08:20 -05:00
chriseth
14fcbd659f
Merge pull request #3393 from fulldecent/patch-5 
Use CapWords style for example
 2018-01-15 10:55:11 +01:00
William Entriken
b1d99587e0
Use CapWords style for example 
Follows recommendation in https://github.com/ethereum/solidity/pull/3392
 2018-01-14 13:56:02 -05:00
William Entriken
cb5758aa75
Prefer CapWords style struct names 2018-01-14 13:53:45 -05:00
William Entriken
deeee06bc2
Fix links and JS reference 2018-01-10 20:43:38 -05:00
William Entriken
c7632fc732
No nonsense explanation of compiler options 2018-01-05 10:13:33 -05:00
chriseth
6a9a4e2bb8
Explain the difference to inline assembly. 2018-01-04 17:19:45 +01:00
Federico Bond
be065a1243 grammar.txt: Add optional storage location to parameters 2018-01-04 01:47:07 -03:00
Federico Bond
088d0e5dc1 docs: Improve assembly grammar definition 2017-12-24 04:30:49 -03:00
Chuck LeDuc Díaz
efc198d515 Minor syntax and formatting changes (#3337) 
* Copyediting, mostly syntax.

* Use consistent quote chars inside sample code comments

* Revert to put back matching parenthesis

* Use single backticks for comment code quotes

wherever a reserved word, function or variable name is used in a comment
 2017-12-20 10:48:22 +01:00
chriseth
a4b886ad3c
Merge pull request #3345 from kevinwucodes/patch-1 
add clarity to destructuring assignments with leading comma
 2017-12-19 12:39:28 +01:00
Steve Waldman
75dd416c6e [Docs] Note that events can contain both indexed and unindexed arguments for values of dynamic-length types. 2017-12-19 03:09:13 -08:00
Steve Waldman
bae913368a [Docs] Include explanation of how indexed dynamic-length event args are encoded 2017-12-19 01:51:57 -08:00
Kevin Wu
ddad6a3f80
add clarity to destructuring assignments 2017-12-18 09:55:13 -08:00
Alex Beregszaszi
460c9f3943
Merge pull request #3343 from ethereum/structs-struct 
Fix grammar: "structs type" into "struct type"
 2017-12-18 14:18:06 +00:00
chriseth
2b19bcf609 Link to dev channel 2017-12-18 13:05:08 +00:00
Yoichi Hirai
d6e73b013f
Fix grammar: "structs type" into "struct type" 2017-12-18 13:31:40 +01:00
Jim McDonald
93cf4dee66 Fixes for failing tests 2017-12-13 07:55:46 +00:00
Jim McDonald
6e521d59b0 Fix Solidity warnings 2017-12-12 18:47:30 +00:00
elenadimitrova
c6a4aba9f0 Document function overloads and resolution 2017-12-12 10:26:58 +02:00
Alex Beregszaszi
40e8716926
Merge pull request #3197 from medvedev1088/fix-security-considerations-example 
Add another example with call to demonstrate Re-Entrancy
 2017-12-12 04:22:45 +00:00
Alex Beregszaszi
37b06884b2 Correct that ether transfers _can_ always include code execution in re-entrancy example 2017-12-12 03:31:30 +00:00
Evgeny Medvedev
2f6f81640b Add another contract with call to demonstrate re-entrancy vulnerability. 
Add another contract with call to demonstrate re-entrancy vulnerability as send explicitly sets gas to 2300 by default according to this commit 9ca7472 which makes it impossible to "get multiple refunds" because a non-zero CALL costs at least 9700 gas. This issue is discussed on Ethereum StackExchange https://ethereum.stackexchange.com/questions/30371/send-ether-reentrancy-attack-in-reality-how-could-fallback-function-make-a-mes/30616#30616
 2017-12-12 03:31:00 +00:00
Zhen Zhang
d50e8abefb Document JSON I/O error classes 2017-12-12 03:02:30 +00:00
chriseth
eebeb52aed
Merge pull request #3228 from ethereum/docs-tests-struct 
Enable struct abi example with experimental pragma
 2017-12-11 14:26:15 +01:00
chriseth
27f38fb5b3
Merge pull request #3281 from GNSPS/develop 
Removed manual adjustment of stack of the docs
 2017-12-11 12:00:47 +01:00
Kamuela Franco
ef57961711
Update style-guide.rst to include enum style 2017-12-09 14:53:40 +00:00
Gonçalo Sá
ca16099ad0 Removed manual adjustment of stack of the docs 
Removed the section fo the docs regarding manual adjustment of the stack given the `unbalanced stack` check prevents its use
 2017-12-05 03:20:35 +00:00
Ezra Epstein
29b30a95e9
link to wiki for additional info on napspec 2017-12-01 14:00:44 -05:00
Alex Beregszaszi
134cc73e8e Enable struct abi example with experimental pragma 2017-12-01 16:20:23 +00:00
chriseth
f7538daaf4 Preparation for 0.4.19 release. 2017-11-30 01:23:22 +01:00
Alex Beregszaszi
59bed63dbc Update standard json documentation 2017-11-29 20:10:18 +00:00
wbt
2ebc9953e4
Minor update in contracts 
Fix typos and prevent example code from needing horizontal scroll bar
 2017-11-29 14:21:21 -05:00
chriseth
a1f59cbb17
Merge pull request #3220 from ethereum/IuliaIf 
If statement for Iulia / Inline Assembly
 2017-11-27 09:02:46 -05:00
chriseth
1d91b65b72 Force condition to be bool in iulia mode. 2017-11-23 18:52:04 +01:00
chriseth
d0be67f6b0
Bugfix in blind auction 2017-11-23 18:43:19 +01:00
Alex Beregszaszi
dcd55c5005 Add exponential notation to numbers in SolidityLexer 2017-11-23 12:13:00 +00:00
Alex Beregszaszi
2c3c5ad7c9 Move reserved keywords from SolidityLexer 2017-11-23 12:12:34 +00:00
chriseth
e15918d8b6 Add if statement to Julia specification. 2017-11-22 16:25:24 +01:00
chriseth
6dbc34e16e If statement for Iulia / inline assembly. 2017-11-22 16:25:24 +01:00
Alex Beregszaszi
ff229ab05a
Merge pull request #3195 from ethereum/chriseth-patch-1 
Tone down similarity to JavaScript.
 2017-11-22 13:25:04 +00:00
chriseth
88e1b68aaf More explanation about the packed encoding. 2017-11-22 12:29:16 +00:00
Ezra Epstein
744dea60a4 had "names" when "parameters" was meant 2017-11-22 04:08:35 +00:00
Alex Beregszaszi
23379e1061 Ensure each code snippet in the docs can be extracted for tests 2017-11-22 04:08:35 +00:00
Sami Mäkelä
a4310fec55 avoid reassigning variables 2017-11-22 03:33:08 +00:00
Sami Mäkelä
16f8187166 added Switch specification 2017-11-22 03:33:07 +00:00
chriseth
d4452d8c1f Small fixes 
suggested by @mrsmkl
 2017-11-22 03:33:07 +00:00
chriseth
c2f2b25064 Some clarifications. 2017-11-22 03:33:07 +00:00
chriseth
5eaef9e87e Typos and clarifications. 2017-11-22 03:33:07 +00:00
chriseth
a67bd2fb6a Include JULIA section in the TOC. 2017-11-22 03:33:07 +00:00
Alex Beregszaszi
72f9e45b1a Add true/false literals 2017-11-22 03:33:07 +00:00
Alex Beregszaszi
980ba42faf Remove from examples 2017-11-22 03:33:06 +00:00
Alex Beregszaszi
0e0de7b7fd Switch cases do not require colon 2017-11-22 03:33:06 +00:00
chriseth
d9abe7b712 Require at least one case in switch 2017-11-22 03:33:06 +00:00
Alex Beregszaszi
e9b08e029e Restriction of switch 2017-11-22 03:33:06 +00:00
Alex Beregszaszi
15ca987048 Include section for Julia objects 2017-11-22 03:33:06 +00:00
Alex Beregszaszi
29502f9d44 Include type names in grammar 2017-11-22 03:33:06 +00:00
Alex Beregszaszi
b2f2b36b7c Remove subassembly 2017-11-22 03:33:05 +00:00
Alex Beregszaszi
be470f107e Support types in grammar 2017-11-22 03:33:05 +00:00
Alex Beregszaszi
0493828916 Clarify literals 2017-11-22 03:33:05 +00:00
Alex Beregszaszi
29da069bf0 Do not require parentheses on function return values 2017-11-22 03:33:05 +00:00
chriseth
ad5cd21571 More specification. 2017-11-22 03:33:05 +00:00
chriseth
f17bdaabda Improve semantics description. 2017-11-22 03:33:04 +00:00
Alex Beregszaszi
e33a9b43ad Include split/combine256 2017-11-22 03:33:04 +00:00
Alex Beregszaszi
aa6f33db2c Use signed/unsigned types in low-level functions 2017-11-22 03:33:04 +00:00
Alex Beregszaszi
0e4d236558 Include implicit type conversions 2017-11-22 03:07:54 +00:00
Alex Beregszaszi
183f70262a Document backends 2017-11-22 03:07:54 +00:00
Alex Beregszaszi
0339cc1bb1 Case is missing from switch statements 2017-11-22 03:07:54 +00:00
Alex Beregszaszi
3d99e82795 Add types to the examples 2017-11-22 03:07:54 +00:00
Alex Beregszaszi
173bdb0df6 Define types in Julia 2017-11-22 03:07:54 +00:00
Alex Beregszaszi
c3a6db7256 Describe built-in Julia functions 2017-11-22 03:07:54 +00:00
Alex Beregszaszi
2a91eb9538 Move Julia documentation to its own file 2017-11-22 03:07:49 +00:00
chriseth
f73660423a First take in formal specification. 2017-11-22 02:45:07 +00:00
chriseth
243002e5f3 Describe Julia. 2017-11-22 02:45:07 +00:00
Alex Beregszaszi
f22ac8fc96
Merge pull request #3204 from frangio/grammar-incomplete-tuples 
Make tuple components optional in documented grammar
 2017-11-22 02:22:38 +00:00
chriseth
5c9e273d02 Link to translations. (#3212) 2017-11-21 12:03:47 +00:00
Chua Chee Wee
15427dc8d3
Change phrase in type deduction 
updated phrase in type deduction from "any value of this type" to "the highest value of this type"
 2017-11-16 23:18:06 +08:00
chriseth
03b3faa8ef Tone down similarity to JavaScript. 2017-11-16 13:18:43 +01:00
Alex Beregszaszi
58e452d14d
Merge pull request #3173 from federicobond/improve-number-grammar 
Improve rule for decimal numbers in grammar.txt
 2017-11-16 09:43:47 +00:00
Federico Bond
58a0f09f8e Improve rule for decimal numbers in grammar.txt 2017-11-15 17:11:45 -03:00
chriseth
3121608d7c
Remove obsolote statement about msg.sender and library calls. 2017-11-15 17:08:42 +01:00
Liana Husikyan
9d328d308d
Update index.rst 
Some minor text editing.
 2017-11-15 03:18:30 +01:00
Francisco Giordano
0b3ef5bbc7 Make tuple components optional in documented grammar 2017-11-14 16:35:50 -03:00
janat08
dfac04d139
Update introduction-to-smart-contracts.rst 2017-11-09 05:17:28 +06:00
Chua Chee Wee
d4db1624b5
Changed limitation to feature 
Changed the word "limitation" to "feature" for the note where transfer is described.
 2017-10-30 15:40:28 +08:00
walter-weinmann
fcf66721da abi-spec: example code doesn't fit grammar.txt. 2017-10-29 11:58:00 +01:00
Christian Pamidov
f9b240096f Fixed typos (#3139) 2017-10-28 12:48:57 +01:00
Svetlin Nakov
58778be567 Fixed typos 2017-10-25 22:58:18 +03:00
Svetlin Nakov
f39cf7be41 Improved the "Naming" section 
Improved the "Naming" section. Added naming examples. Improved consistency.
 2017-10-25 10:33:26 +03:00
chriseth
4f30582db4 Merge pull request #3053 from wjmelements/nit-examples 
Replace biddingTime with auctionEnd in auction example
 2017-10-20 18:06:45 +02:00
Boris Kostenko
36bf0a8a86 Accent on ext.deps in install docs (issue #3048) 2017-10-19 08:25:27 +03:00
Boris Kostenko
55a7828848 Accent on ext.deps in install docs (issue #3048) 2017-10-19 01:10:12 +03:00
chriseth
c3a7422399 Update changelog for 0.4.18 release. 2017-10-18 12:48:15 +02:00
chriseth
7849b920cf Bug list entry. 2017-10-18 00:19:36 +02:00
chriseth
c67b559ead Merge pull request #2994 from idrabenia/develop 
Add solhint to list of tools.
 2017-10-17 18:56:30 +02:00
chriseth
3bcaa24c5e Project moved. 2017-10-17 18:55:55 +02:00
Giovanni Casinelli
550653300b Update abi-spec.rst 2017-10-16 19:48:04 +08:00
Alex Beregszaszi
dbc8655b36 Merge pull request #3083 from davidau/patch-1 
Update miscellaneous.rst
 2017-10-16 10:21:42 +01:00
David Au
4047ed23fc Update miscellaneous.rst 
Fix small typo
 2017-10-15 11:04:00 -04:00
walter-weinmann
afef6faeb6 grammar.txt: spelling error uixed. 2017-10-14 15:48:14 +02:00
Alex Beregszaszi
81f9f86ce5 Add reference to EIP-55 in address literals (#3062) 2017-10-10 17:54:29 +02:00
William Morriss
d05b24162f also rm biddingTime 2017-10-08 13:40:18 -07:00
William Morriss
c3ec0beba5 remove auctionStart 2017-10-08 13:24:27 -07:00
Alex Beregszaszi
09276cb9d3 Do not add members of address to contracts in experimental 0.5.0 2017-10-05 11:42:34 +01:00
chriseth
f6fb7d96d3 Merge pull request #2990 from ethereum/someMoreSMTStuff 
Basic SMT tests.
 2017-10-04 14:56:24 +02:00
Dave Hoover
6de9fc710e Minor edits 2017-10-04 07:35:05 -05:00
Ilya Drabenia
5cded77821 Add solhint to list of tools. 
Hello!

I develop linter that provide both security, style guide and best practices validations for Solidity users.

I will be glad if it will be useful for this community!
 2017-09-29 18:03:40 +03:00
chriseth
a1f3046647 Add SMT tests. 2017-09-29 12:44:39 +02:00
Zetherz
c6c3163c2a Fixed code example (#2955) 2017-09-28 13:21:02 +01:00
Martín Triay
ab4f97a80b Update contracts.rst 
Fixed web3 URL
 2017-09-27 13:59:26 -03:00
Alex Beregszaszi
a7592fa801 Document packed ABI 2017-09-26 22:48:49 +01:00
chriseth
a23f7f38b9 Merge pull request #2909 from bernardpeh/mydev 
faq typo
 2017-09-25 12:01:20 +02:00
chriseth
d45629d909 Update frequently-asked-questions.rst 2017-09-25 12:01:09 +02:00
bernard peh
5ffd119990 minor tuning to sentence to be more accurate 2017-09-25 19:29:10 +10:00
chriseth
3dc7c3807b Update bug list. 2017-09-21 15:26:30 +02:00
Lefteris Karapetsas
7f88d43937
docs: Specify gas fallback function from call 
Specify that also 21k gas is needed for fallback functions originating from
external function calls.
 2017-09-21 14:15:13 +02:00
Matthieu Caneill
7b7cf8faea fix typo: missing word in documentation 2017-09-21 01:14:38 +02:00
Alex Beregszaszi
a061e8db34 Clarify shorthand notation in ABI 2017-09-19 11:02:14 +01:00
chriseth
32965807a7 Fix ABI spec regarding arrays. 2017-09-19 11:01:41 +01:00
bernard peh
5234408ff5 possible typo fix 2017-09-16 23:13:50 +10:00
Alex Beregszaszi
923373b41e Clarify ABI & Solidity types 2017-09-16 12:31:12 +01:00
chriseth
c5063d3155 Use "tuple" for struct types in ABI JSON. 
Only use tuple as a type in the ABI (and remove all "anonymous struct" references too)
 2017-09-16 12:31:12 +01:00
chriseth
e4bb767dcd Document structs in ABI 2017-09-16 12:12:44 +01:00
Alex Beregszaszi
e1f90f0ad6 Fix nested lists in the ABI documentation 2017-09-13 17:39:48 +01:00
Alex Beregszaszi
5c9dbd5083 Merge pull request #2473 from ethereum/functiontype-sig 
Add .selector member on function types
 2017-09-13 17:35:48 +01:00
Alex Beregszaszi
c70ebfd241 Document function selectors 2017-09-13 11:40:57 +01:00
Alex Beregszaszi
135c55c4d0 Overhaul contract creation section in the documentation (add reference to remix and web3.js) 2017-09-13 09:53:56 +01:00
chriseth
aaf73071db Merge pull request #2880 from ethereum/docs-metadata 
Promote metadata to its own chapter (split from miscellaneous)
 2017-09-12 13:27:42 +02:00
chriseth
fabf4accd3 Merge pull request #2870 from aarongoa/develop 
Add payable constructor for `C` - #2869
 2017-09-12 11:32:46 +02:00
Aaron Colaço
2b88eeb370 Make createAndEndowD payable in contract creation example 2017-09-12 10:07:54 +01:00
Alex Beregszaszi
b1a7281ee9 Promote metadata to its own chapter (split from miscellaneous) 2017-09-11 15:05:46 +01:00
Alex Beregszaszi
fb1db58def Merge pull request #2842 from ethereum/chriseth-patch-1 
Explain how to run the tests in more detail.
 2017-09-05 22:33:50 +01:00
chriseth
818a371929 Explain how to run the tests in more detail. 2017-09-05 22:02:43 +01:00
Alex Beregszaszi
bdafce3e4f Convert ABI spec from Markdwon to RST 2017-09-05 14:50:27 +01:00
chriseth
152a0e69c4 Merge pull request #2871 from ethereum/fixedpointdocs 
Explain fixed point types in docs
 2017-09-04 19:04:12 +02:00
Alex Beregszaszi
435eeec5e1 Explain the difference between floating and fixed point 2017-09-04 15:57:05 +01:00
Alex Beregszaszi
76bd8c5769 Explain fixed point types 2017-09-04 15:57:05 +01:00
Alex Beregszaszi
c975bf87db Move fixed after int in docs 2017-09-04 15:19:39 +01:00
Alex Beregszaszi
ac5fd64c23 Mention that different Unicode codepoint can look the same 2017-09-01 19:18:46 +01:00
Alex Beregszaszi
88bce877c4 Clarify some subtleties of the fallback function 2017-09-01 19:16:52 +01:00
Alex Beregszaszi
cbd729957b Document character set 2017-09-01 19:13:26 +01:00
Alex Beregszaszi
f3230a41ce Document caveats about timestamp and blockhash 2017-09-01 19:13:26 +01:00
Alex Beregszaszi
8e1aae2e1a Document gas/value modifiers with overloading 2017-09-01 19:09:36 +01:00
Alex Beregszaszi
f787ecae5a Document byte[] vs bytes 2017-09-01 19:09:36 +01:00
Alex Beregszaszi
8743b2cead Document call/gas modifiers properly 2017-09-01 19:09:07 +01:00
Alex Beregszaszi
b3c251c154 Merge pull request #2831 from ethereum/docs 
Various doc updates
 2017-08-28 12:47:44 +01:00
Alex Beregszaszi
550d646b97 Explain safe purchase (even number) 2017-08-28 12:14:41 +01:00
Alex Beregszaszi
5a5d21d0c8 Add note about throw being deprecated 2017-08-28 12:04:56 +01:00
Alex Beregszaszi
2b26d6b9d7 Require 0.4.12 for the VectorSum example (for loop) 2017-08-28 11:59:36 +01:00
Alex Beregszaszi
e649ce71bd Refer to internal ABI documentation 2017-08-28 11:59:35 +01:00
Alex Beregszaszi
412cc6bc58 Highlight opcodes in docs 2017-08-28 11:59:35 +01:00
Alex Beregszaszi
dd2cc899bb Fix lists and links 2017-08-28 11:59:35 +01:00
Robert Edström
5e73ea7fbc Correct package name for installing solc on Arch 2017-08-27 14:36:41 +03:00
Alex Beregszaszi
2af949baaa Explain the limitations of view and pure 2017-08-25 12:49:53 +01:00
Alex Beregszaszi
f791ca3957 Clarify ABI regarding constant 2017-08-25 12:37:23 +01:00
Alex Beregszaszi
bb493bf52d Require 0.4.16 for view/pure in docs examples 2017-08-25 12:37:23 +01:00
chriseth
0878eaad46 Prepare 0.4.16 release. 2017-08-24 18:31:37 +02:00
chriseth
71294b2872 Merge pull request #2798 from ethereum/statemutability 
Rename statemutability to stateMutability in ABI/AST
 2017-08-24 18:27:08 +02:00
Chim Kan
efe9d55ab2 Update on the example for BlindAction 
In the Mist app, the Blind Action contract cannot compile because it cannot accept implicit conversion of integer to byte32. I just added the conversion method byte32 in line 470 for bid.blindedBid.
 2017-08-24 12:03:27 -04:00
Alex Beregszaszi
deeac7e2e0 Rename statemutability to stateMutability in ABI/AST 2017-08-24 15:23:00 +01:00
Alex Beregszaszi
23c791e4df Add pure to grammar 2017-08-24 13:46:18 +01:00
Alex Beregszaszi
504e6285f3 Add pure to ABI spec 2017-08-24 13:46:18 +01:00
Alex Beregszaszi
93e6e83093 Document pure functions 2017-08-24 13:46:18 +01:00
Nick Savers
f67f798887 Fix link to Russian version on wiki 2017-08-24 12:15:26 +02:00
Chim Kan
b5d2a4ecd7 Adding storage into the pointer for Voter delegate 
Hi,

The example from https://github.com/ethereum/solidity/blob/develop/docs/solidity-by-example.rst is not working. 

It keeps giving this error in the Mist program:

     Could not compile source code. 

     Variable is declared as a storage pointer. Use an explicit "storage" keyword to silence this warning.
            Voter delegate = voters[to];
            ^------------^

The solution is just to add the keyword "storage" and then the example works again.
 2017-08-23 20:25:12 -04:00
Alex Beregszaszi
3b07c4d38e Merge pull request #2757 from ethereum/cmake 
Static linking
 2017-08-23 12:36:24 +01:00
Paweł Bylica
09628dee8c
docs: Add a note about CMake options 2017-08-22 22:50:25 +02:00
Alex Beregszaszi
b1cdf81506 Document view functions 2017-08-22 18:25:46 +01:00
Alex Beregszaszi
9e8d2a561f Update grammar with view 2017-08-22 18:24:22 +01:00
Alex Beregszaszi
efe4d68a7b Introduce view (and keep constant as an alias) 2017-08-22 18:24:22 +01:00
Alex Beregszaszi
8025ac180f Add missing keywords to documentation lexer 2017-08-16 21:24:20 +01:00
Alex Beregszaszi
d5f01460f9 Allow constant modifier on state variables in grammar 2017-08-16 21:22:59 +01:00
Alex Beregszaszi
47b6aa1f5b Update grammar to reflect state mutability 2017-08-16 21:19:09 +01:00
Alex Beregszaszi
247ed0de30 Merge pull request #2654 from ethereum/docs-fixed 
Update grammar/docs for current fixed point types
 2017-08-16 19:51:37 +01:00
Alex Beregszaszi
09ef3d8e72 Add proper warning for fixed point types 2017-08-16 16:47:49 +01:00
Alex Beregszaszi
4acc552e66 Fix the grammar for fixed point types 2017-08-16 16:47:49 +01:00
Alex Beregszaszi
80ee7c2b36 Fix ABI for fixed types 2017-08-16 16:47:11 +01:00
chriseth
2021508653 Update contracts.rst 2017-08-16 11:31:50 +02:00
Isaac Ibiapina
2dc9e53a49 Specify address as string on events documentation 2017-08-15 14:57:10 -04:00
chriseth
80f83169b1 Merge pull request #2659 from jamesray1/patch-25 
Link: members-of-addresses in docs/types.rst
 2017-08-15 17:46:21 +02:00
chriseth
2fa59489b6 Merge pull request #2664 from joshuahannan/develop 
added while loop description
 2017-08-15 17:45:44 +02:00
chriseth
8ee973f316 Merge pull request #2660 from jamesray1/patch-26 
Constructor index in docs/contracts.rst
 2017-08-15 17:43:29 +02:00
chriseth
29cf3d9c58 Merge pull request #2732 from ethereum/statemutability-abi 
Add statemutability field to ABI
 2017-08-15 17:39:20 +02:00
Alex Beregszaszi
12f3257e7d Add statemutability field to the ABI 2017-08-15 11:35:50 +01:00
feliam
ed77f706a0 Update installing-solidity.rst 2017-08-14 16:47:16 -03:00
Stu West
fdeb94a105 docs typo: remove duplicate period and unnecessary spaces in intro 2017-08-12 15:43:41 -07:00
chriseth
5b26e2bcee Merge pull request #2486 from jamesray1/patch-22 
Ref to getter function in docs/miscellaneous.rst
 2017-08-11 18:26:46 +02:00
chriseth
a0f9e8e778 Merge pull request #2485 from jamesray1/patch-21 
Update frequently-asked-questions.rst with a ref to getter functions
 2017-08-11 18:26:14 +02:00
chriseth
0fab0ed427 Merge pull request #2487 from jamesray1/patch-23 
Ref to getter function in docs/introduction-to-smart-contracts.rst
 2017-08-11 18:25:23 +02:00
Alex Beregszaszi
ecec557d2b Merge pull request #2634 from ethereum/chriseth-patch-1 
Clarify internal function types
 2017-08-11 16:59:22 +01:00
Alex Beregszaszi
9358001ba4 Use temporary variable for sum example 2017-08-10 17:47:35 +01:00
Alex Beregszaszi
34503d98d7 Move init/cond into the for loop 2017-08-10 17:30:57 +01:00
Alex Beregszaszi
a323486a9b Add pure assembly example for summing 2017-08-10 17:30:57 +01:00
vladislav-ankudinov
79137e4703 fix typo 'onte' -> 'onto' 2017-08-09 14:46:51 +03:00
chriseth
3aef36b1cf Update changelog. 2017-08-08 15:56:52 +02:00
SaadSurya
8a9f62842d Update installing-solidity.rst 2017-08-07 16:53:56 +05:00
chriseth
dc0f85c4fb Merge pull request #2685 from elopio/patch-1 
Add the command to install the stable solc snap
 2017-08-04 14:51:31 +02:00
Adrián Calvo
8d832c7cd3 Removes reference to stack depth attack 
Changed the old stack depth attack reference to a generic execution of an untrusted contract to keep the suggestion of the withdrawal pattern.
 2017-08-04 14:08:37 +02:00
Leo Arias
f5fc808875 Add the tag for the command 2017-08-02 01:53:07 -06:00
Leo Arias
af128b6c97 Add the command to install the stable solc snap 
Now that v0.4.14 was released, all the changes in the snapcraft.yaml landed, the continuous delivery is configured both for edge and candidate snaps, and we have been testing the snap for a while, I have pushed it to the stable channel in the Ubuntu store.
 2017-08-02 01:51:43 -06:00
Alex Beregszaszi
d1b13c0624 Add warning that low-level call/callcode/delegatecall don't check for existence 2017-08-01 20:51:52 +01:00
Alex Beregszaszi
a46552540e Add bug.json entry for delegatecall 2017-08-01 20:51:45 +01:00
James Ray
0da46f259f :ref:getter function<getter-functions> 2017-07-31 20:35:29 +10:00
James Ray
5678a08d58 :ref:getter function<getter-functions> 2017-07-31 20:32:34 +10:00
James Ray
8a19b2f24e :ref:getter function<getter-functions> 2017-07-31 20:26:26 +10:00
chriseth
91e7fcaa59 Release date for version 0.4.14. 2017-07-31 12:05:59 +02:00
chriseth
a73fb4d529 Wording. 2017-07-31 11:44:35 +02:00
chriseth
223261893a Merge pull request #2658 from jamesray1/patch-8 
Updated link for getter-functions for consistency in docs/contracts.rst
 2017-07-31 11:41:23 +02:00
Joshua Hannan
5f9c02c6b6 added while loop description 2017-07-29 18:15:54 -05:00
James Ray
0c63f271a2 Updated getter-functions ref 2017-07-29 12:05:49 +10:00
chriseth
2cdb5c9e83 Changelog and bug list entry. 2017-07-28 15:33:00 +02:00
James Ray
064918c94a Constructor is not a solidity keyword 
Removed backticks
 2017-07-28 15:31:03 +10:00
James Ray
c5b82f7d50 Constructor index 
For referencing, especially when it hasn't been mentioned but not discussed in detail previously e.g. here and here.
 2017-07-28 15:24:19 +10:00
James Ray
84e71f061c Link: members-of-addresses 2017-07-28 15:07:18 +10:00
James Ray
3c3060dd87 :ref:getter-functions 2017-07-28 11:54:59 +10:00
James Ray
c03a85aa7b ref getter-functions 2017-07-28 11:50:20 +10:00
James Ray
89551d9968 Updated reference to getter-functions 2017-07-28 11:34:22 +10:00
James Ray
bc8d7d4a5d Updated link for getter-functions 2017-07-28 11:30:53 +10:00
chriseth
f18b26cf14 Merge pull request #2640 from elopio/patch-2 
Add the install instructions from the edge snap
 2017-07-27 12:32:58 +02:00
chriseth
5cbf5f216f Merge pull request #2629 from hcaw/patch-1 
Link to Ethereum Studio removed - project has been discontinued
 2017-07-27 12:30:01 +02:00
chriseth
07e0a7e090 Merge pull request #2649 from nathanph/patch-1 
Fix typo in contracts.rst
 2017-07-27 11:48:38 +02:00
Yoichi Hirai
a20e5fc048 Merge pull request #2636 from ethereum/docs-random 
Random documentation fixes
 2017-07-27 11:30:12 +02:00
chriseth
31449c9834 Closing parenthesis 2017-07-27 11:03:06 +02:00
Nathan Hernandez
99b6411853 Fix typo in contracts.rst 
Changed `internall` to `internally`.
 2017-07-27 01:46:53 -04:00
Skiral Inc
7f7927fd1d fix misspell 2017-07-26 16:17:43 -07:00
Alex Beregszaszi
318e52c77d Avoid using .send in the examples 2017-07-26 23:05:09 +01:00
Alex Beregszaszi
48a15ea19d Use the storage keyword in examples 2017-07-26 23:05:09 +01:00
Alex Beregszaszi
6eaf17db38 Avoid using var if not required 2017-07-26 23:05:09 +01:00
Alex Beregszaszi
bf10cd6c95 Mention all global aliases 2017-07-26 23:05:09 +01:00
Alex Beregszaszi
04582dd2cb Mention that callcode is deprecated 2017-07-26 23:05:09 +01:00
Alex Beregszaszi
15689506c5 Remove interface keyword from reserved list 2017-07-26 23:05:09 +01:00
Alex Beregszaszi
106763d08e Remove reference to Why3 2017-07-26 23:05:09 +01:00
Leo Arias
558fa46442 Add the install instructions from the edge snap 2017-07-26 10:28:27 -06:00
Yoichi Hirai
927f01c6d9
Fix grammar 2017-07-26 17:02:06 +02:00
Yoichi Hirai
092c2815e5 Merge pull request #2631 from maurelian/maurelian_patch1 
Clarify require and assert usage
 2017-07-26 16:45:37 +02:00
chriseth
887823dca6 Merge pull request #2627 from atfornes/patch-2 
Change Mapping example to valid (executable) code
 2017-07-26 14:45:00 +02:00
chriseth
f74e40598f Clarify internal function types 
Fixes https://github.com/ethereum/solidity/issues/2617
 2017-07-26 14:30:32 +02:00
maurelian
9c676e796c Clarify require and assert usage 2017-07-25 20:02:27 -04:00
Harry Wright
d34e2690c9 Moved Ethereum Studio to Discontinued section as suggested 2017-07-25 16:56:18 +01:00
Harry Wright
a23c4cae9b Link to Ethereum Studio removed - project has been discontinued 
see https://www.reddit.com/r/ethereum/comments/6c23ua/is_hack_ethercamp_dead/dhrf0aa/
 2017-07-25 15:54:43 +01:00
chriseth
3c2b710b5e Merge pull request #2484 from jamesray1/patch-8 
Added links for the getter function.
 2017-07-25 15:51:09 +02:00
Antonio Tenorio-Fornés
db739dff69 Change Mapping example to valid (executable) code 
Current example will not compile and would need to be compiled in separate files, unlike how it is shown (see https://github.com/ethereum/solidity/pull/2618).

The proposed changes provide both a source code that compiles and a easier to understand Contract creation (using new instead of a contract address).
 2017-07-24 18:30:54 +02:00
NIC619
3dcbe68aea minor fix on assembly example 2017-07-21 00:25:36 -04:00
Alex Beregszaszi
cffe52d6d9 Enable more examples in the documentation for testing 2017-07-19 00:05:05 +01:00
Juraj Bednar
5e0f5ee627 Keep the terminology about the exceptions the same 
Don't call exception revert-style when the rest of the document uses require-style
 2017-07-18 14:25:17 +02:00
Luke Schoen
56b65cf846 Update solidity-by-example.rst. Fixes accepted bids 
Only accept bid values higher than highest bid. Since returns early from `placeBid` function if `value <= highestBid`
 2017-07-17 19:58:41 +10:00
Alex Beregszaszi
41e5b2c3c2 Fix bugs in example contracts 2017-07-13 21:47:29 +02:00
Alex Beregszaszi
b2fcd59ee6 Add version pragma to docs examples 2017-07-13 17:10:37 +02:00
Alex Beregszaszi
b65601bb3d Add changelog and documentation 2017-07-13 15:18:40 +02:00
chriseth
91f17a3662 Merge pull request #2560 from ethereum/abi-spec-nitpick 
Nitpicking abi-spec.rst
 2017-07-12 15:16:23 +02:00
Yoichi Hirai
6307a12651
Borrow a sentence from @axic 
and edit the phrase "following its type", which sounded like the data follows the type in the call data.
 2017-07-12 14:37:12 +02:00
Yoichi Hirai
d5c3ef4605
Nitpicking abi-spec.rst 2017-07-12 13:27:47 +02:00
chriseth
b981ef2055 Merge pull request #1477 from ethereum/doc-remove-fixed 
[WIP] docs: ``var x = 1/4`` is not working, so remove description about it
 2017-07-12 12:11:13 +02:00
hh3755
d01b02f8cf typo of bitween for between 2017-07-08 17:23:48 +08:00