[ETCM-987] Fix saving the best block number without adding a mapping …

…between block number and block hash (#1090)
input-output-hk · Aug 9, 2021 · 1553ff5 · 1553ff5
1 parent 1df5b99
commit 1553ff5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 2 deletions.
diff --git a/src/it/scala/io/iohk/ethereum/sync/util/FastSyncItSpecUtils.scala b/src/it/scala/io/iohk/ethereum/sync/util/FastSyncItSpecUtils.scala
@@ -34,6 +34,7 @@ object FastSyncItSpecUtils {
       FastSync.props(
         storagesInstance.storages.fastSyncStateStorage,
         storagesInstance.storages.appStateStorage,
+        storagesInstance.storages.blockNumberMappingStorage,
         bl,
         blockchainReader,
         blockchainWriter,

diff --git a/src/main/scala/io/iohk/ethereum/blockchain/sync/SyncController.scala b/src/main/scala/io/iohk/ethereum/blockchain/sync/SyncController.scala
@@ -12,6 +12,7 @@ import io.iohk.ethereum.blockchain.sync.regular.RegularSync
 import io.iohk.ethereum.consensus.Consensus
 import io.iohk.ethereum.consensus.validators.Validators
 import io.iohk.ethereum.db.storage.AppStateStorage
+import io.iohk.ethereum.db.storage.BlockNumberMappingStorage
 import io.iohk.ethereum.db.storage.EvmCodeStorage
 import io.iohk.ethereum.db.storage.FastSyncStateStorage
 import io.iohk.ethereum.db.storage.NodeStorage
@@ -28,6 +29,7 @@ class SyncController(
     blockchainReader: BlockchainReader,
     blockchainWriter: BlockchainWriter,
     appStateStorage: AppStateStorage,
+    blockNumberMappingStorage: BlockNumberMappingStorage,
     evmCodeStorage: EvmCodeStorage,
     stateStorage: StateStorage,
     nodeStorage: NodeStorage,
@@ -96,6 +98,7 @@ class SyncController(
       FastSync.props(
         fastSyncStateStorage,
         appStateStorage,
+        blockNumberMappingStorage,
         blockchain,
         blockchainReader,
         blockchainWriter,
@@ -151,6 +154,7 @@ object SyncController {
       blockchainReader: BlockchainReader,
       blockchainWriter: BlockchainWriter,
       appStateStorage: AppStateStorage,
+      blockNumberMappingStorage: BlockNumberMappingStorage,
       evmCodeStorage: EvmCodeStorage,
       stateStorage: StateStorage,
       nodeStorage: NodeStorage,
@@ -171,6 +175,7 @@ object SyncController {
         blockchainReader,
         blockchainWriter,
         appStateStorage,
+        blockNumberMappingStorage,
         evmCodeStorage,
         stateStorage,
         nodeStorage,

diff --git a/src/main/scala/io/iohk/ethereum/blockchain/sync/fast/FastSync.scala b/src/main/scala/io/iohk/ethereum/blockchain/sync/fast/FastSync.scala
@@ -35,6 +35,7 @@ import io.iohk.ethereum.blockchain.sync.fast.SyncStateSchedulerActor.StateSyncFi
 import io.iohk.ethereum.blockchain.sync.fast.SyncStateSchedulerActor.WaitingForNewTargetBlock
 import io.iohk.ethereum.consensus.validators.Validators
 import io.iohk.ethereum.db.storage.AppStateStorage
+import io.iohk.ethereum.db.storage.BlockNumberMappingStorage
 import io.iohk.ethereum.db.storage.EvmCodeStorage
 import io.iohk.ethereum.db.storage.FastSyncStateStorage
 import io.iohk.ethereum.db.storage.NodeStorage
@@ -54,6 +55,7 @@ import io.iohk.ethereum.utils.Config.SyncConfig
 class FastSync(
     val fastSyncStateStorage: FastSyncStateStorage,
     val appStateStorage: AppStateStorage,
+    val blockNumberMappingStorage: BlockNumberMappingStorage,
     val blockchain: Blockchain,
     val blockchainReader: BlockchainReader,
     blockchainWriter: BlockchainWriter,
@@ -1137,11 +1139,14 @@ class FastSync(
         val lastStoredBestBlockNumber = appStateStorage.getBestBlockNumber()
         if (lastStoredBestBlockNumber < bestReceivedBlock.number) {
           blockchain.saveBestKnownBlocks(bestReceivedBlock.number)
-          appStateStorage.putBestBlockNumber(bestReceivedBlock.number).commit()
+          // TODO ETCM-1089 move direct calls to storages to blockchain or blockchain writer
+          appStateStorage
+            .putBestBlockNumber(bestReceivedBlock.number)
+            .and(blockNumberMappingStorage.put(bestReceivedBlock.number, bestReceivedBlock.hash))
+            .commit()
         }
         syncState = syncState.copy(lastFullBlockNumber = bestReceivedBlock.number.max(lastStoredBestBlockNumber))
       }
-
     }
   }
 }
@@ -1152,6 +1157,7 @@ object FastSync {
   def props(
       fastSyncStateStorage: FastSyncStateStorage,
       appStateStorage: AppStateStorage,
+      blockNumberMappingStorage: BlockNumberMappingStorage,
       blockchain: Blockchain,
       blockchainReader: BlockchainReader,
       blockchainWriter: BlockchainWriter,
@@ -1170,6 +1176,7 @@ object FastSync {
       new FastSync(
         fastSyncStateStorage,
         appStateStorage,
+        blockNumberMappingStorage,
         blockchain,
         blockchainReader,
         blockchainWriter,

diff --git a/src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala b/src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala
@@ -756,6 +756,7 @@ trait SyncControllerBuilder {
       blockchainReader,
       blockchainWriter,
       storagesInstance.storages.appStateStorage,
+      storagesInstance.storages.blockNumberMappingStorage,
       storagesInstance.storages.evmCodeStorage,
       storagesInstance.storages.stateStorage,
       storagesInstance.storages.nodeStorage,

diff --git a/src/test/scala/io/iohk/ethereum/blockchain/sync/FastSyncSpec.scala b/src/test/scala/io/iohk/ethereum/blockchain/sync/FastSyncSpec.scala
@@ -78,6 +78,7 @@ class FastSyncSpec
       FastSync.props(
         fastSyncStateStorage = storagesInstance.storages.fastSyncStateStorage,
         appStateStorage = storagesInstance.storages.appStateStorage,
+        blockNumberMappingStorage = storagesInstance.storages.blockNumberMappingStorage,
         blockchain = blockchain,
         blockchainReader = blockchainReader,
         blockchainWriter = blockchainWriter,

diff --git a/src/test/scala/io/iohk/ethereum/blockchain/sync/SyncControllerSpec.scala b/src/test/scala/io/iohk/ethereum/blockchain/sync/SyncControllerSpec.scala
@@ -552,6 +552,7 @@ class SyncControllerSpec
           blockchainReader,
           blockchainWriter,
           storagesInstance.storages.appStateStorage,
+          storagesInstance.storages.blockNumberMappingStorage,
           storagesInstance.storages.evmCodeStorage,
           storagesInstance.storages.stateStorage,
           storagesInstance.storages.nodeStorage,