i1722-avoid-wallet-rescan-after-init #1723
Conversation
| @@ -297,6 +299,8 @@ class ErgoWalletServiceSpec | |||
| val pass = Random.nextString(10) | |||
| val initializedState = walletService.initWallet(walletState, settings, SecretString.create(pass), Option.empty).get._2 | |||
|
|
|||
| initializedState.getWalletHeight shouldBe 0 | |||
There was a problem hiding this comment.
@kushti this test is passing only locally, there seem to be some racing condition on CI, but we rely on the fact that freshly init wallet has waletHeight=0
There was a problem hiding this comment.
ah I see, so let's remove this condition? Now it should not be true for wallet just initialized
pragmaxim
changed the title
| @@ -265,7 +265,8 @@ class ErgoWalletActor(settings: ErgoSettings, | |||
| case ScanOnChain(newBlock) => | |||
| if (state.secretIsSet(settings.walletSettings.testMnemonic)) { // scan blocks only if wallet is initialized | |||
| val nextBlockHeight = state.expectedNextBlockHeight(newBlock.height, settings.nodeSettings.isFullBlocksPruned) | |||
| if (nextBlockHeight == newBlock.height) { | |||
| // we want to scan a block either when it is its turn or when wallet is freshly created (no need to load the past) | |||
| if (nextBlockHeight == newBlock.height || (state.walletState == WalletPhase.Created && state.getWalletHeight == 0)) { | |||
There was a problem hiding this comment.
@kushti I've been through this PR one more time, I once found this solution after many thoughts. We basically want the first block applied to chain to be the first block added to freshly created wallet (out of order in this special case). We cannot manually change the digest of the wallet as that can be done only by applying modifiers to it. So this is the best place to do that.
| @@ -267,7 +267,9 @@ class ErgoWalletActor(settings: ErgoSettings, | |||
| case ScanOnChain(newBlock) => | |||
| if (state.secretIsSet(settings.walletSettings.testMnemonic)) { // scan blocks only if wallet is initialized | |||
| val nextBlockHeight = state.expectedNextBlockHeight(newBlock.height, settings.nodeSettings.isFullBlocksPruned) | |||
| if (nextBlockHeight == newBlock.height) { | |||
| // we want to scan a block either when it is its turn or when wallet is freshly created (no need to load the past) | |||
| val walletFreshlyCreated = state.walletPhase == WalletPhase.Created && state.getWalletHeight == 0 | |||
There was a problem hiding this comment.
If I remember correctly, only state.getWalletHeight == 0 is not enough as restored wallet has also state.getWalletHeight == 0, that's why the WalletPhase introduction
…d-wallet-rescan-after-init
| @@ -563,6 +564,7 @@ class ErgoWalletServiceImpl(override val ergoSettings: ErgoSettings) extends Erg | |||
| block, | |||
| state.outputsFilter, | |||
| dustLimit, | |||
| state.walletPhase == WalletPhase.Created, | |||
There was a problem hiding this comment.
The scanBlockTransactions method takes walletCreated: Boolean parameter as there is check inside that requires information whether it was restored or created ...
There was a problem hiding this comment.
I could pass WalletPhase argument and it would be probably more readable ... gimme an hour
| @@ -252,7 +252,7 @@ class WalletRegistry(store: LDBVersionedStore)(ws: WalletSettings) extends Score | |||
|
|
|||
| // and update wallet digest | |||
| updateDigest(bag3) { case WalletDigest(height, wBalance, wTokensSeq) => | |||
| if (height + 1 != blockHeight) { | |||
| if (height + 1 != blockHeight && !walletCreated) { | |||
| log.error(s"Blocks were skipped during wallet scanning, from $height until $blockHeight") | |||
There was a problem hiding this comment.
This is the only reason why the walletPhase is being propagated down the WalletRegistry and WalletScanLogic, so if we want to preserve this check, I have to do it ...
Closes #1722
Introduction of
WalletPhaseinto state is necessary, I reverted a few alternative approaches but in the end I think that it must be decided incase ScanOnChain(newBlock)whether to rescan or not and for that we needWalletPhaseinformation kept in state.