From e0c12cad2feb4b5f66db13e24fe42cb47b45460f Mon Sep 17 00:00:00 2001
From: Alexey <me@flcl.me>
Date: Wed, 25 Sep 2024 17:52:57 +0300
Subject: [PATCH] Fix OP initialization order (#7487)

---
 .../Nethermind.Optimism/InitializeBlockchainOptimism.cs  | 9 ++++-----
 src/Nethermind/Nethermind.Optimism/OptimismPlugin.cs     | 1 +
 .../Nethermind.Optimism/Rpc/IOptimismEthRpcModule.cs     | 2 --
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Nethermind/Nethermind.Optimism/InitializeBlockchainOptimism.cs b/src/Nethermind/Nethermind.Optimism/InitializeBlockchainOptimism.cs
index e1548b52b92..fde8fc54bd9 100644
--- 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
index c9df512ebe9..241c424d7e2 100644
--- a/src/Nethermind/Nethermind.Optimism/OptimismPlugin.cs
+++ b/src/Nethermind/Nethermind.Optimism/OptimismPlugin.cs
@@ -27,6 +27,7 @@
 using Nethermind.Specs.ChainSpecStyle;
 using Nethermind.Serialization.Rlp;
 using Nethermind.Optimism.Rpc;
+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
index 6fd24f38c87..7ceb0bad4d1 100644
--- 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;