merge: resolve conflict with upstream develop (allowTvmOsaka)

- Delete ConfigKey.java (our intent), absorb new allowTvmOsaka field
- Add allowTvmOsaka to CommitteeConfig bean and reference.conf
- Bridge to CommonParameter in applyCommitteeConfig

Author: vividctrlalt

.claude/projects/-Users-zhao-Documents-dev-java-tron-vivid-java-tron/memory/freezetest-create2-fix.md

@@ -0,0 +1,95 @@
+# FreezeTest CREATE2 地址预测失败修复记录
+
+## 背景
+
+将 `config-test.conf` 的地址前缀从 testnet `0xa0` 改为 mainnet `0x41` 后，`FreezeTest` 中 18 个测试用例失败。
+
+失败断言：
+```java
+Assert.assertArrayEquals(predictedAddr, deployCreate2Contract(factoryAddr, salt));
+// predictedAddr（Solidity 预测）≠ deployCreate2Contract（TVM CREATE2 实际部署）
+```
+
+## 根因分析
+
+### EIP-1014 CREATE2 地址计算公式
+
+标准 EVM：
+```
+address = keccak256(0xff ++ sender[20] ++ salt[32] ++ keccak256(code)[32])[12:]
+```
+
+TRON TVM 做了两处定制：
+1. **magic byte**：标准 `0xff` 被替换为**地址前缀字节**（testnet=`0xa0`，mainnet=`0x41`）
+2. **sender 长度**：使用 21 字节 TRON 地址（含前缀），而非 20 字节 EVM 地址
+
+### 两条计算路径
+
+#### 路径 1：Solidity 合约预测（`getCreate2Addr`）
+
+工厂合约的 `getCreate2Addr` 函数编译后的关键字节码：
+
+```
+60a0    PUSH1 0xa0      ← 硬编码的 magic byte（编译时确定）
+60f8    PUSH1 0xf8
+1b      SHL             ← bytes1(0xa0)
+30      ADDRESS         ← address(this)，20 字节 EVM 地址
+```
+
+对应 Solidity 源码：
+```solidity
+keccak256(abi.encodePacked(bytes1(0xa0), address(this), salt, keccak256(bytecode)))
+```
+
+输入：`[0xa0, A₁..A₂₀, salt₃₂, codeHash₃₂]` = 85 字节
+
+#### 路径 2：TVM CREATE2 操作码（`deployCreate2Contract`）
+
+`Program.java:1618-1634`：
+```java
+senderAddress = getContextAddress();  // 21 字节：[prefix, A₁..A₂₀]
+WalletUtil.generateContractAddress2(senderAddress, salt, programCode);
+// → sha3omit12(merge(senderAddress₂₁, salt₃₂, sha3(code)₃₂))
+```
+
+输入：`[prefix, A₁..A₂₀, salt₃₂, sha3(code)₃₂]` = 85 字节
+
+### 关键差异
+
+| | Solidity 预测 | TVM CREATE2 |
+|---|---|---|
+| 第一字节 | `0xa0`（字节码硬编码） | `DecodeUtil.addressPreFixByte`（运行时） |
+| 后续 20 字节 | `address(this)` | `getContextAddress()[1:21]` |
+
+- **prefix = `0xa0` 时**：两条路径输入完全一致 → hash 相同 → 地址匹配 ✅
+- **prefix = `0x41` 时**：第一字节不同（`0xa0` vs `0x41`）→ hash 不同 → 地址不匹配 ❌
+
+### 结论
+
+**不是"碰巧通过"**。FACTORY_CODE 字节码是用 TRON 定制 Solidity 编译器在 testnet 环境下编译的，编译器将 CREATE2 的 magic byte 从标准的 `0xff` 替换为当时的地址前缀 `0xa0`。改为 `0x41` 后，字节码中的硬编码 `0xa0` 与运行时的 `0x41` 不再匹配。
+
+## 修复
+
+`FreezeTest.java` 第 85 行，将 FACTORY_CODE 中的 `60a0` 改为 `6041`：
+
+```diff
+- "0f59150813b61017357600080fd5b8192505050919050565b60008060a060f81b30846040518060200161019"
++ "0f59150813b61017357600080fd5b8192505050919050565b600080604160f81b30846040518060200161019"
+```
+
+即 `PUSH1 0xa0` → `PUSH1 0x41`，使 Solidity 预测函数的 magic byte 与新的运行时前缀一致。
+
+## 涉及的关键代码位置
+
+| 文件 | 行号 | 说明 |
+|---|---|---|
+| `DataWord.java` | 190-195 | `toTronAddress()`：前缀 + 20字节 = 21字节 TRON 地址 |
+| `OperationActions.java` | 303-312 | `addressAction`：Solidity `address(this)` 返回 20 字节 |
+| `Program.java` | 1337-1338 | `getContextAddress()`：返回 21 字节 TRON 地址 |
+| `Program.java` | 1618-1634 | `createContract2()`：CREATE2 操作码实现 |
+| `WalletUtil.java` | 56-59 | `generateContractAddress2()`：hash 计算 |
+| `Hash.java` | 194-199 | `sha3omit12()`：hash 后取 [11:31]，首字节替换为前缀 |
+
+## 验证
+
+修复后全部 18 个 FreezeTest 测试通过（BUILD SUCCESSFUL）。

.claude/worktrees/pensive-ellis/.codeclimate.yml

@@ -0,0 +1,6 @@
+version: "2"
+plugins:
+  sonar-java:
+    enabled: true
+    config:
+      sonar.java.source: 8

.claude/worktrees/pensive-ellis/.dockerignore

@@ -0,0 +1,3 @@
+./*
+!docker-entrypoint.sh
+

.claude/worktrees/pensive-ellis/.github/ISSUE_TEMPLATE/ask-a-question.md

@@ -0,0 +1,10 @@
+---
+name: Ask a question
+about: Something is unclear
+title: ''
+labels: 'type:docs'
+assignees: ''
+
+---
+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).
+

.claude/worktrees/pensive-ellis/.github/ISSUE_TEMPLATE/report-a-bug.md

@@ -0,0 +1,50 @@
+---
+name: Report a bug
+about: Create a report to help us improve
+title: ''
+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 -->
+
+#### 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
+<!--[What you expect to happen] -->
+
+
+#### Actual behaviour
+<!--[What you expect to happen] -->
+
+
+#### Frequency
+<!-- [What percentage of the time does it occur?] -->
+
+#### Steps to reproduce the behaviour
+
+1. [Step 1]
+2. [Step 2]
+3. [Step ...]
+
+#### Backtrace
+
+````
+[backtrace]
+````
+
+When submitting logs: please submit them as text and not screenshots.

.claude/worktrees/pensive-ellis/.github/ISSUE_TEMPLATE/request-a-feature.md

@@ -0,0 +1,28 @@
+---
+name: Request a feature
+about: Suggest an idea for this project
+title: ''
+labels: 'type:feature'
+assignees: ''
+
+---
+# Background
+
+# Rationale
+
+Why should this feature exist?
+
+What are the use-cases?
+
+# Specification
+
+# Test Specification
+
+# Scope Of Impact
+
+
+# Implementation
+
+Do you have ideas regarding the implementation of this feature?
+
+Are you willing to implement this feature?

.claude/worktrees/pensive-ellis/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,12 @@
+**What does this PR do?**
+
+**Why are these changes required?**
+
+**This PR has been tested by:**
+- Unit Tests
+- Manual Testing
+
+**Follow up**
+
+**Extra details**
+

.claude/worktrees/pensive-ellis/.github/workflows/codeql.yml

@@ -0,0 +1,64 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ 'develop', 'master', 'release_**' ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ 'develop' ]
+  schedule:
+    - cron: '6 10 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Use only 'java' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # 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
+        # queries: security-extended,security-and-quality
+
+    # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #     echo "Run, Build Application using script"
+    #     ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.claude/worktrees/pensive-ellis/.github/workflows/math-check.yml

@@ -0,0 +1,93 @@
+name: Check Math Usage
+
+on:
+  push:
+    branches: [ 'master', 'release_**' ]
+  pull_request:
+    branches: [ 'develop', 'release_**' ]
+  workflow_dispatch:
+
+jobs:
+  check-math:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check for java.lang.Math usage
+        id: check-math
+        shell: bash
+        run: |
+          echo "Checking for java.lang.Math usage..."
+          
+          touch math_usage.txt
+          
+          while IFS= read -r file; do
+            filename=$(basename "$file")
+            if [[ "$filename" == "StrictMathWrapper.java" || "$filename" == "MathWrapper.java" ]]; then
+              continue
+            fi
+          
+            perl -0777 -ne '
+              s/"([^"\\]|\\.)*"//g;
+              s/'\''([^'\''\\]|\\.)*'\''//g;
+              s!/\*([^*]|\*[^/])*\*/!!g;
+              s!//[^\n]*!!g;
+              $hasMath = 0;
+              $hasMath = 1 if /^[\s]*import[\s]+java\.lang\.Math\b/m;
+              $hasMath = 1 if /\bjava\s*\.\s*lang\s*\.\s*Math\s*\./;
+              $hasMath = 1 if /(?<![\w\.])(?<!Strict)Math\s*\./;
+              print "$ARGV\n" if $hasMath;
+            ' "$file" >> math_usage.txt
+          done < <(find . -type f -name "*.java")
+          
+          sort -u math_usage.txt -o math_usage.txt
+          
+          if [ -s math_usage.txt ]; then
+            echo "❌ Error: Forbidden Math usage found in the following files:"
+            cat math_usage.txt
+            echo "math_found=true" >> $GITHUB_OUTPUT
+            echo "Please use org.tron.common.math.StrictMathWrapper instead of direct Math usage."
+          else
+            echo "✅ No forbidden Math usage found"
+            echo "math_found=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Upload findings
+        if: steps.check-math.outputs.math_found == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: math-usage-report
+          path: math_usage.txt
+
+      - name: Create comment
+        if: github.event_name == 'pull_request' && steps.check-math.outputs.math_found == 'true'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const fs = require('fs');
+            const findings = fs.readFileSync('math_usage.txt', 'utf8');
+            const body = `### ❌ Math Usage Detection Results
+            
+            Found forbidden usage of \`java.lang.Math\` in the following files:
+            
+            \`\`\`
+            ${findings}
+            \`\`\`
+            
+            **Please review if this usage is intended.**
+            > [!CAUTION]
+            > Note: You should use \`org.tron.common.math.StrictMathWrapper\`.
+            > If you need to use \`java.lang.Math\`, please provide a justification.
+            `;
+            
+            await github.rest.issues.createComment({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number,
+              body: body
+            });
+
+      - name: Fail if Math usage found
+        if: steps.check-math.outputs.math_found == 'true'
+        run: exit 1