Skip to content

Commit 5f1834b

Browse files
authored
Merge pull request #65 from tronprotocol/master_0.8.x
func(merge): from v0.8.20
2 parents f18bedf + 350a86c commit 5f1834b

File tree

1,920 files changed

+23368
-4391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,920 files changed

+23368
-4391
lines changed

.circleci/config.yml

Lines changed: 420 additions & 388 deletions
Large diffs are not rendered by default.

.circleci/osx_install_dependencies.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ function validate_checksum {
5252

5353
if [ ! -f /usr/local/lib/libz3.a ] # if this file does not exists (cache was not restored), rebuild dependencies
5454
then
55-
brew unlink python
5655
brew install boost
5756
brew install cmake
5857
brew install wget
@@ -61,11 +60,11 @@ then
6160
./scripts/install_obsolete_jsoncpp_1_7_4.sh
6261

6362
# z3
64-
z3_version="4.11.2"
63+
z3_version="4.12.1"
6564
z3_dir="z3-${z3_version}-x64-osx-10.16"
6665
z3_package="${z3_dir}.zip"
6766
wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_package}"
68-
validate_checksum "$z3_package" a56b6c40d9251a963aabe1f15731dd88ad1cb801d0e7b16e45f8b232175e165c
67+
validate_checksum "$z3_package" 7601f844de6d906235140d0f76cca58be7ac716f3e2c29c35845aa24b24f73b9
6968
unzip "$z3_package"
7069
rm "$z3_package"
7170
cp "${z3_dir}/bin/libz3.a" /usr/local/lib
@@ -74,10 +73,10 @@ then
7473
rm -r "$z3_dir"
7574

7675
# evmone
77-
evmone_version="0.9.1"
76+
evmone_version="0.10.0"
7877
evmone_package="evmone-${evmone_version}-darwin-x86_64.tar.gz"
7978
wget "https://github.com/ethereum/evmone/releases/download/v${evmone_version}/${evmone_package}"
80-
validate_checksum "$evmone_package" 70420a893a9b1036fcb63526b806d97658db8c373bcab1c3e8382594dc8593e4
79+
validate_checksum "$evmone_package" 1b7773779287d7908baca6b8d556a98800cbd7d6e5c910b55fa507642bc0a15c
8180
tar xzpf "$evmone_package" -C /usr/local
8281
rm "$evmone_package"
8382

.circleci/soltest_all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ REPODIR="$(realpath "$(dirname "$0")"/..)"
3131
# shellcheck source=scripts/common.sh
3232
source "${REPODIR}/scripts/common.sh"
3333

34-
EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london paris)
35-
DEFAULT_EVM=paris
34+
EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london paris shanghai)
35+
DEFAULT_EVM=shanghai
3636
[[ " ${EVM_VALUES[*]} " =~ $DEFAULT_EVM ]]
3737
OPTIMIZE_VALUES=(0 1)
3838

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Language: Cpp
1212
BasedOnStyle: LLVM
1313
AccessModifierOffset: -4
1414
AlignAfterOpenBracket: AlwaysBreak
15-
AlignEscapedNewlinesLeft: true
15+
AlignEscapedNewlines: Left
1616
AlwaysBreakAfterReturnType: None
1717
AlwaysBreakTemplateDeclarations: Yes
1818
BinPackArguments: false

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
---
22
name: Bug Report
3+
about: Problems, deficiencies, inaccuracies or crashes discovered on Solidity.
4+
title: ''
5+
labels: 'bug :bug:'
6+
assignees: ''
7+
38
---
49

510
<!--## Prerequisites

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: Bug Report
4-
url: https://github.com/ethereum/solidity/issues/new?template=bug_report.md&projects=ethereum/solidity/43
5-
about: Bug reports for the Solidity Compiler.
6-
- name: Documentation Issue
7-
url: https://github.com/ethereum/solidity/issues/new?template=documentation_issue.md&projects=ethereum/solidity/43
8-
about: Solidity documentation.
9-
- name: Feature Request
10-
url: https://github.com/ethereum/solidity/issues/new?template=feature_request.md&projects=ethereum/solidity/43
11-
about: Solidity language or infrastructure feature requests.
12-
- name: Report a security vulnerability
13-
url: https://github.com/ethereum/solidity/security/policy
14-
about: Please review our security policy for more details.
153
- name: Initiate a language design or feedback discussion
164
url: https://forum.soliditylang.org
175
about: Open a thread on the Solidity forum.

.github/ISSUE_TEMPLATE/documentation_issue.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
---
22
name: Documentation Issue
3+
about: Corrections, improvements or requests for new content on Solidity's documentation.
4+
title: ''
5+
labels: 'documentation :book:'
6+
assignees: ''
7+
38
---
49

510
## Page

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
---
22
name: Feature Request
3+
about: Ideas, comments or messages asking for a particular functionality to be added
4+
to Solidity.
5+
title: ''
6+
labels: feature
7+
assignees: ''
8+
39
---
410

511
<!--## Prerequisites

.github/workflows/buildpack-deps.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ on:
55
branches: [ develop ]
66
paths:
77
- 'scripts/docker/buildpack-deps/Dockerfile.emscripten'
8-
- 'scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz'
8+
- 'scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz'
9+
- 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2004'
910
- 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang'
1011
- 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204'
1112

@@ -22,7 +23,7 @@ jobs:
2223
strategy:
2324
fail-fast: false
2425
matrix:
25-
image_variant: [emscripten, ubuntu1604.clang.ossfuzz, ubuntu2204.clang, ubuntu2204]
26+
image_variant: [emscripten, ubuntu.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204]
2627

2728
steps:
2829
- uses: actions/checkout@v2

.github/workflows/stale.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ permissions:
1010
pull-requests: write
1111

1212
env:
13-
BEFORE_ISSUE_STALE: 334
14-
BEFORE_ISSUE_CLOSE: 0 #FIXME: change to 14 days
13+
BEFORE_ISSUE_STALE: 90
14+
BEFORE_ISSUE_CLOSE: 7
1515
BEFORE_PR_STALE: 14
1616
BEFORE_PR_CLOSE: 7
1717

@@ -28,14 +28,13 @@ jobs:
2828
This issue has been marked as stale due to inactivity for the last ${{ env.BEFORE_ISSUE_STALE }} days.
2929
It will be automatically closed in ${{ env.BEFORE_ISSUE_CLOSE }} days.
3030
close-issue-message: |
31-
Hi everyone! This issue has been closed due to inactivity.
31+
Hi everyone! This issue has been automatically closed due to inactivity.
3232
If you think this issue is still relevant in the latest Solidity version and you have something to [contribute](https://docs.soliditylang.org/en/latest/contributing.html), feel free to reopen.
3333
However, unless the issue is a concrete proposal that can be implemented, we recommend starting a language discussion on the [forum](https://forum.soliditylang.org) instead.
34-
any-of-issue-labels: stale # TODO: remove this when we're done with closing ancient issues
35-
ascending: true # TODO: remove this when we're done with closing ancient issues
34+
ascending: true
3635
stale-issue-label: stale
37-
close-issue-label: closed-due-inactivity
38-
exempt-issue-labels: 'bug :bug:,roadmap,selected-for-development,must have'
36+
close-issue-label: 'closed due inactivity'
37+
exempt-issue-labels: 'bug :bug:,epic,roadmap,selected for development,must have,must have eventually,smt'
3938
stale-pr-message: |
4039
This pull request is stale because it has been open for ${{ env.BEFORE_PR_STALE }} days with no activity.
4140
It will be closed in ${{ env.BEFORE_PR_CLOSE }} days unless the `stale` label is removed.
@@ -48,6 +47,5 @@ jobs:
4847
exempt-pr-labels: 'external contribution :star:,roadmap,epic'
4948
exempt-draft-pr: false
5049
exempt-all-milestones: true
51-
# remove-stale-when-updated: true # TODO: uncomment and remove the line below when we're done with closing ancient issues
52-
remove-issue-stale-when-updated: false
53-
operations-per-run: 128
50+
remove-stale-when-updated: true
51+
operations-per-run: 256

0 commit comments

Comments
 (0)