Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add strict encoding mode to the ABI spec | Alex Beregszaszi | 2018-07-06 | 1 | -0/+11 |
| | |||||
* | Merge pull request #4418 from ethereum/initialConstants | chriseth | 2018-07-05 | 4 | -15/+7 |
|\ | | | | | Only allow compile-time constants for constant state variables. | ||||
| * | Only allow compile-time constants for constant state variables. | chriseth | 2018-07-04 | 4 | -15/+7 |
| | | |||||
* | | Merge pull request #4424 from ethereum/fixBytesAlloc | chriseth | 2018-07-05 | 3 | -3/+5 |
|\ \ | | | | | | | Fix allocation of byte arrays. | ||||
| * | | Fix allocation of byte arrays. | chriseth | 2018-07-05 | 3 | -3/+5 |
| | | | |||||
* | | | Merge pull request #4435 from ethereum/pullBeforePush | chriseth | 2018-07-05 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | Pull before pushing to bytecode (as on *ix). | ||||
| * | | Pull before pushing to bytecode (as on *ix). | chriseth | 2018-07-05 | 1 | -0/+1 |
|/ / | |||||
* | | Merge pull request #4387 from ethereum/endToEndDefaultVisbility | chriseth | 2018-07-05 | 13 | -895/+895 |
|\ \ | | | | | | | Specify default visibility in unit tests | ||||
| * | | Fixes compilation errors. | Erik Kundt | 2018-07-04 | 1 | -3/+3 |
| | | | |||||
| * | | Fixes defects in end-to-end tests. | Erik Kundt | 2018-07-04 | 1 | -7/+7 |
| | | | |||||
| * | | Fixes assembly test. | Erik Kundt | 2018-07-04 | 1 | -7/+7 |
| | | | |||||
| * | | Updates unit test to specify visibility. | Erik Kundt | 2018-07-04 | 12 | -104/+104 |
| | | | |||||
| * | | Updates end-to-end tests to specify default visibility. | Erik Kundt | 2018-07-04 | 1 | -787/+787 |
|/ / | |||||
* | | Merge pull request #4380 from elopio/patch-3 | chriseth | 2018-07-04 | 1 | -42/+42 |
|\ \ | | | | | | | Update examples to use constructor keyword | ||||
| * | | update the style guide | Leo Arias | 2018-07-04 | 1 | -42/+42 |
| |/ | |||||
* | | Merge pull request #4409 from ethereum/viewPureChecker | chriseth | 2018-07-04 | 24 | -43/+183 |
|\ \ | | | | | | | Enforce state mutability in view pure checker. | ||||
| * | | Extend view pure test suite. | Daniel Kirchner | 2018-07-04 | 17 | -3/+162 |
| | | | |||||
| * | | Update documentation and Changelog. | Daniel Kirchner | 2018-07-04 | 3 | -6/+7 |
| | | | |||||
| * | | Adjust tests wrt strict view pure checker. | Daniel Kirchner | 2018-07-04 | 2 | -8/+1 |
| | | | |||||
| * | | Remove v050 check for enforcing "view" in ViewPureChecker. | Daniel Kirchner | 2018-07-04 | 2 | -26/+13 |
| |/ | |||||
* | | Merge pull request #4423 from ethereum/enforce_error_gasleft | chriseth | 2018-07-04 | 9 | -68/+20 |
|\ \ | |/ |/| | [BREAKING] Enforce error on msg.gas and block.blockhash() | ||||
| * | Enforcing error on msg.gas and block.blockhash() | Leonardo Alt | 2018-07-04 | 9 | -68/+20 |
|/ | |||||
* | Merge pull request #4379 from ethereum/constructorArgsTwice | chriseth | 2018-07-04 | 10 | -44/+20 |
|\ | | | | | Disallow constructor arguments given multiple times. | ||||
| * | Fix tests. | chriseth | 2018-06-29 | 1 | -22/+6 |
| | | |||||
| * | Disallow constructor arguments given multiple times. | chriseth | 2018-06-29 | 9 | -22/+14 |
| | | |||||
* | | Merge pull request #4367 from shad-k/fix/issue-4238 | chriseth | 2018-07-04 | 3 | -23/+17 |
|\ \ | | | | | | | Add custom.css for docs to change pre tag styles | ||||
| * | | Add custom.css for docs to change pre tag styles | Shadab Khan | 2018-07-04 | 3 | -23/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify white space for table cells Add custom.css for docs to change pre tag styles Specify white space for table cells Rearrange code Delete theme_overrides.css Remove extra code | ||||
* | | | Merge pull request #4407 from ajsantander/exit-if-no-eth | chriseth | 2018-07-04 | 1 | -0/+9 |
|\ \ \ | | | | | | | | | Avoid hanging in tests.sh when IPC program is not found | ||||
| * | | | Avoid hanging in tests.sh when IPC program is not found | ajs | 2018-07-03 | 1 | -0/+9 |
| |/ / | |||||
* | | | Merge pull request #4413 from ethereum/dropConstantKeywordOnly | chriseth | 2018-07-04 | 12 | -83/+26 |
|\ \ \ | | | | | | | | | Drop constant keyword only | ||||
| * | | | Update Changelog. | Daniel Kirchner | 2018-07-03 | 1 | -0/+1 |
| | | | | |||||
| * | | | Update test suite. | Daniel Kirchner | 2018-07-03 | 6 | -77/+13 |
| | | | | |||||
| * | | | Update documentation. | Daniel Kirchner | 2018-07-03 | 4 | -4/+3 |
| | | | | |||||
| * | | | Remove constant keyword from parser. | Daniel Kirchner | 2018-07-03 | 1 | -2/+9 |
| | | | | |||||
* | | | | Merge pull request #4389 from ethereum/soltestfix | chriseth | 2018-07-03 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | fix default difficulty to comply with YP rules | ||||
| * | | | fix default difficulty to comply with YP rules | Dimitry | 2018-06-30 | 1 | -2/+2 |
| | |/ | |/| | | | | | | | fix soltest to work with the recent aleth --test | ||||
* | | | Merge pull request #4274 from ethereum/v050-var-keyword-removal-v2 | Christian Parpart | 2018-07-03 | 8 | -50/+14 |
|\ \ \ | |_|/ |/| | | [BREAKING] var keyword removal | ||||
| * | | Changelog: added ``var``-keyword change | Christian Parpart | 2018-07-03 | 1 | -0/+1 |
| | | | |||||
| * | | grammar: removes the var-keyword from the grammar | Christian Parpart | 2018-07-03 | 1 | -3/+2 |
| | | | |||||
| * | | documentation: adjustments to not use the "var" keyword | Christian Parpart | 2018-07-03 | 5 | -41/+10 |
| | | | |||||
| * | | libsolidity: turns the var-keyword use from deprecation-warning to an error ↵ | Christian Parpart | 2018-07-03 | 1 | -6/+1 |
|/ / | | | | | | | and include explicit type suggestion | ||||
* | | Merge pull request #4397 from ethereum/dropConstantKeywordTests | chriseth | 2018-07-03 | 49 | -190/+194 |
|\ \ | | | | | | | Test updates for dropping the constant keyword. | ||||
| * | | Update compilation tests. | Daniel Kirchner | 2018-07-03 | 46 | -166/+170 |
| | | | |||||
| * | | Update test contracts. | Daniel Kirchner | 2018-07-03 | 3 | -24/+24 |
|/ / | |||||
* | | Merge pull request #4402 from ethereum/docsConstructor | chriseth | 2018-07-03 | 7 | -40/+24 |
|\ \ | | | | | | | Update docs to new constructor syntax | ||||
| * | | Fixes semantic versioning. | Erik Kundt | 2018-07-02 | 1 | -1/+1 |
| | | | |||||
| * | | Adds review suggestions. | Erik Kundt | 2018-07-02 | 7 | -10/+10 |
| | | | |||||
| * | | Updates docs to new constructor syntax. | Erik Kundt | 2018-07-02 | 7 | -39/+23 |
| | | | |||||
* | | | Merge pull request #4374 from ↵ | chriseth | 2018-07-03 | 7 | -84/+75 |
|\ \ \ | | | | | | | | | | | | | | | | | ethereum/v050-var-keyword-removal-preps-end2end-tests V050 var keyword removal preparations (End-to-End tests) | ||||
| * | | | test: ensure compiled tests do not use var-keyword in preparation of ↵ | Christian Parpart | 2018-07-02 | 7 | -84/+75 |
| | |/ | |/| | | | | | | | var-keyword removal | ||||
* | | | Merge pull request #4305 from ethereum/transactionReceipts | chriseth | 2018-07-02 | 13 | -1/+57 |
|\ \ \ | |_|/ |/| | | Determine transaction status in RPC sessions. | ||||
| * | | Determine transaction status in RPC sessions. | Daniel Kirchner | 2018-07-02 | 13 | -1/+57 |
| | | | |||||
* | | | Merge pull request #4400 from ethereum/warningWhitespace | Erik Kundt | 2018-07-02 | 4 | -5/+5 |
|\ \ \ | | | | | | | | | Remove trailing whitespace in missing visibility warning. | ||||
| * | | | Remove trailing whitespace in missing visibility warning. | Daniel Kirchner | 2018-07-02 | 4 | -5/+5 |
|/ / / | |||||
* | | | Merge pull request #4386 from ethereum/testingDefaultVisibility | chriseth | 2018-07-02 | 43 | -189/+136 |
|\ \ \ | | | | | | | | | Specify default visibility in syntax tests | ||||
| * | | | Adds review suggestions. | Erik Kundt | 2018-07-02 | 2 | -2/+7 |
| | | | | |||||
| * | | | Updates syntax tests to specify default visibility. | Erik Kundt | 2018-06-29 | 45 | -196/+138 |
| | |/ | |/| | |||||
* | | | Merge pull request #4398 from rnaby/libevmasm/KnownState-125 | chriseth | 2018-07-02 | 1 | -8/+13 |
|\ \ \ | | | | | | | | | As SWITCH..CASE is better than ELSE..IF | ||||
| * | | | As SWITCH..CASE is better than ELSE..IF | Khan M Rashedun-Naby | 2018-07-02 | 1 | -8/+13 |
| |/ / | |||||
* | | | Merge pull request #4224 from ethereum/revert_wrong_calldata | chriseth | 2018-07-02 | 5 | -58/+39 |
|\ \ \ | |_|/ |/| | | [BREAKING] Revert if calldata has wrong size | ||||
| * | | Revert if calldata is too short or points out of bounds | Leonardo Alt | 2018-06-26 | 5 | -58/+39 |
| | | | |||||
* | | | Merge pull request #4324 from ethereum/update-aleth | chriseth | 2018-07-02 | 1 | -6/+6 |
|\ \ \ | |_|/ |/| | | Update aleth for testing | ||||
| * | | Update aleth for testing | Alex Beregszaszi | 2018-07-02 | 1 | -6/+6 |
|/ / | |||||
* | | Merge pull request #4354 from ethereum/constructorSyntaxTests | chriseth | 2018-06-29 | 29 | -160/+154 |
|\ \ | | | | | | | Updates tests to new constructor syntax | ||||
| * | | Updates invalid syntax test. | Erik Kundt | 2018-06-29 | 1 | -1/+2 |
| | | | |||||
| * | | Updates syntax tests to new constructor syntax. | Erik Kundt | 2018-06-29 | 20 | -50/+43 |
| | | | |||||
| * | | Updates compiled unit tests to new constructor syntax. | Erik Kundt | 2018-06-29 | 9 | -110/+110 |
| | | | |||||
* | | | Merge pull request #4385 from ethereum/circle2.0 | chriseth | 2018-06-29 | 1 | -0/+0 |
|\ \ \ | | | | | | | | | Update to CircleCI 2.0 | ||||
| * | | | Moves Circle config to conform version 2.0. | Erik Kundt | 2018-06-29 | 1 | -0/+0 |
| |/ / | |||||
* | | | Merge pull request #4352 from D-Nice/develop | chriseth | 2018-06-29 | 3 | -1/+23 |
|\ \ \ | | | | | | | | | Fixes storage ref var typo error from 'prefix' to 'suffix' | ||||
| * | | | Add passing test case | D-Nice | 2018-06-29 | 2 | -2/+13 |
| | | | | |||||
| * | | | Adds storage_reference.sol syntax test | D-Nice | 2018-06-28 | 1 | -0/+11 |
| | | | | |||||
| * | | | Fixes storage ref var typo error from 'prefix' to 'suffix' | D-Nice | 2018-06-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | Clarify scope of 'using A for B' (#4252) | Mike | 2018-06-29 | 1 | -11/+12 |
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * Issue 1213: Clarify scope of 'using A for B' * Typo fix. * Further restructuring and clarification of contracts doc. * Revert closer to original wording and formatting. | ||||
* | | | Merge pull request #4375 from ethereum/fallbackExternalBackwardsCompatible | chriseth | 2018-06-29 | 43 | -105/+123 |
|\ \ \ | | | | | | | | | Fallback function has to be external: backwards-compatible changes. | ||||
| * | | | Fallback function has to be external: backwards-compatible changes. | chriseth | 2018-06-29 | 43 | -105/+123 |
| | | | | |||||
* | | | | Merge pull request #4368 from wpank/develop | chriseth | 2018-06-29 | 2 | -1/+23 |
|\ \ \ \ | | | | | | | | | | | Added static CSS to Sphinx in order to fix bug with RTD theme table wrapping | ||||
| * | | | | Added static CSS to Sphinx in order to fix bug with RTD theme table wrapping | wpank | 2018-06-28 | 2 | -1/+23 |
| | | | | | |||||
* | | | | | Merge pull request #4377 from ajsantander/manjaro-linux | chriseth | 2018-06-29 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Support Manjaro Linux distributions in dependencies script | ||||
| * | | | | Support Manjaro Linux distributions in dependencies script | ajs | 2018-06-29 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #4365 from ethereum/type-identifier-test | Alex Beregszaszi | 2018-06-28 | 1 | -2/+18 |
|\ \ \ \ | |/ / / |/| | | | Some more type identifier tests | ||||
| * | | | Add more FixedPoint type tests | Alex Beregszaszi | 2018-06-28 | 1 | -1/+16 |
| | | | | |||||
| * | | | Add one more type identifier escaping test | Alex Beregszaszi | 2018-06-28 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #4097 from ethereum/noPackedExceptForPacked | chriseth | 2018-06-28 | 53 | -351/+357 |
|\ \ \ \ | |/ / / |/| | | | [BREAKING] call only takes a single argument and does not pad | ||||
| * | | | Also mention regular abi.encode in error message. | chriseth | 2018-06-27 | 5 | -14/+20 |
| | | | | |||||
| * | | | Update tests and add new tests. | chriseth | 2018-06-25 | 7 | -3/+71 |
| | | | | |||||
| * | | | Fix: Call functions do not take variable arguments. | chriseth | 2018-06-25 | 1 | -3/+3 |
| | | | | |||||
| * | | | Provide better suggestions in error messages with respect to call and hash ↵ | chriseth | 2018-06-25 | 1 | -4/+34 |
| | | | | | | | | | | | | | | | | functions. | ||||
| * | | | Update compilation tests. | chriseth | 2018-06-25 | 8 | -21/+21 |
| | | | | |||||
| * | | | Documentation. | chriseth | 2018-06-25 | 7 | -64/+57 |
| | | | | |||||
| * | | | Changelog entry. | chriseth | 2018-06-25 | 1 | -0/+6 |
| | | | | |||||
| * | | | Save double encode call for sha3. | chriseth | 2018-06-25 | 1 | -8/+16 |
| | | | | |||||
| * | | | Adjust tests. | chriseth | 2018-06-25 | 26 | -173/+103 |
| | | | | |||||
| * | | | Bare functions take single bytes argument. | chriseth | 2018-06-25 | 5 | -94/+44 |
| | | | | |||||
| * | | | Single bytes argument. | chriseth | 2018-06-25 | 2 | -13/+32 |
| | | | | | | | | | | | | | | | | | | | | In 0.5.0 mode, only accept a single bytes argument for ``.call``, ``keccak256`` and others and do not pad when encoding. | ||||
| * | | | Forwarding length check. | chriseth | 2018-06-25 | 1 | -8/+4 |
| | | | | |||||
* | | | | Merge pull request #4360 from mattaereal/doc_patches-1 | Alex Beregszaszi | 2018-06-27 | 1 | -1/+43 |
|\ \ \ \ | | | | | | | | | | | Docs: Adding AFL's alternative configuration with clang. | ||||
| * | | | | Adding AFL's alternative configuration with clang. | Matías Aereal Aeón | 2018-06-27 | 1 | -1/+43 |
| | | | | | |||||
* | | | | | Merge pull request #4269 from ethereum/require-emit | chriseth | 2018-06-27 | 56 | -278/+185 |
|\ \ \ \ \ | | | | | | | | | | | | | [BREAKING] Remove non-0.5.0 warning for emit keyword (make it mandatory) | ||||
| * | | | | | Add emit keyword to tests. | chriseth | 2018-06-27 | 5 | -111/+36 |
| | | | | | | |||||
| * | | | | | Add emit keyword to documentation. | chriseth | 2018-06-27 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add emit keyword to compilation tests. | chriseth | 2018-06-27 | 43 | -120/+120 |
| | | | | | | |||||
| * | | | | | Add some more emits. | chriseth | 2018-06-27 | 3 | -22/+22 |
| | | | | | | |||||
| * | | | | | Remove non-0.5.0 warning for emit keyword (make it mandatory) | Alex Beregszaszi | 2018-06-27 | 7 | -25/+7 |
|/ / / / / | |||||
* | | | | | Merge pull request #4342 from rnaby/l/a/Types | chriseth | 2018-06-26 | 1 | -15/+19 |
|\ \ \ \ \ | | | | | | | | | | | | | RationalNumberType::isImplicitlyConvertibleTo Refactor | ||||
| * | | | | | RationalNumberType::isImplicitlyConvertibleTo Refactor | Khan M Rashedun-Naby | 2018-06-24 | 1 | -15/+19 |
| | | | | | | |||||
* | | | | | | Merge pull request #4332 from ethereum/dockerfile-small-improvements | chriseth | 2018-06-26 | 2 | -9/+36 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Dockerfile small improvements | ||||
| * | | | | | | adds .dockerignore file | Christian Parpart | 2018-06-26 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | make build concurrency build-time customizable | Christian Parpart | 2018-06-26 | 1 | -2/+18 |
| | | | | | | | |||||
| * | | | | | | Dockerfile: improves docker image size and small others | Christian Parpart | 2018-06-26 | 1 | -9/+14 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This greatly improves size of the final docker image with the help of multi-stage docker builds. With that change, we can also make the build stage readable/maintainable again by splitting up into multiple RUN statements as well as not needing to clean-up temporary objects. The dependencies have been put on top of the primary COPY statement in order to not rebuild the dependencies each time one wants to rebuild the docker image (for example due to code changes). The solc compilation itself is now parallelized to the CPU core count to speed up those builds that have more cores available on their docker build system. Future Notes: ------------- We could further improve the Dockerfile by explicitely adding the directories this docker build is interested in (such as solc source code exclusively). Or one may want to also use the build step for automated testing (CI) by enforcing soltest and cmdlineTests.sh right before finalizing the image. | ||||
* | | | | | | Merge pull request #4318 from ethereum/yul-internal | chriseth | 2018-06-26 | 18 | -41/+41 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Rename some internal constructs from Julia/Iulia to Yul | ||||
| * | | | | | | Rename IuliaException to YulException | Alex Beregszaszi | 2018-06-26 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Rename Julia to Yul in variables | Alex Beregszaszi | 2018-06-26 | 3 | -12/+12 |
| | | | | | | | |||||
| * | | | | | | Rename Julia to Yul in comments | Alex Beregszaszi | 2018-06-26 | 8 | -11/+11 |
| | | | | | | | |||||
| * | | | | | | Rename test suites from J/Iulia* to Yul* | Alex Beregszaszi | 2018-06-26 | 10 | -16/+16 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4353 from ethereum/compilerstack-api | chriseth | 2018-06-26 | 1 | -6/+30 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Document the internal API of CompilerStack | ||||
| * | | | | | | | Document the internal API of CompilerStack | Alex Beregszaszi | 2018-06-26 | 1 | -6/+30 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #4355 from ethereum/docs-alloc | chriseth | 2018-06-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Clarify that using msize without updating the free-memory-pointer is a bad idea | ||||
| * | | | | | | | Clarify that using msize without updating the free-memory-pointer is a bad idea | Alex Beregszaszi | 2018-06-26 | 1 | -0/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #4331 from ethereum/v050-var-keyword-preparations-soltests | chriseth | 2018-06-26 | 52 | -339/+119 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Adapt soltest suite to use explicit types over "var" keyword | ||||
| * | | | | | | test: Adapted to the change of the var-keyword elimination. | Christian Parpart | 2018-06-26 | 50 | -320/+119 |
| | | | | | | | |||||
| * | | | | | | test: drop obsoleted syntaxTest(s) | Christian Parpart | 2018-06-26 | 2 | -19/+0 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4350 from ethereum/constructorWorkaroundExternal | Alex Beregszaszi | 2018-06-26 | 39 | -41/+41 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | New constructor syntax for external compilation tests | ||||
| * | | | | | Updates external contracts to new constructor syntax. | Erik Kundt | 2018-06-26 | 39 | -41/+41 |
|/ / / / / | |||||
* | | | | | Merge pull request #4337 from ethereum/compilerstack-cleanup | Alex Beregszaszi | 2018-06-26 | 2 | -21/+31 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Pull out createCBORMetadata helper | ||||
| * | | | | Pull out createCBORMetadata helper | Alex Beregszaszi | 2018-06-26 | 2 | -21/+31 |
|/ / / / | |||||
* | | | | Merge pull request #3534 from meowingtwurtle/strictAddresses | Alex Beregszaszi | 2018-06-25 | 40 | -93/+115 |
|\ \ \ \ | |_|_|/ |/| | | | [BREAKING] Strict checking of address literals | ||||
| * | | | Keep the 'if it not used as an address' helper message for all cases of ↵ | Alex Beregszaszi | 2018-06-25 | 5 | -11/+16 |
| | | | | | | | | | | | | | | | | address related warnings | ||||
| * | | | Do not change SMT tests | Alex Beregszaszi | 2018-06-25 | 1 | -10/+10 |
| | | | | |||||
| * | | | Replace old Truffle artifacts in external Zeppelin/Gnosis tests | Alex Beregszaszi | 2018-06-25 | 1 | -0/+7 |
| | | | | |||||
| * | | | Update documentation for strict address literals | Alex Beregszaszi | 2018-06-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update external contracts in compilationTests (to support strict address ↵ | Alex Beregszaszi | 2018-06-25 | 22 | -54/+54 |
| | | | | | | | | | | | | | | | | literals) | ||||
| * | | | Update tests for strict address literals | Jason Cobb | 2018-06-25 | 14 | -25/+24 |
| | | | | |||||
| * | | | Better wording for invalid address literal error | Alex Beregszaszi | 2018-06-25 | 1 | -2/+4 |
| | | | | |||||
| * | | | Change invalid (not exactly 160 bits long) address literal to error | Jason Cobb | 2018-06-25 | 1 | -4/+11 |
| | | | | |||||
| * | | | Disallow implicit conversion from rational (literal) to address | Jason Cobb | 2018-06-25 | 1 | -2/+4 |
|/ / / | |||||
* | | | Merge pull request #4347 from ethereum/fix-end2endtest-against-latest-cpp-client | chriseth | 2018-06-25 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | Fixes soltest run against "recent" cpp-ethereum builds. | ||||
| * | | Fixes soltest against "recent" cpp-ethereum builds. | Christian Parpart | 2018-06-25 | 1 | -0/+2 |
|/ / | | | | | | | | | | | | | | | For me, it looks like the following Git commit has introduced this behaviour: https://github.com/ethereum/cpp-ethereum/commit/42b927d7aa103e21e34c8ba8c5469f532b49f966 This commit adds dummy values for `mixHash` and `nonce` (inspired by values were cpp-ethereum's own tests), and now, soltest runs fine again. | ||||
* | | Merge pull request #4335 from ethereum/disable-gnosis | Alex Beregszaszi | 2018-06-22 | 1 | -1/+3 |
|\ \ | | | | | | | Disable gnosis tests temporarily | ||||
| * | | Disable gnosis tests temporarily | Alex Beregszaszi | 2018-06-22 | 1 | -1/+3 |
|/ / | |||||
* | | Merge pull request #4328 from ethereum/disallow-years | Alex Beregszaszi | 2018-06-22 | 7 | -23/+9 |
|\ \ | | | | | | | [BREAKING] Disallow the years unit denomination properly | ||||
| * | | Disallow the years unit denomination properly | Alex Beregszaszi | 2018-06-22 | 7 | -23/+9 |
| | | | |||||
* | | | Merge pull request #4333 from ethereum/newkey | chriseth | 2018-06-22 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Use new PGP key and retire old ubuntu releases. | ||||
| * | | Use new PGP key and retire old ubuntu releases. | chriseth | 2018-06-22 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #4301 from rnaby/TypeChecker | chriseth | 2018-06-22 | 1 | -5/+3 |
|\ \ | | | | | | | Simplification of typeSupportedByOldABIEncoder | ||||
| * | | Simplification of typeSupportedByOldABIEncoder | Khan M Rashedun-Naby | 2018-06-21 | 1 | -5/+3 |
| | | | |||||
* | | | Merge pull request #4330 from ethereum/v050-var-keyword-preparations | chriseth | 2018-06-22 | 15 | -119/+119 |
|\ \ \ | | | | | | | | | drop var-keyword in compilationTests in favor of explicit types | ||||
| * | | | test: drop var-keyword in compilationTests in favor of explicit types | Christian Parpart | 2018-06-21 | 15 | -119/+119 |
| | | | | |||||
* | | | | Merge pull request #4326 from ethereum/compilerstack-cleanup | chriseth | 2018-06-21 | 1 | -9/+10 |
|\ \ \ \ | |/ / / |/| | | | Properly catch optimizer/assembly exception in CompilerStack | ||||
| * | | | Properly catch optimizer/assembly exception in CompilerStack | Alex Beregszaszi | 2018-06-21 | 1 | -9/+10 |
| | | | | |||||
* | | | | Merge pull request #4200 from biboran/3961 | chriseth | 2018-06-21 | 1 | -0/+100 |
|\ \ \ \ | | | | | | | | | | | #3961 - added an example of two-dimensional array encoding | ||||
| * | | | | #3961 - added a more detailed description to the calculation of offsets | Timofey Solonin | 2018-06-18 | 1 | -36/+68 |
| | | | | | |||||
| * | | | | #3961 - rewritten encoding example in a logical order instead of a ↵ | Timofey Solonin | 2018-06-03 | 1 | -44/+44 |
| | | | | | | | | | | | | | | | | | | | | sequential order | ||||
| * | | | | #3961 - added an example of abi encoding of a function with two-dimensional ↵ | Timofey Solonin | 2018-05-29 | 1 | -0/+68 |
| | | | | | | | | | | | | | | | | | | | | dynamic arrays | ||||
* | | | | | Merge pull request #4306 from ethereum/remove_050_workaround_scoping | chriseth | 2018-06-21 | 35 | -219/+85 |
|\ \ \ \ \ | | | | | | | | | | | | | [BREAKING] C99 scoping rules by default (remove 050 workaround) | ||||
| * | | | | | C99 scoping rules by default | Leonardo Alt | 2018-06-20 | 35 | -219/+85 |
| | | | | | | |||||
* | | | | | | Merge pull request #4219 from ethereum/functionTypeNamedArguments | Alex Beregszaszi | 2018-06-21 | 5 | -8/+8 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Turn named return parameters in function types into an error. | ||||
| * | | | | | Return parameters in function types may not be named. | Daniel Kirchner | 2018-06-18 | 5 | -8/+8 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #4323 from ethereum/compilerstack-cleanup | Alex Beregszaszi | 2018-06-21 | 2 | -6/+12 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Reorder some of the flow in CompilerStack::compileContract for readability | ||||
| * | | | | CompilerStack absolutePath/sanitizePath can be made static | Alex Beregszaszi | 2018-06-20 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | Reorder some of the flow in CompilerStack::compileContract for readability | Alex Beregszaszi | 2018-06-20 | 1 | -3/+9 |
|/ / / / | |||||
* | | | | Merge pull request #4300 from nventuro/optimize-out-and | chriseth | 2018-06-20 | 3 | -1/+44 |
|\ \ \ \ | | | | | | | | | | | Add TruthyAnd Peephole optimization | ||||
| * | | | | Improves peephole_truthy_and test case | Nicolás Venturo | 2018-06-20 | 1 | -2/+15 |
| | | | | | |||||
| * | | | | Add TruthyAnd Peephole optimization | Nicolás Venturo | 2018-06-15 | 3 | -1/+31 |
| |/ / / | |||||
* | | | | Merge pull request #4313 from ethereum/remove-callcode | Alex Beregszaszi | 2018-06-20 | 8 | -63/+9 |
|\ \ \ \ | | | | | | | | | | | Disallow raw callcode (was deprecated in 0.4.12) | ||||
| * | | | | Disallow raw callcode (was deprecated in 0.4.12) | Alex Beregszaszi | 2018-06-20 | 8 | -63/+9 |
| | | | | | |||||
* | | | | | Merge pull request #4225 from ethereum/fixeventtopics | Alex Beregszaszi | 2018-06-20 | 1 | -12/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | Clarify events. | ||||
| * | | | | Clarify documentation about events (mostly topics). | chriseth | 2018-06-20 | 1 | -12/+8 |
|/ / / / | |||||
* | | | | Merge pull request #4303 from ethereum/refactorExtractedTests | chriseth | 2018-06-19 | 7 | -200/+307 |
|\ \ \ \ | | | | | | | | | | | Refactor syntax test infrastructure to prepare extracting semantics tests. | ||||
| * | | | | Refactor syntax test infrastructure to prepare introducing semantics tests. | Daniel Kirchner | 2018-06-15 | 7 | -200/+307 |
| | | | | | |||||
* | | | | | Merge pull request #4317 from nventuro/contributing-changelog | chriseth | 2018-06-19 | 1 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Add a changelog notice to the Contributing doc | ||||
| * | | | | | Add a changelog notice to the contributing doc | Nicolás Venturo | 2018-06-19 | 1 | -0/+2 |
|/ / / / / | |||||
* | | | | | Merge pull request #4311 from ethereum/fix_python_version_2 | Alex Beregszaszi | 2018-06-18 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Use correct python version for the upgrade_bugs_by_version script | ||||
| * | | | | | Use correct python version for the upgrade_bugs_by_version script | Leonardo Alt | 2018-06-18 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #4309 from ethereum/pythonVersion | Alex Beregszaszi | 2018-06-18 | 2 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | Correctly choose python version for scripts requiring python2. | ||||
| * | | | | Correctly choose python version for scripts requiring python2. | Daniel Kirchner | 2018-06-15 | 2 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #4298 from ethereum/rpcDifficultyFix | chriseth | 2018-06-15 | 2 | -1/+3 |
|\ \ \ \ | |/ / / |/| | | | Fix ipc tests for recent versions of cpp-ethereum. | ||||
| * | | | Add difficulty field to genesis chain parameters to fix ipc tests for recent ↵ | Daniel Kirchner | 2018-06-14 | 2 | -1/+3 |
|/ / / | | | | | | | | | | versions of cpp-ethereum. | ||||
* | | | Merge pull request #4296 from ethereum/yul-internal | chriseth | 2018-06-14 | 19 | -62/+62 |
|\ \ \ | | | | | | | | | [WIP] Rename some internal constructs from Julia/Iulia to Yul | ||||
| * | | | update tests | Alex Beregszaszi | 2018-06-14 | 4 | -15/+15 |
| | | | | |||||
| * | | | Change comments | Alex Beregszaszi | 2018-06-14 | 4 | -6/+6 |
| | | | | |||||
| * | | | JuliaType -> YulType | Alex Beregszaszi | 2018-06-14 | 3 | -11/+11 |
| | | | | |||||
| * | | | Rename internal variable | Alex Beregszaszi | 2018-06-14 | 2 | -7/+7 |
| | | | | |||||
| * | | | Rename JULIA/IULIA to Yul in assembly interface | Alex Beregszaszi | 2018-06-14 | 6 | -23/+23 |
|/ / / | |||||
* | | | Merge pull request #4282 from ethereum/cli-yul | chriseth | 2018-06-14 | 3 | -8/+9 |
|\ \ \ | | | | | | | | | [BREAKING] Renamed the --julia CLI option to --yul | ||||
| * | | | Renamed the --julia CLI option to --yul | Alex Beregszaszi | 2018-06-14 | 3 | -8/+9 |
| | | | | |||||
* | | | | Merge pull request #4236 from ethereum/v050-disallow-empty-structs | chriseth | 2018-06-14 | 11 | -83/+26 |
|\ \ \ \ | |/ / / |/| | | | [BREAKING] Enforce disallowing empty structs | ||||
| * | | | Enforce disallowing empty structs | Christian Parpart | 2018-06-14 | 11 | -83/+26 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | This patch enfoces an error when it encounters an empty struct, effectively eliminating the deprecation warning. Also adjust 419_interface_structs to explicitely test for (non-empty) structs, as this behaviour "may" change in the future. | ||||
* | | | Merge pull request #4272 from ethereum/assert-break-continue | chriseth | 2018-06-13 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | Fail if break/continue statements are used outside for/while loops in ContractCompiler | ||||
| * | | | Fail if break/continue statements are used outside for/while loops in ↵ | Alex Beregszaszi | 2018-06-12 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | ContractCompiler | ||||
* | | | | Merge pull request #4290 from ethdemy/typo-bugfix | chriseth | 2018-06-13 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | fix typo | ||||
| * | | | | fix typo | a4nkit | 2018-06-13 | 2 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #4284 from ethereum/external-050-tests | chriseth | 2018-06-13 | 1 | -3/+13 |
|\ \ \ \ \ | | | | | | | | | | | | | Properly download branches of external Zeppelin/Gnosis tests | ||||
| * | | | | | Properly download branches of external Zeppelin/Gnosis tests | Alex Beregszaszi | 2018-06-13 | 1 | -3/+13 |
| |/ / / / | |||||
* | | | | | Merge pull request #4286 from ethereum/cli-formal | chriseth | 2018-06-13 | 2 | -8/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | [BREAKING] Remove obsolete --formal option from CLI | ||||
| * | | | | Remove obsolete --formal option from CLI | Alex Beregszaszi | 2018-06-13 | 2 | -8/+2 |
|/ / / / | |||||
* | | | | Merge pull request #4283 from ethereum/swap-test-order | Alex Beregszaszi | 2018-06-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Execute external Zeppelin tests before Gnosis | ||||
| * | | | | Execute external Zeppelin tests before Gnosis | Alex Beregszaszi | 2018-06-13 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #4085 from ethereum/calldatapad | Alex Beregszaszi | 2018-06-13 | 4 | -14/+19 |
|\ \ \ \ \ | |/ / / / |/| | | | | [BREAKING] Properly pad data from calldata. | ||||
| * | | | | Properly pad data from calldata. | chriseth | 2018-06-13 | 4 | -14/+19 |
| | | | | | |||||
* | | | | | Merge pull request #4250 from ethereum/fixAppveyor | Alex Beregszaszi | 2018-06-13 | 1 | -4/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix AppVeyor Visual Studio 2017 release | ||||
| * | | | | Updates Windows release to VS 2017 15.7.3 | bitshift | 2018-06-11 | 1 | -4/+3 |
| | | | | | |||||
* | | | | | Merge pull request #4280 from ethereum/disallow-sha3-suicide | Alex Beregszaszi | 2018-06-13 | 12 | -158/+64 |
|\ \ \ \ \ | | | | | | | | | | | | | [BREAKING] Disallow sha3 suicide | ||||
| * | | | | | Ensure to always use 0.5.0 mode in solcjs tests | Alex Beregszaszi | 2018-06-13 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Update external contract in compilationTests to not use deprecated sha3 | Alex Beregszaszi | 2018-06-13 | 4 | -31/+31 |
| | | | | | | |||||
| * | | | | | Disallow sha3/suicide aliases | Alex Beregszaszi | 2018-06-13 | 7 | -111/+19 |
| | | | | | | |||||
| * | | | | | Tidy up changelog for 0.5.0 | Alex Beregszaszi | 2018-06-13 | 1 | -17/+10 |
|/ / / / / | |||||
* | | | | | Merge pull request #3627 from ethereum/additional-keywords | Alex Beregszaszi | 2018-06-12 | 4 | -5/+48 |
|\ \ \ \ \ | | | | | | | | | | | | | [BREAKING] Add new reserved keywords. | ||||
| * | | | | | Add new reserved keywords. | Daniel Kirchner | 2018-06-12 | 4 | -5/+48 |
| | | | | | | |||||
* | | | | | | Merge pull request #4277 from ethereum/signedRightShift | Daniel Kirchner | 2018-06-12 | 2 | -2/+40 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Signed Right Shift: Additional test and more explanation. | ||||
| * | | | | | | Additional test and more explanation. | Daniel Kirchner | 2018-06-12 | 2 | -2/+40 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4265 from ethereum/remove-std | chriseth | 2018-06-12 | 7 | -115/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove obsolete 'std' directory | ||||
| * | | | | | | | Remove obsolete 'std' directory | Alex Beregszaszi | 2018-06-12 | 7 | -115/+1 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #4229 from ethereum/smt_storage_vars_refactor | chriseth | 2018-06-12 | 4 | -68/+65 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Refactoring how storage and local variables are managed. | ||||
| * | | | | | | | Refactoring Declaration -> VariableDeclaration (more precise) | Leonardo Alt | 2018-06-12 | 4 | -43/+42 |
| | | | | | | | | |||||
| * | | | | | | | Review comments | Leonardo Alt | 2018-06-12 | 2 | -10/+8 |
| | | | | | | | | |||||
| * | | | | | | | Refactoring how storage and local variables are managed. | Leonardo Alt | 2018-06-12 | 2 | -29/+29 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #4273 from ethereum/soltestExceptions | Daniel Kirchner | 2018-06-12 | 2 | -25/+15 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Improve exception handling in soltest and isoltest. | ||||
| * | | | | | | | Improve exception handling in soltest and isoltest. | Daniel Kirchner | 2018-06-12 | 2 | -25/+15 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #4232 from ethereum/renameiulia | Alex Beregszaszi | 2018-06-12 | 2 | -23/+24 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Rename iulia to yul in documentation. | ||||
| * | | | | | | Rename julia/iulia to yul in documentation. | chriseth | 2018-06-12 | 2 | -23/+24 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #4084 from ethereum/signedRightShift | Alex Beregszaszi | 2018-06-12 | 5 | -70/+160 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | [BREAKING] Use proper SAR for signed right shifts and emulate on pre-constantinople. | ||||
| * | | | | Extend explanatory remark and argue using bitwise operations instead of ↵ | Daniel Kirchner | 2018-06-12 | 1 | -6/+14 |
| | | | | | | | | | | | | | | | | | | | | rounding. | ||||
| * | | | | Use proper SAR for signed right shifts and emulate on pre-constantinople. | Daniel Kirchner | 2018-06-12 | 5 | -70/+152 |
|/ / / / | |||||
* | | | | Merge pull request #4179 from ethereum/emitWorkaround | Alex Beregszaszi | 2018-06-12 | 3 | -3/+8 |
|\ \ \ \ | | | | | | | | | | | [BREAKING] Remove emit workaround | ||||
| * | | | | Introduces emit token and removes identifier workaround. | Erik Kundt | 2018-06-12 | 3 | -3/+8 |
|/ / / / | |||||
* | | | | Merge pull request #4266 from ethereum/explicit-pow | Alex Beregszaszi | 2018-06-12 | 1 | -10/+7 |
|\ \ \ \ | | | | | | | | | | | Use boost::multiprecision::pow explicitly | ||||
| * | | | | Use boost::multiprecision::pow explicitly | Alex Beregszaszi | 2018-06-12 | 1 | -10/+7 |
| |/ / / | |||||
* | | | | Merge pull request #4206 from ethereum/050-testing | Alex Beregszaszi | 2018-06-12 | 1 | -2/+3 |
|\ \ \ \ | |/ / / |/| | | | Use temporary fork of Gnosis/Zeppelin contracts | ||||
| * | | | Use temporary fork of Gnosis/Zeppelin contracts | Alex Beregszaszi | 2018-05-30 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | Hopefully to be merged into upstream after the 0.5.0 release. | ||||
| * | | | Gnosis and Zeppelin repo names have changed | Alex Beregszaszi | 2018-05-30 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #4247 from morenoh149/patch-2 | chriseth | 2018-06-08 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Update Event emit docs pragma | ||||
| * | | | | Update Event emit docs pragma | Harry Moreno | 2018-06-08 | 1 | -1/+1 |
|/ / / / | | | | | | | | | Event's `emit` usage was introduced in 0.4.21+ | ||||
* | | | | Merge pull request #4243 from feliam/patch-3 | chriseth | 2018-06-07 | 1 | -2/+1 |
|\ \ \ \ | | | | | | | | | | | Update abi-spec.rst | ||||
| * | | | | Update abi-spec.rst | feliam | 2018-06-07 | 1 | -2/+1 |
|/ / / / | | | | | | | | | | | | | An infinite number of items in the sequence of types? ?? A negative number of type in the sequence ?? | ||||
* | | | | Merge pull request #4241 from ethereum/show-named-arg | Alex Beregszaszi | 2018-06-06 | 3 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Show named argument name in error | ||||
| * | | | | Show named argument name in error | Alex Beregszaszi | 2018-06-06 | 3 | -3/+3 |
| | | | | | |||||
* | | | | | Merge pull request #4222 from ethereum/view-pure-checker-split | chriseth | 2018-06-06 | 23 | -359/+227 |
|\ \ \ \ \ | | | | | | | | | | | | | Extract test cases from ViewPureChecker | ||||
| * | | | | | Extract test cases from ViewPureChecker | Alex Beregszaszi | 2018-06-06 | 23 | -359/+227 |
| |/ / / / | |||||
* | | | | | Merge pull request #4237 from dilatebrave/pull4196 | chriseth | 2018-06-06 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | doc: put the index at the bottom | ||||
| * | | | | doc: put the index at the bottom | taitt | 2018-06-06 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #4235 from sifmelcara/fix/cmake-install-libdir | chriseth | 2018-06-06 | 1 | -8/+2 |
|\ \ \ \ | | | | | | | | | | | Fix cmake when custom CMAKE_INSTALL_LIBDIR is given | ||||
| * | | | | Fix cmake when custom CMAKE_INSTALL_LIBDIR is given | mingchuan | 2018-06-06 | 1 | -8/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to cmake documents, we cannot assume CMAKE_INSTALL_LIBDIR is a relative path. This commit fixes the "no rule to make libjsoncpp.a" error by passing -DCMAKE_INSTALL_LIBDIR=lib to jsoncpp external project. | ||||
* | | | | | Merge pull request #4234 from elopio/patch-4 | chriseth | 2018-06-06 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | docs: fix typos | ||||
| * | | | | | docs: fix typos | Leo Arias | 2018-06-06 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #4233 from elopio/patch-3 | chriseth | 2018-06-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | comments: fix typo | ||||
| * | | | | | comments: fix typo | Leo Arias | 2018-06-06 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #4227 from elopio/patch-1 | chriseth | 2018-06-06 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | docs: fix typo | ||||
| * | | | | | docs: fix typo | Leo Arias | 2018-06-05 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #4228 from elopio/patch-2 | chriseth | 2018-06-06 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | docs: fix code annotation |