Skip to content

[ETCM-987] Fix saving the best block number without adding a mapping between block number and block hash #1090

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 9, 2021
Merged

[ETCM-987] Fix saving the best block number without adding a mapping between block number and block hash #1090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/it/scala/io/iohk/ethereum/sync/util/FastSyncItSpecUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ object FastSyncItSpecUtils {
FastSync.props(
storagesInstance.storages.fastSyncStateStorage,
storagesInstance.storages.appStateStorage,
storagesInstance.storages.blockNumberMappingStorage,
bl,
blockchainReader,
blockchainWriter,
Expand Down
5 changes: 5 additions & 0 deletions src/main/scala/io/iohk/ethereum/blockchain/sync/SyncController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,6 +29,7 @@ class SyncController(
blockchainReader: BlockchainReader,
blockchainWriter: BlockchainWriter,
appStateStorage: AppStateStorage,
blockNumberMappingStorage: BlockNumberMappingStorage,
evmCodeStorage: EvmCodeStorage,
stateStorage: StateStorage,
nodeStorage: NodeStorage,
Expand Down Expand Up @@ -96,6 +98,7 @@ class SyncController(
FastSync.props(
fastSyncStateStorage,
appStateStorage,
blockNumberMappingStorage,
blockchain,
blockchainReader,
blockchainWriter,
Expand Down Expand Up @@ -151,6 +154,7 @@ object SyncController {
blockchainReader: BlockchainReader,
blockchainWriter: BlockchainWriter,
appStateStorage: AppStateStorage,
blockNumberMappingStorage: BlockNumberMappingStorage,
evmCodeStorage: EvmCodeStorage,
stateStorage: StateStorage,
nodeStorage: NodeStorage,
Expand All @@ -171,6 +175,7 @@ object SyncController {
blockchainReader,
blockchainWriter,
appStateStorage,
blockNumberMappingStorage,
evmCodeStorage,
stateStorage,
nodeStorage,
Expand Down
11 changes: 9 additions & 2 deletions src/main/scala/io/iohk/ethereum/blockchain/sync/fast/FastSync.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down Expand Up @@ -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))
}

}
}
}
Expand All @@ -1152,6 +1157,7 @@ object FastSync {
def props(
fastSyncStateStorage: FastSyncStateStorage,
appStateStorage: AppStateStorage,
blockNumberMappingStorage: BlockNumberMappingStorage,
blockchain: Blockchain,
blockchainReader: BlockchainReader,
blockchainWriter: BlockchainWriter,
Expand All @@ -1170,6 +1176,7 @@ object FastSync {
new FastSync(
fastSyncStateStorage,
appStateStorage,
blockNumberMappingStorage,
blockchain,
blockchainReader,
blockchainWriter,
Expand Down
1 change: 1 addition & 0 deletions src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,7 @@ trait SyncControllerBuilder {
blockchainReader,
blockchainWriter,
storagesInstance.storages.appStateStorage,
storagesInstance.storages.blockNumberMappingStorage,
storagesInstance.storages.evmCodeStorage,
storagesInstance.storages.stateStorage,
storagesInstance.storages.nodeStorage,
Expand Down
1 change: 1 addition & 0 deletions src/test/scala/io/iohk/ethereum/blockchain/sync/FastSyncSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions src/test/scala/io/iohk/ethereum/blockchain/sync/SyncControllerSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,7 @@ class SyncControllerSpec
blockchainReader,
blockchainWriter,
storagesInstance.storages.appStateStorage,
storagesInstance.storages.blockNumberMappingStorage,
storagesInstance.storages.evmCodeStorage,
storagesInstance.storages.stateStorage,
storagesInstance.storages.nodeStorage,
Expand Down