Skip to content

Commit 708c9b1

Browse files
ouy95917ouy95917
committed
Merge remote-tracking branch 'origin/develop' into implement-eip-7823
# Conflicts: # common/src/main/java/org/tron/core/Constant.java # framework/src/main/java/org/tron/core/config/args/Args.java
2 parents 8dd8e7d + 039821c commit 708c9b1

276 files changed

Lines changed: 4307 additions & 4883 deletions

File tree

Some content is hidden

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

‎.github/ISSUE_TEMPLATE/ask-a-question.md‎

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,51 @@
11
---
22
name: Ask a question
3-
about: Something is unclear
4-
title: ''
3+
about: Something is unclear or needs clarification
4+
title: '[Question]'
55
labels: 'type:docs'
66
assignees: ''
77

88
---
9-
This should only be used in very rare cases e.g. if you are not 100% sure if something is a bug or asking a question that leads to improving the documentation. For general questions please use [Discord](https://discord.gg/cGKSsRVCGm) or [Telegram](https://t.me/TronOfficialDevelopersGroupEn).
109

10+
<!--
11+
⚠️ IMPORTANT: Please read before submitting
12+
13+
This template should only be used in rare cases, such as:
14+
- You're unsure if something is a bug or expected behavior
15+
- Your question could lead to documentation improvements
16+
- You need clarification on technical implementation details
17+
18+
For general questions, please use our community channels:
19+
- Discord: https://discord.gg/cGKSsRVCGm
20+
- Telegram: https://t.me/TronOfficialDevelopersGroupEn
21+
22+
These channels provide faster responses for general inquiries.
23+
-->
24+
25+
## Question
26+
27+
<!-- Clearly describe what you need clarification on -->
28+
29+
## Context
30+
31+
<!-- Provide relevant context that helps us understand your question -->
32+
33+
**What are you trying to achieve?**
34+
<!-- Describe your goal or use case -->
35+
36+
**What have you tried so far?**
37+
<!-- List any approaches or solutions you've attempted -->
38+
39+
**Relevant documentation or code**
40+
<!-- Link to relevant documentation, code sections, or examples -->
41+
42+
## Environment (if applicable)
43+
44+
- Network: <!-- e.g., Mainnet -->
45+
- java-tron version: <!-- e.g., 4.7.4 -->
46+
- Operating System: <!-- e.g., Ubuntu 20.04 -->
47+
- Java version: <!-- e.g., java version "1.8.0_391" -->
48+
49+
## Additional Information (Optional)
50+
51+
<!-- Any other details that might be helpful -->

‎.github/ISSUE_TEMPLATE/report-a-bug.md‎

Lines changed: 64 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,86 @@
11
---
22
name: Report a bug
33
about: Create a report to help us improve
4-
title: ''
4+
title: '[Bug]'
55
labels: 'type:bug'
66
assignees: ''
77

88
---
99

10-
<!-- Have you done the following? -->
11-
<!-- * Reproduced the issue in the latest version of the software -->
12-
<!-- * Duplicate Issue check: https://github.com/search?q=+is%3Aissue+repo%3Atronprotocol/java-tron -->
10+
<!--
11+
⚠️ Before submitting, please ensure you have:
12+
✓ Reproduced the issue in the latest version of java-tron
13+
✓ Checked for duplicate issues: https://github.com/search?q=+is%3Aissue+repo%3Atronprotocol/java-tron
14+
✓ Reviewed the documentation: https://tronprotocol.github.io/documentation-en/introduction/
15+
-->
1316

14-
#### Software Versions
15-
<!-- `java -jar FullNode.jar -v` -->
17+
## Bug Description
18+
19+
<!-- Provide a clear and concise description of the bug -->
20+
21+
## Environment
22+
23+
**Network**
24+
<!-- Specify the network type: Mainnet, Testnet, or Private network -->
25+
26+
**Software Versions**
27+
<!-- Run `java -jar FullNode.jar -v` to get version information -->
1628

17-
<!--
1829
```
19-
OS : Linux
20-
JVM : Oracle Corporation 1.8.0_161 amd64
21-
Git : b1fc2f0f2bd79527099bc3027b9aba165c2e20c2
22-
Version : 4.7.4
23-
Code : 18260
30+
OS: <!-- e.g., Ubuntu 20.04, macOS 12.0, Windows 11 -->
31+
JVM: <!-- e.g., Oracle Corporation 1.8.0_161 amd64 -->
32+
Git Commit: <!-- e.g., b1fc2f0f2bd79527099bc3027b9aba165c2e20c2 -->
33+
Version: <!-- e.g., 4.7.4 -->
34+
Code: <!-- e.g., 18260 -->
2435
```
25-
-->
2636

27-
#### Expected behaviour
28-
<!--[What you expect to happen] -->
37+
**Configuration**
38+
<!-- If relevant, describe your node configuration (e.g., FullNode, SolidityNode, witness settings) -->
39+
40+
## Expected Behavior
41+
42+
<!-- Describe what you expected to happen -->
2943

44+
## Actual Behavior
3045

31-
#### Actual behaviour
32-
<!--[What you expect to happen] -->
46+
<!-- Describe what actually happened -->
3347

48+
## Frequency
3449

35-
#### Frequency
36-
<!-- [What percentage of the time does it occur?] -->
50+
<!-- How often does this issue occur? -->
51+
- [ ] Always (100%)
52+
- [ ] Frequently (>50%)
53+
- [ ] Sometimes (10-50%)
54+
- [ ] Rarely (<10%)
55+
56+
## Steps to Reproduce
57+
58+
<!-- Provide detailed steps to reproduce the issue -->
59+
60+
1.
61+
2.
62+
3.
63+
64+
## Logs and Error Messages
65+
66+
<!--
67+
⚠️ IMPORTANT: Submit logs as text, not screenshots
68+
Include relevant logs from FullNode.jar or other components
69+
-->
70+
71+
```
72+
[Paste error messages, stack traces, or relevant logs here]
73+
```
3774

38-
#### Steps to reproduce the behaviour
75+
## Additional Context (Optional)
3976

40-
1. [Step 1]
41-
2. [Step 2]
42-
3. [Step ...]
77+
<!-- Add any other context about the problem -->
4378

44-
#### Backtrace
79+
**Screenshots**
80+
<!-- If applicable, add screenshots to help explain the problem -->
4581

46-
````
47-
[backtrace]
48-
````
82+
**Related Issues**
83+
<!-- Link to any related issues or pull requests -->
4984

50-
When submitting logs: please submit them as text and not screenshots.
85+
**Possible Solution**
86+
<!-- If you have suggestions on how to fix the bug, describe them here -->

‎.github/ISSUE_TEMPLATE/request-a-feature.md‎

Lines changed: 74 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,91 @@
11
---
22
name: Request a feature
33
about: Suggest an idea for this project
4-
title: ''
4+
title: '[Feature]'
55
labels: 'type:feature'
66
assignees: ''
77

88
---
9-
# Background
109

11-
# Rationale
10+
<!--
11+
Thank you for contributing to java-tron!
12+
Please provide as much detail as possible to help us evaluate your feature request.
13+
-->
1214

13-
Why should this feature exist?
15+
## Problem Statement
1416

15-
What are the use-cases?
17+
<!-- Describe the problem this feature solves, the context/motivation, and who would benefit -->
1618

17-
# Specification
19+
## Proposed Solution
1820

19-
# Test Specification
21+
<!-- Describe your proposed solution in detail -->
2022

21-
# Scope Of Impact
23+
### Specification
2224

25+
<!-- Provide technical specifications or requirements -->
2326

24-
# Implementation
27+
**API Changes** (if applicable)
28+
<!-- Describe any new or modified APIs -->
2529

26-
Do you have ideas regarding the implementation of this feature?
30+
**Configuration Changes** (if applicable)
31+
<!-- Describe any new configuration options -->
2732

28-
Are you willing to implement this feature?
33+
**Protocol Changes** (if applicable)
34+
<!-- Describe any changes to the TRON protocol -->
35+
36+
## Scope of Impact
37+
38+
<!-- Select the system components that will be affected by this feature:
39+
- Core protocol
40+
- API/RPC
41+
- Database
42+
- Network layer
43+
- Smart contracts
44+
- Documentation
45+
- Others, please specify
46+
-->
47+
48+
**Breaking Changes**
49+
<!-- Will this feature introduce any breaking changes? -->
50+
51+
**Backward Compatibility**
52+
<!-- How will this feature maintain backward compatibility? -->
53+
54+
## Implementation
55+
56+
**Do you have ideas regarding the implementation?**
57+
<!-- Share any technical approaches or implementation details -->
58+
59+
**Are you willing to implement this feature?**
60+
<!-- Let us know if you'd like to contribute the implementation -->
61+
62+
**Estimated Complexity**
63+
<!-- Your assessment of implementation complexity, choose among
64+
- Low (minor changes)
65+
- Medium (moderate changes)
66+
- High (significant changes)
67+
- Unknown
68+
-->
69+
70+
## Testing Strategy
71+
72+
<!-- How should this feature be tested? -->
73+
74+
**Test Scenarios**
75+
76+
**Performance Considerations**
77+
<!-- Describe any performance implications -->
78+
79+
## Alternatives Considered (Optional)
80+
81+
<!-- Describe any alternative solutions or features you've considered -->
82+
83+
## Additional Context (Optional)
84+
85+
<!-- Add any other context, mockups, diagrams, or examples -->
86+
87+
**Related Issues/PRs**
88+
<!-- Link to any related issues or pull requests -->
89+
90+
**References**
91+
<!-- Link to any relevant documentation, specifications, or discussions -->

‎.github/workflows/codeql.yml‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
pull_request:
77
# The branches below must be a subset of the branches above
88
branches: [ 'develop' ]
9+
paths-ignore: [ '**/*.md', '.gitignore', '**/.gitignore', '.editorconfig',
10+
'.gitattributes', 'docs/**', 'CHANGELOG', '.github/ISSUE_TEMPLATE/**',
11+
'.github/PULL_REQUEST_TEMPLATE/**', '.github/CODEOWNERS' ]
912
schedule:
1013
- cron: '6 10 * * 0'
1114

@@ -29,36 +32,25 @@ jobs:
2932

3033
steps:
3134
- name: Checkout repository
32-
uses: actions/checkout@v3
35+
uses: actions/checkout@v5
3336

3437
# Initializes the CodeQL tools for scanning.
3538
- name: Initialize CodeQL
36-
uses: github/codeql-action/init@v3
39+
uses: github/codeql-action/init@v4
3740
with:
3841
languages: ${{ matrix.language }}
39-
# If you wish to specify custom queries, you can do so here or in a config file.
40-
# By default, queries listed here will override any specified in a config file.
41-
# Prefix the list here with "+" to use these queries and those in the config file.
42+
build-mode: manual
4243

43-
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
44-
# queries: security-extended,security-and-quality
45-
46-
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
47-
# If this step fails, then you should remove it and run the build manually (see below)
48-
- name: Autobuild
49-
uses: github/codeql-action/autobuild@v3
50-
51-
# ℹ️ Command-line programs to run using the OS shell.
52-
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
53-
54-
# If the Autobuild fails above, remove it and uncomment the following three lines.
55-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
44+
- name: Set up JDK 8
45+
uses: actions/setup-java@v5
46+
with:
47+
java-version: '8'
48+
distribution: 'temurin'
5649

57-
# - run: |
58-
# echo "Run, Build Application using script"
59-
# ./location_of_script_within_repo/buildscript.sh
50+
- name: Build
51+
run: ./gradlew build -x test --no-daemon
6052

6153
- name: Perform CodeQL Analysis
62-
uses: github/codeql-action/analyze@v3
54+
uses: github/codeql-action/analyze@v4
6355
with:
6456
category: "/language:${{matrix.language}}"

‎.github/workflows/math-check.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616

1717
- name: Check for java.lang.Math usage
1818
id: check-math
@@ -55,14 +55,14 @@ jobs:
5555
5656
- name: Upload findings
5757
if: steps.check-math.outputs.math_found == 'true'
58-
uses: actions/upload-artifact@v4
58+
uses: actions/upload-artifact@v6
5959
with:
6060
name: math-usage-report
6161
path: math_usage.txt
6262

6363
- name: Create comment
6464
if: github.event_name == 'pull_request' && steps.check-math.outputs.math_found == 'true'
65-
uses: actions/github-script@v6
65+
uses: actions/github-script@v8
6666
with:
6767
script: |
6868
const fs = require('fs');

0 commit comments

Comments
 (0)