refactor for verkle transition #7373

tanishqjasoria · 2024-08-29T11:28:49Z

Fixes Closes Resolves #

Please choose one of the keywords above to refer to the issue this PR solves followed by the issue number (e.g. Fixes #000). If no issue number, remove the line. Also, remove everything marked optional that is not applicable. Remove this note after reading.

Changes

List the changes

Types of changes

What types of changes does your code introduce?

Bugfix (a non-breaking change that fixes an issue)
New feature (a non-breaking change that adds functionality)
Breaking change (a change that causes existing functionality not to work as expected)
Optimization
Refactoring
Documentation update
Build-related changes
Other: Description

Testing

Requires testing

Yes
No

If yes, did you write tests?

Yes
No

Notes on testing

Optional. Remove if not applicable.

Documentation

Requires documentation update

Yes
No

If yes, link the PR to the docs update or the issue with the details labeled docs. Remove if not applicable.

Requires explanation in Release Notes

Yes
No

If yes, fill in the details here. Remove if not applicable.

Remarks

Optional. Remove if not applicable.

src/Nethermind/Nethermind.Blockchain/Contracts/CallableContract.cs

#7403)

src/Nethermind/Nethermind.AuRa.Test/AuRaBlockProducerTests.cs

src/Nethermind/Nethermind.Consensus.AuRa/AuRaSealValidator.cs

src/Nethermind/Nethermind.Consensus.AuRa/AuRaBlockProcessor.cs

src/Nethermind/Nethermind.Consensus.AuRa/Validators/ReportingContractBasedValidator.cs

src/Nethermind/Nethermind.Consensus.Clique/CliquePlugin.cs

src/Nethermind/Nethermind.JsonRpc/Modules/Proof/ProofModuleFactory.cs

src/Nethermind/Nethermind.JsonRpc/Modules/Trace/TraceModuleFactory.cs

src/Nethermind/Nethermind.Merge.AuRa/AuRaMergeBlockProcessor.cs

src/Nethermind/Nethermind.Merge.AuRa/AuRaMergeBlockProducerEnvFactory.cs

src/Nethermind/Nethermind.Optimism/Rpc/OptimismEthRpcModule.cs

…s not require WorldStateManager

…Head.StateRoot

# Conflicts: # src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs # src/Nethermind/Nethermind.AuRa.Test/AuraBlockProcessorTests.cs # src/Nethermind/Nethermind.Blockchain.Test/Producers/DevBlockproducerTests.cs # src/Nethermind/Nethermind.Blockchain.Test/ReorgTests.cs # src/Nethermind/Nethermind.Blockchain/GenesisLoader.cs # src/Nethermind/Nethermind.Clique.Test/CliqueBlockProducerTests.cs # src/Nethermind/Nethermind.Consensus.AuRa/AuRaBlockProcessor.cs # src/Nethermind/Nethermind.Consensus.Clique/CliquePlugin.cs # src/Nethermind/Nethermind.Consensus.Ethash/NethDevPlugin.cs # src/Nethermind/Nethermind.Consensus/Processing/BlockProcessor.BlockProductionTransactionsExecutor.cs # src/Nethermind/Nethermind.Consensus/Processing/BlockProcessor.cs # src/Nethermind/Nethermind.Consensus/Processing/IBlockProcessor.cs # src/Nethermind/Nethermind.Consensus/Processing/ReadOnlyChainProcessingEnv.cs # src/Nethermind/Nethermind.Consensus/Processing/ReadOnlyTxProcessingEnv.cs # src/Nethermind/Nethermind.Consensus/Producers/BlockProducerEnvFactory.cs # src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs # src/Nethermind/Nethermind.Evm/TransactionProcessing/CallAndRestoreTransactionProcessorAdapter.cs # src/Nethermind/Nethermind.Evm/TransactionProcessing/ExecuteTransactionProcessorAdapter.cs # src/Nethermind/Nethermind.Evm/TransactionProcessing/TraceTransactionProcessorAdapter.cs # src/Nethermind/Nethermind.Evm/TransactionProcessing/TransactionProcessor.cs # src/Nethermind/Nethermind.Facade/Simulate/SimulateReadOnlyBlocksProcessingEnv.cs # src/Nethermind/Nethermind.Facade/Simulate/SimulateTransactionProcessor.cs # src/Nethermind/Nethermind.Init/InitializeStateDb.cs # src/Nethermind/Nethermind.Init/Steps/InitializeBlockchain.cs # src/Nethermind/Nethermind.JsonRpc.Benchmark/EthModuleBenchmarks.cs # src/Nethermind/Nethermind.JsonRpc.Test/Modules/Trace/ParityStyleTracerTests.cs # src/Nethermind/Nethermind.JsonRpc/Modules/RpcBlockTransactionsExecutor.cs # src/Nethermind/Nethermind.Merge.AuRa.Test/AuRaMergeEngineModuleTests.cs # src/Nethermind/Nethermind.Merge.AuRa/AuRaMergeBlockProcessor.cs # src/Nethermind/Nethermind.Merge.AuRa/InitializationSteps/InitializeBlockchainAuRaMerge.cs # src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.HelperFunctions.cs # src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.Setup.cs # src/Nethermind/Nethermind.Optimism/InitializeBlockchainOptimism.cs # src/Nethermind/Nethermind.Optimism/OptimismBlockProcessor.cs # src/Nethermind/Nethermind.Optimism/OptimismBlockProducerEnvFactory.cs # src/Nethermind/Nethermind.Optimism/OptimismTransactionProcessor.cs # src/Nethermind/Nethermind.Optimism/ReadOnlyChainProcessingEnv.cs # src/Nethermind/Nethermind.Synchronization.Test/SyncThreadTests.cs

# Conflicts: # src/Nethermind/Nethermind.Blockchain/BeaconBlockRoot/BeaconBlockRootHandler.cs # src/Nethermind/Nethermind.Blockchain/BeaconBlockRoot/IBeaconBlockRootHandler.cs # src/Nethermind/Nethermind.Consensus/Processing/BlockCachePreWarmer.cs # src/Nethermind/Nethermind.Consensus/Processing/BlockProcessor.cs # src/Nethermind/Nethermind.Consensus/Processing/IBlockCachePreWarmer.cs

# Conflicts: # src/Nethermind/Nethermind.Evm/TransactionProcessing/TransactionProcessor.cs

src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/StartBlockProducerAuRa.cs

tanishqjasoria · 2024-09-17T12:15:51Z

src/Nethermind/Nethermind.Consensus.AuRa/Validators/ReportingContractBasedValidator.cs

@@ -28,10 +28,10 @@ public partial class ReportingContractBasedValidator : IAuRaValidator, IReportin
        private readonly ContractBasedValidator _contractValidator;
        private readonly long _posdaoTransition;
        private readonly ITxSender _posdaoTxSender;
-        private readonly IReadOnlyStateProvider _stateProvider;


should we introduce a IReadOnlyWorldStateProvider interface, it will be the same as the old one, just act as a place holder?

tanishqjasoria · 2024-09-17T15:44:18Z

src/Nethermind/Nethermind.Optimism/OptimismBlockProducerEnvFactory.cs

@@ -72,8 +72,7 @@ protected override ITxSource CreateTxSourceForProducer(ITxSource? additionalTxSo
        return new OptimismTxPoolTxSource(baseTxSource);
    }

-    protected override BlockProcessor CreateBlockProcessor(
-        IReadOnlyTxProcessingScope readOnlyTxProcessingEnv,


tanishqjasoria · 2024-09-17T15:45:33Z

src/Nethermind/Nethermind.Optimism/ReadOnlyChainProcessingEnv.cs

    {
        return new OptimismBlockProcessor(
            specProvider,
            blockValidator,
            rewardCalculator,
            transactionsExecutor,
-            scope.WorldState,
+            worldStateProvider,


tanishqjasoria · 2024-09-17T15:46:13Z

src/Nethermind/Nethermind.Optimism/Rpc/OptimismEthRpcModule.cs

        {
-            tx.Nonce = _accountStateProvider.GetNonce(tx.SenderAddress);
+            tx.Nonce = _worldStateManager.GlobalWorldStateProvider
+                .GetGlobalStateReader().GetNonce(_blockFinder.Head.StateRoot, tx.SenderAddress);


manager.StateReader?

tanishqjasoria · 2024-09-17T15:47:06Z

src/Nethermind/Nethermind.Optimism/Rpc/OptimismTraceModuleFactory.cs

@@ -52,7 +52,7 @@ protected override ReadOnlyTxProcessingEnv CreateTxProcessingEnv() =>
                _receiptStorage,
                _specProvider,
                _blockTree,
-                _worldStateManager.GlobalStateReader,
+                _worldStateManager.GlobalWorldStateProvider,


we can keep the stateReader here

tanishqjasoria · 2024-09-17T15:47:42Z

src/Nethermind/Nethermind.State/IWorldStateManager.cs

    /// <returns></returns>
-    IWorldState CreateResettableWorldState(IWorldState? forWarmup = null);
+    IWorldStateProvider CreateResettableWorldStateProvider();


IWorldStateProvider to warmup?

tanishqjasoria · 2024-09-17T16:41:15Z

src/Nethermind/Nethermind.JsonRpc.Test/Modules/TraceRpcModuleTests.cs

                Blockchain.LogManager,
                transactionsExecutor);

            ReadOnlyChainProcessingEnv traceProcessingEnv = CreateChainProcessingEnv(rpcBlockTransactionsExecutor);
            ReadOnlyChainProcessingEnv executeProcessingEnv = CreateChainProcessingEnv(executeBlockTransactionsExecutor);

-            Tracer tracer = new(scope.WorldState, traceProcessingEnv.ChainProcessor, executeProcessingEnv.ChainProcessor);
-            TraceRpcModule = new TraceRpcModule(receiptFinder, tracer, Blockchain.BlockFinder, JsonRpcConfig, txProcessingEnv.StateReader);


bring back state reader

asdacap · 2024-10-07T10:59:51Z

src/Nethermind/Nethermind.Evm/TransactionProcessing/IReadOnlyTxProcessingScope.cs

@@ -9,5 +9,5 @@ namespace Nethermind.Evm.TransactionProcessing;
 public interface IReadOnlyTxProcessingScope : IDisposable
 {
    ITransactionProcessor TransactionProcessor { get; }
-    IWorldState WorldState { get; }


Hmm... yea. This is a problem as the whole point of the scope is to represent a single IWorldState. So making it a WorldStateProvider changes that. So it probably should be called IReadOnlyTxProcessingEnv now.

tanishqjasoria added 13 commits August 15, 2024 19:30

pass in world state where there in no context which worldState to use

d81ce27

small fix

7ab5a61

make the param nullable

7182df9

small clean up

6b59a36

another intermediate commit

0413c61

fix ethereum tests

cda75a1

fix benchmarks

7da6687

fix whitespace

fe3d85a

small refactor

fce32a4

fix build

ef1552f

temp fixes for the readonly env

55721d0

refactor blockhash provider

dd688f7

temp fix for a problem

3ce3379

yerke26 reviewed Aug 30, 2024

View reviewed changes

src/Nethermind/Nethermind.Blockchain/Contracts/CallableContract.cs Outdated Show resolved Hide resolved

yerke26 and others added 3 commits September 11, 2024 03:32

Created one more abstraction between WorldStateManager and WorldState… (

a4424b4

#7403)

add InitializeNetwork to HealingWorldStateManager

a51278c

remove unnecessary todos

7fae83f

tanishqjasoria commented Sep 11, 2024

View reviewed changes

yerke26 and others added 12 commits September 12, 2024 14:19

change WorldStateManager to WorldStateProvider in the places that doe…

9195012

…s not require WorldStateManager

remove async Setup in ParityStyleTracerTests

6259db5

change WorldStateManager to WorldStateProvider

da32531

add HasStateRoot, RunTreeVisitor functions to WorldStateProvider

a7f11bf

remove unnecesssary cast

9279e92

Merge remote-tracking branch 'origin/verkle/refac' into verkle/refac

fe13b1f

change WorldStateProvider to ReadOnly in the required places

bace231

fix OptimismEthRpcModule setNonce using StateReader and _blockFinder.…

f67d045

…Head.StateRoot

Get StateReader from NethermindApi

bcc96bc

resolve merge conflicts

3f8dc9d

fix Benchmarks compilation error

ecc227d

yerke26 added 14 commits September 15, 2024 03:32

remove WorldState from TransactionProcessor

181be5c

resolve merge conflicts

6e498db

fix tests

8e77aaa

fix TransactionProcessor

3317cd6

fix AuRaBlockProducerTests

7f35d88

fix whitespaces

63418da

Bring back IReadOnlyTxProcessingScope, fix Build function

b3abb2b

Bring back scope

7960f77

bring back scope

544cb16

bring back scope

f57d7c3

remove passing WorldState from ReportingContractBasedValidator

f5e5f08

Merge branch 'master' into verkle/refac

cefaa70

# Conflicts: # src/Nethermind/Nethermind.Evm/TransactionProcessing/TransactionProcessor.cs

fix whitespaces

538a920

tanishqjasoria commented Sep 17, 2024

View reviewed changes

tanishqjasoria added 4 commits September 17, 2024 16:58

bring back scope

8a2d344

use init db provider

cd1153d

fix issues

3e1c00d

bring back scope

a24113c

tanishqjasoria commented Sep 17, 2024

View reviewed changes

tanishqjasoria added 2 commits September 17, 2024 17:41

scope

8b9dd94

Merge branch 'master' into verkle/refac

9fad607

tanishqjasoria force-pushed the verkle/refac branch from 1d52b72 to 9fad607 Compare September 18, 2024 15:49

asdacap reviewed Oct 7, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor for verkle transition #7373

refactor for verkle transition #7373

tanishqjasoria commented Aug 29, 2024

tanishqjasoria Sep 17, 2024

tanishqjasoria Sep 17, 2024

tanishqjasoria Sep 17, 2024

tanishqjasoria Sep 17, 2024

tanishqjasoria Sep 17, 2024

tanishqjasoria Sep 17, 2024

tanishqjasoria Sep 17, 2024

asdacap Oct 7, 2024

refactor for verkle transition #7373

Are you sure you want to change the base?

refactor for verkle transition #7373

Conversation

tanishqjasoria commented Aug 29, 2024

Changes

Types of changes

What types of changes does your code introduce?

Testing

Requires testing

If yes, did you write tests?

Notes on testing

Documentation

Requires documentation update

Requires explanation in Release Notes

Remarks

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment