Fix OP initialization order (#7487)

NethermindEth · Sep 25, 2024 · a93a747 · a93a747
1 parent 76642cc
commit a93a747
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/Nethermind/Nethermind.Optimism/InitializeBlockchainOptimism.cs b/src/Nethermind/Nethermind.Optimism/InitializeBlockchainOptimism.cs
@@ -15,7 +15,6 @@
 using Nethermind.Evm;
 using Nethermind.Evm.TransactionProcessing;
 using Nethermind.Init.Steps;
-using Nethermind.Logging;
 using Nethermind.Merge.Plugin.InvalidChainTracker;
 
 namespace Nethermind.Optimism;
@@ -24,14 +23,14 @@ public class InitializeBlockchainOptimism(OptimismNethermindApi api) : Initializ
 {
     private readonly IBlocksConfig _blocksConfig = api.Config<IBlocksConfig>();
 
-    protected override Task InitBlockchain()
+    protected override async Task InitBlockchain()
     {
-        api.RegisterTxType(TxType.DepositTx, new OptimismTxDecoder<Transaction>(), Always.Valid);
-
         api.SpecHelper = new(api.ChainSpec.Optimism);
         api.L1CostHelper = new(api.SpecHelper, api.ChainSpec.Optimism.L1BlockAddress);
 
-        return base.InitBlockchain();
+        await base.InitBlockchain();
+
+        api.RegisterTxType(TxType.DepositTx, new OptimismTxDecoder<Transaction>(), Always.Valid);
     }
 
     protected override ITransactionProcessor CreateTransactionProcessor(CodeInfoRepository codeInfoRepository, VirtualMachine virtualMachine)

diff --git a/src/Nethermind/Nethermind.Optimism/OptimismPlugin.cs b/src/Nethermind/Nethermind.Optimism/OptimismPlugin.cs
@@ -27,8 +27,6 @@
 using Nethermind.Specs.ChainSpecStyle;
 using Nethermind.Serialization.Rlp;
 using Nethermind.Optimism.Rpc;
-using Nethermind.Core;
-using Nethermind.JsonRpc.Modules.Eth;
 using Nethermind.Merge.Plugin.handlers;
 
 namespace Nethermind.Optimism;

diff --git a/src/Nethermind/Nethermind.Optimism/Rpc/IOptimismEthRpcModule.cs b/src/Nethermind/Nethermind.Optimism/Rpc/IOptimismEthRpcModule.cs
@@ -7,8 +7,6 @@
 using Nethermind.JsonRpc;
 using Nethermind.Blockchain.Find;
 using Nethermind.Int256;
-using System.Threading.Tasks;
-using Nethermind.Facade.Eth;
 
 namespace Nethermind.Optimism.Rpc;