-
Notifications
You must be signed in to change notification settings - Fork 641
Refactor/Move init DB to DI #8997
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
77fa2f9 to
a00c0ca
Compare
|
|
||
| public void AddDb(string name, IDbMeta dbMeta) | ||
| { | ||
| _createdDbs.TryAdd(name, dbMeta); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can this mean the db gets lost; as you add but fail because it already exists; however return one passed in?
Should it be GetOrAdd?
Does the one not added need to be disposed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we have duplicated name then we have a bigger problem.
Disposal is handled by the container automatically.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we do something if adding fail? Dispose? throw error? log error at least?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR refactors database initialization by moving it into a dependency injection (DI) container. The main changes include removing the StandardDbInitializer class, converting DbProvider to use the DI container as a proxy, and implementing full pruning database functionality through override of state db's IDb rather than special code elsewhere.
- Move database initialization from
StandardDbInitializerto a newDbModulein DI - Replace
DbProviderwith a container-proxy implementation - Implement full pruning database through state db override in
WorldStateModule
Reviewed Changes
Copilot reviewed 59 out of 59 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| Nethermind.Init/Modules/DbModule.cs | New module that handles database initialization and registration in DI container |
| Nethermind.Db/DbProvider.cs | Simplified to act as proxy to DI container instead of managing databases directly |
| Nethermind.Db/StandardDbInitializer.cs | Removed - functionality moved to DbModule |
| Nethermind.Init/Modules/WorldStateModule.cs | Added special state db configuration with full pruning support |
| Nethermind.JsonRpc.TraceStore/TraceStorePlugin.cs | Updated to use new DI-based database registration |
src/Nethermind/Nethermind.Init/Modules/ContainerBuilderExtensions.cs
Outdated
Show resolved
Hide resolved
src/Nethermind/Nethermind.JsonRpc.TraceStore/TraceStorePruner.cs
Outdated
Show resolved
Hide resolved
| namespace Nethermind.Init.Steps | ||
| { | ||
| [RunnerStepDependencies(typeof(ApplyMemoryHint))] | ||
| [Todo("Remove. Need to move `InitDatabaseSnapshot` to its own step also")] |
Copilot
AI
Jul 18, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] The TODO comment indicates this class should be removed but provides incomplete guidance. Consider adding more specific details about the migration plan or timeline for removal.
| [Todo("Remove. Need to move `InitDatabaseSnapshot` to its own step also")] | |
| [Todo("Remove. Plan: Move `InitDatabaseSnapshot` to its own step. Ensure all references to `InitDatabase` are updated to use the new step. Timeline: Complete by Q4 2023.")] |
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…ons.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update CLZ gas cost for devnet3 (#8953) * Update tx gas cap for devnet3 (#8954) * Don't block background tasks when syncing (#8971) * Don't block background tasks when syncing * fix test * fix compile warning * Concurrency 2 * Rename blob metrics (#8972) * Fix Taiko Engine Api (#8974) * Better null-ckecks in TryGetCanonicalTransaction (#8969) * Better null-ckecks in TryGetCanonicalTransaction * fix test * fix whitespace * fix test * Revise JSON-RPC docs generation (#8967) * Fix/OOM when downloading from genesis. (#8975) * Slight change in constructor * Stop putting more request when queue is high * Add unit test * Set budget as memory * Whitespace * Fix test * Cache PropertyInfo lookups for JsonRpc (#8976) * Auto-update fast sync settings (#8978) Co-authored-by: rubo <rubo@users.noreply.github.com> * Update OP Superchain chains (#8979) Co-authored-by: emlautarom1 <emlautarom1@users.noreply.github.com> * Remove use of Linq.Sum from hot paths (#8977) * Remove use of Linq.Sum from hot paths * Simplify * Isolate Tracer in Proof Module and remove IVisitingWorldState (#8981) * Scope the tracer * Use state reader in Tracer * Inline dump state * Remove accept * Delete IVisitingWorldState * Move dump state to state reader * Whitespace * More hot code in ConnectNodes (#8982) * Only access "warmup" hashtable once per warmup (#8983) * Only access "warm" up hashtable once per warmup * Update src/Nethermind/Nethermind.Evm/Instructions/EvmInstructions.cs Co-authored-by: Lukasz Rozmej <lukasz.rozmej@gmail.com> --------- Co-authored-by: Lukasz Rozmej <lukasz.rozmej@gmail.com> * EIP-7594: Constant maxBlobsPerTx (#8940) * Const maxBlobsPerTx * WS * Add tests(improve for the Gnosis case); add link * Fail fast on Db corruption (#8986) * Fail fast on Db corruption * Fix tests * Update src/Nethermind/Nethermind.Db.Rocks/DbOnTheRocks.cs Co-authored-by: Ruben Buniatyan <rubo@users.noreply.github.com> --------- Co-authored-by: Ruben Buniatyan <rubo@users.noreply.github.com> * Configure EWC Zurich hard fork (#8985) * feat: Add RegexOptions.Compiled flag to NewPayloadJsonRpcValidator (#8984) * Improve locking when looking up RlpDecoders (#8987) * Remove locking in RlpDecoder fast path * Feedback * Fix naming of data cost in ExecutePrecompile (#8994) fix naming of data cost * Move precompiles (#8962) * Move precompiles * Fix build * Fix formating * EthereumCodeInfoRepository * Remove EthereumPrecompiles class * Move precompiles into separate project * Fix build * Add EIP-7910: Add eth_config (#8956) * Add eth_config * Update systemContracts, refactor * Fix next/last hash to be null * Replace `eth_pairings` with `mcl` (#8992) * Unify BN254 naming (#9004) * Refactor/Move init DB to DI (#8997) * Wait to read channel before reading * Fix BN254 point deserialization (#9009) * Optimize ModExp (#9008) * Optimize ModExp * Faaster * Moar * work as nuint * use nint * cast via int * Remove unneeded casts * Move OldRuns to tests * fix benchmarks * Feedback * Less branches * Less branches * fixed invalid * Remove last orphan readonly tx processing scope. (#9005) * Fix workerloop * Replace read all with try read * Update config for tests * Update winget command (#9011) * Auto-update fast sync settings (#9013) Co-authored-by: rubo <rubo@users.noreply.github.com> * Update OP Superchain chains (#9014) Co-authored-by: emlautarom1 <emlautarom1@users.noreply.github.com> * Tidy up ecdsa overloads (#9015) * Tidy up ecdsa overloads * put back the increase * Tracing check to allow ilevm to be enabled for node and tests * Update verified * .. --------- Co-authored-by: Ben {chmark} Adams <thundercat@illyriad.co.uk> Co-authored-by: Alexey <me@flcl.me> Co-authored-by: Amirul Ashraf <asdacap@gmail.com> Co-authored-by: Lukasz Rozmej <lukasz.rozmej@gmail.com> Co-authored-by: Ruben Buniatyan <rubo@users.noreply.github.com> Co-authored-by: core-repository-dispatch-app[bot] <173070810+core-repository-dispatch-app[bot]@users.noreply.github.com> Co-authored-by: emlautarom1 <emlautarom1@users.noreply.github.com> Co-authored-by: Micke <155267459+reallesee@users.noreply.github.com> Co-authored-by: Marcin Sobczak <77129288+marcindsobczak@users.noreply.github.com> Co-authored-by: Nikita Mescheryakov <root@nikitam.io>
StandardDbInitializer.DbProviderregistration.DbProvideris now just a proxy to the container.IDb. No need for special code elsewhere.Types of changes
What types of changes does your code introduce?
Testing
Requires testing
If yes, did you write tests?
Notes on testing