Skip to content

refactor(config): replace ConfigKey with bean binding#13

Open
vividctrlalt wants to merge 16 commits intodevelopfrom
refactor/config-bean-binding
Open

refactor(config): replace ConfigKey with bean binding#13
vividctrlalt wants to merge 16 commits intodevelopfrom
refactor/config-bean-binding

Conversation

@vividctrlalt
Copy link
Copy Markdown
Owner

@vividctrlalt vividctrlalt commented Mar 31, 2026

Summary

Replace manual config key constant lookup (ConfigKey.java + hasPath/getXxx) with ConfigBeanFactory.create() automatic bean binding across all config.conf domains.

  • 12 new bean classes (VmConfig, BlockConfig, CommitteeConfig, NodeConfig, MetricsConfig, EventConfig, GenesisConfig, RateLimiterConfig, StorageConfig, MiscConfig, LocalWitnessConfig, RateLimiterConfig)
  • ConfigKey.java deleted — config.conf is the single source of truth
  • All bridge methods read from beans only — no raw Config parameter passing
  • Storage.java string constants removed — reads from StorageConfig bean
  • 11 unit test classes for all bean classes
  • DynamicArgs migrated to use bean + filterInetSocketAddress

Key design decisions

  1. ConfigBeanFactory binds field names to config keys automatically — zero key string duplication
  2. PBFT naming workaround — 4 keys with consecutive uppercase excluded from auto-binding, read manually with documented reason
  3. Dot-notation fields (listen.port, connection.timeout) — create sub-beans or exclude + manual read
  4. Legacy key fallback (maxActiveNodes → maxConnections) — handled in bean's fromConfig()
  5. Dynamic key-value structures (cache.strategies, merkleRoot) — pass raw Config sub-tree from bean, documented why

Adding a new config parameter after this change

  1. Add one line in config.conf
  2. Add one field in the corresponding bean class

That's it. ConfigBeanFactory auto-binds.

Test plan

  • All 11 new bean unit tests pass
  • Full test suite passes (framework + plugins + common)
  • Verified defaults match CommonParameter field initializers
  • Code review: correctness + maintainability reviewers ran

ouy95917 and others added 9 commits February 25, 2026 15:45
@ouy95917
func(proposal): add Osaka proposal for TVM
443ada0
@ouy95917
func(vm): implement eip-7823
4e1eef4
@ouy95917
func(vm): add unit test for eip-7823
8dd8e7d
@operagxsasha
docs: fix shieldedTransaction typos in comments
e1969bb
@ouy95917
Merge remote-tracking branch 'origin/develop' into implement-eip-7823
708c9b1 
# Conflicts:
#	common/src/main/java/org/tron/core/Constant.java
#	framework/src/main/java/org/tron/core/config/args/Args.java
@ouy95917
fix(vm): correct osaka proposal id, default config and modexp behavior
a8fa3d4 
1. Change ALLOW_TVM_OSAKA proposal id from 95 to 96
2. DynamicPropertiesStore.getAllowTvmOsaka() defaults to CommonParameter
3. ModExp returns Pair.of(false, EMPTY_BYTE_ARRAY) instead of throwing
   PrecompiledContractException when inputs exceed 1024 bytes, matching
   geth/besu behavior where only the CALL fails (not the whole tx)
4. Update test to verify return value instead of catching exception
@lvs0075
Merge pull request tronprotocol#6578 from operagxsasha/patch-5
09127ab 
docs: fix shieldedTransaction typos in comments
@ouy95917
test(vm): add boundary and edge case tests for eip-7823 modexp limit
0663e17 
- baseLen == 1024 boundary value should succeed
- baseLen == 1025 just over limit should fail
- oversized expLen only should fail
- oversized modLen only should fail
- all limits exceeded with osaka disabled should succeed
@halibobo1205
feat(actuator): prevent duplicate registration and stabilize CI
18b5e61 
Changes:
- Add a registration status check to prevent duplicate initialization during CI test runs.
- Throw TronError on actuator instantiation failures to improve error visibility and debugging.
- Narrow package scanning from "org.tron" to "org.tron.core.actuator" to reduce reflection overhead and speed up registration.
- Remove JVM args for CI test to avoid JDK8 G1 GC bugs and Evacuation Pause failures.
- Optimize console output to prevent test OOM for CI
- Adjust memory and parallelism settings
- Exclude dnsjava InetAddressResolverProvider
@github-actions
Copy link
Copy Markdown

github-actions bot commented Mar 31, 2026

❌ Math Usage Detection Results

Found forbidden usage of java.lang.Math in the following files:

./common/src/main/java/org/tron/core/config/args/CommitteeConfig.java

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.

@vividctrlalt vividctrlalt changed the title refactor(config): replace ConfigKey constants with ConfigBeanFactory bean binding refactor(config): replace ConfigKey with bean binding Mar 31, 2026
@github-actions
Copy link
Copy Markdown

github-actions bot commented Mar 31, 2026

❌ Math Usage Detection Results

Found forbidden usage of java.lang.Math in the following files:

./common/src/main/java/org/tron/core/config/args/CommitteeConfig.java

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.

@halibobo1205 @claude
fix(test): catch Throwable instead of Exception in concurrent registr…
7c8746e 
…ation test

TronError extends Error, not Exception, so use Throwable to ensure
worker thread failures are properly captured.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@vividctrlalt vividctrlalt force-pushed the refactor/config-bean-binding branch from 66f39a2 to 19cadf7 Compare April 1, 2026 07:05
lvs0075 and others added 6 commits April 1, 2026 15:25
@lvs0075
Merge pull request tronprotocol#6447 from halibobo1205/feat/register_…
0ebf4c3 
…actuator_opt

feat(actuator): prevent duplicate registration and stabilize CI
@lvs0075
Merge pull request tronprotocol#6611 from ouy95917/implement-eip-7823
bb8b4be 
feat(vm): implement TIP-7823
@vividctrlalt
refactor(config): replace manual parsing with ConfigBeanFactory binding
dd349f3 
Replace ~850 lines of manual if/hasPath/getXxx blocks in Args.applyConfigParams()
with ConfigBeanFactory.create() automatic binding. Each config.conf domain now maps
to a typed Java bean class (VmConfig, BlockConfig, CommitteeConfig, MetricsConfig,
NodeConfig, EventConfig, StorageConfig, etc.).

- Delete ConfigKey.java (~100 string constants), config.conf is sole source of truth
- Migrate Storage.java static getters to read from StorageConfig bean
- Add unit tests for all config bean classes
- Migrate DynamicArgs to use bean binding
@vividctrlalt
refactor(config): use reference.conf as single source of defaults
d249675 
Move all default values from scattered bean field initializers into
reference.conf, making it the single source of truth for config defaults.
Expose config beans as static singletons for convenient access.

- Add comprehensive reference.conf with defaults for all config domains
- Auto-bind discovery, PBFT, and list fields in NodeConfig
- Expose config beans as static singletons (NodeConfig.getInstance() etc.)
- Move postProcess logic into bean classes
- Fix test configs (external.ip=null -> empty string)
- Document manual-read keys with reasons in reference.conf
@vividctrlalt
refactor(config): move LevelDB option reading from Storage to Storage…
1323c54 
…Config

Move default/defaultM/defaultL LevelDB option reading into StorageConfig,
so Storage no longer touches Config directly.

- Add DbOptionOverride with nullable boxed types for partial overrides
- Fix cacheSize type from int to long to match LevelDB Options API
- Remove dead externalIp(Config) bridge method
- Remove setIfNeeded and Config field from Storage
@vividctrlalt
fix(config): handle null config values and SonarCloud issues
4d8d9b9 
- Replace null values (discovery.external.ip, trustNode) with empty
  string before ConfigBeanFactory binding for external config compat
  (system-test uses "external.ip = null" which ConfigBeanFactory cannot
  bind to String fields; recommend updating system-test to use "" instead)
- Fix floating point comparison with Double.compare (java:S1244)
- Extract duplicated string literals into constants/variables (java:S1192)
@vividctrlalt vividctrlalt force-pushed the refactor/config-bean-binding branch from eb841d0 to 4d8d9b9 Compare April 1, 2026 08:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@vividctrlalt @ouy95917 @operagxsasha @lvs0075 @halibobo1205