fix: merge develop to main

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

@@ -1,9 +1,39 @@
 ---
 name: Ask a question
-about: Something is unclear
-title: ''
+about: Something is unclear or needs clarification
+title: '[Question] '
 labels: 'type:docs'
 assignees: ''
 
 ---
-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).
+
+<!--
+⚠️ IMPORTANT: Please read before submitting
+
+This template should only be used in rare cases, such as:
+- You're unsure if something is a bug or expected behavior
+- Your question could lead to documentation improvements
+- You need clarification on technical implementation details
+
+-->
+
+## Question
+
+<!-- Clearly describe what you need clarification on -->
+
+## Context
+
+<!-- Provide relevant context that helps us understand your question -->
+
+**What are you trying to achieve?**
+<!-- Describe your goal or use case -->
+
+**What have you tried so far?**
+<!-- List any approaches or solutions you've attempted -->
+
+**Relevant documentation or code**
+<!-- Link to relevant documentation, code sections, or examples -->
+
+## Additional Information
+
+<!-- Any other details that might be helpful -->

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

@@ -1,50 +1,59 @@
 ---
 name: Report a bug
 about: Create a report to help us improve
-title: ''
+title: '[Bug] '
 labels: 'type:bug'
 assignees: ''
 
 ---
 
 <!-- Have you done the following? -->
 <!--   * Reproduced the issue in the latest version of the software -->
-<!--   * Duplicate Issue check:  https://github.com/search?q=+is%3Aissue+repo%3Atronprotocol/java-tron -->
+<!--   * Duplicate Issue check:  https://github.com/search?q=+is%3Aissue+repo%3Atronprotocol/tron-docker -->
 
-#### Software Versions
-<!-- `java -jar FullNode.jar -v` -->
 
-<!--
-```
-OS : Linux
-JVM : Oracle Corporation 1.8.0_161 amd64
-Git : b1fc2f0f2bd79527099bc3027b9aba165c2e20c2
-Version : 4.7.4
-Code : 18260
-```
--->
+## Expected behaviour
 
-#### Expected behaviour
 <!--[What you expect to happen] -->
 
+## Actual behaviour
 
-#### Actual behaviour
-<!--[What you expect to happen] -->
+<!-- Describe what actually happened -->
 
+## Frequency
 
-#### Frequency
 <!-- [What percentage of the time does it occur?] -->
+- [ ] Always (100%)
+- [ ] Frequently (>50%)
+- [ ] Sometimes (10-50%)
+- [ ] Rarely (<10%)
+
+## Steps to reproduce the behaviour
+<!-- Provide detailed steps to reproduce the issue -->
+
+1.
+2.
+3.
+
+## Logs and Error Messages
+
+<!--
+⚠️ IMPORTANT: Submit logs as text, not screenshots
+-->
+
+```
+[Paste error messages, stack traces, or relevant logs here]
+```
 
-#### Steps to reproduce the behaviour
+## Additional Context
 
-1. [Step 1]
-2. [Step 2]
-3. [Step ...]
+<!-- Add any other context about the problem -->
 
-#### Backtrace
+**Screenshots**
+<!-- If applicable, add screenshots to help explain the problem -->
 
-````
-[backtrace]
-````
+**Related Issues**
+<!-- Link to any related issues or pull requests -->
 
-When submitting logs: please submit them as text and not screenshots.
+**Possible Solution**
+<!-- If you have suggestions on how to fix the bug, describe them here -->

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

@@ -1,28 +1,86 @@
 ---
 name: Request a feature
 about: Suggest an idea for this project
-title: ''
+title: '[Feature] '
 labels: 'type:feature'
 assignees: ''
 
 ---
-# Background
 
-# Rationale
+## Background
 
-Why should this feature exist?
+<!-- Describe the context and motivation for this feature request -->
 
-What are the use-cases?
+## Problem Statement
 
-# Specification
+<!-- What problem does this feature solve? What pain points does it address? -->
 
-# Test Specification
+## Rationale
 
-# Scope Of Impact
+**Why should this feature exist?**
+<!-- Explain the benefits and value this feature would provide -->
 
+**What are the use cases?**
+<!-- Describe specific scenarios where this feature would be useful -->
 
-# Implementation
+1.
+2.
+3.
 
-Do you have ideas regarding the implementation of this feature?
+## Proposed Solution
 
-Are you willing to implement this feature?
+<!-- Describe your proposed solution in detail -->
+
+### Specification
+
+<!-- Provide technical specifications or requirements -->
+
+## Test Specification
+
+<!-- How should this feature be tested? -->
+
+**Test Scenarios**
+
+1.
+2.
+3.
+
+**Performance Considerations**
+<!-- Describe any performance implications -->
+
+## Scope Of Impact
+
+<!-- What parts of the system will be affected? -->
+
+## Implementation
+
+**Do you have ideas regarding the implementation?**
+<!-- Share any technical approaches or implementation details -->
+
+**Are you willing to implement this feature?**
+<!-- Let us know if you'd like to contribute the implementation -->
+- [ ] Yes, I can implement this feature
+- [ ] I can help with implementation
+- [ ] I need help with implementation
+- [ ] I'm just suggesting the idea
+
+**Estimated Complexity**
+<!-- Your assessment of implementation complexity -->
+- [ ] Low (minor changes)
+- [ ] Medium (moderate changes)
+- [ ] High (significant changes)
+- [ ] Unknown
+
+## Alternatives Considered
+
+<!-- Describe any alternative solutions or features you've considered -->
+
+## Additional Context
+
+<!-- Add any other context, mockups, diagrams, or examples -->
+
+**Related Issues/PRs**
+<!-- Link to any related issues or pull requests -->
+
+**References**
+<!-- Link to any relevant documentation, specifications, or discussions -->

.github/workflows/docker-s3-deploy.yml

@@ -36,26 +36,47 @@ jobs:
             exit 1
           fi
 
-      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
-        with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.GPG_PASSPHRASE }}
+      - name: Install cosign
+        uses: sigstore/cosign-installer@v3
 
-      - name: Sign tron-docker.zip with GPG
+      - name: Sign tron-docker.zip with Sigstore cosign (keyless)
+        # Keyless signing using GitHub OIDC — no private keys to manage or leak.
+        # The signature is bound to this workflow's identity (repo, ref, commit SHA).
+        # Verification: cosign verify-blob --certificate tron-docker.zip.cert \
+        #               --signature tron-docker.zip.sig \
+        #               --certificate-identity-regexp "https://github.com/tronprotocol/tron-docker" \
+        #               --certificate-oidc-issuer "https://token.actions.githubusercontent.com" \
+        #               tron-docker.zip
         run: |
-          gpg --detach-sign --armor tron-docker.zip
-          # This creates tron-docker.zip.asc (ASCII-armored signature)
+          cosign sign-blob tron-docker.zip \
+            --yes \
+            --output-signature tron-docker.zip.sig \
+            --output-certificate tron-docker.zip.cert
 
-      - name: Configure AWS Credentials
+      - name: Configure AWS Credentials (OIDC — no long-lived keys)
         uses: aws-actions/configure-aws-credentials@v4
         with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ github.event.inputs.aws-region }}  # Use input for region
+          # Uses GitHub OIDC provider to assume an IAM role with short-lived credentials.
+          # No static keys needed — credentials expire after the workflow run.
+          # Prerequisites:
+          #   1. Create an IAM OIDC identity provider for token.actions.githubusercontent.com
+          #   2. Create an IAM role with trust policy allowing this repo:
+          #        "Condition": {
+          #          "StringEquals": {
+          #            "token.actions.githubusercontent.com:aud": "sts.amazonaws.com",
+          #            "token.actions.githubusercontent.com:sub": "repo:tronprotocol/tron-docker:ref:refs/heads/main"
+          #          }
+          #        }
+          #   3. Attach S3 put-object policy scoped to the target bucket only
+          #   4. Delete the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY secrets from GitHub
+          role-to-assume: ${{ secrets.AWS_OIDC_ROLE_ARN }}
+          aws-region: ${{ github.event.inputs.aws-region }}
 
       - name: Upload tron-docker.zip to S3
+        env:
+          BUCKET_NAME: ${{ github.event.inputs.bucket-name }}
+          VERSION: ${{ github.event.inputs.version }}
         run: |
-          zip -r publish.zip tron-docker.zip tron-docker.zip.asc
-          aws s3 cp publish.zip s3://${{ github.event.inputs.bucket-name }}/package/publish-latest.zip
-          aws s3 cp publish.zip s3://${{ github.event.inputs.bucket-name }}/package/publish-${{github.event.inputs.version}}.zip
+          zip -r publish.zip tron-docker.zip tron-docker.zip.sig tron-docker.zip.cert
+          aws s3 cp publish.zip "s3://${BUCKET_NAME}/package/publish-latest.zip"
+          aws s3 cp publish.zip "s3://${BUCKET_NAME}/package/publish-${VERSION}.zip"