Mirrors
/
xmrwallet
mirror of https://github.com/m2049r/xmrwallet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix new wallet restore height (#858) 

* New wallets: set current block height as the restore height.
  Go back 4 days for estimated heights
This commit is contained in:
Kartal Kaan Bozdoğan 2022-08-05 02:09:10 +03:00 committed by GitHub
parent 807db19603
commit 0f0b9a38c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/m2049r/xmrwallet/LoginActivity.java
View File

@ -916,9 +916,9 @@ public class LoginActivity extends BaseActivity
@Override @Override
public boolean createWallet(File aFile, String password) { public boolean createWallet(File aFile, String password) {
NodeInfo currentNode = getNode(); NodeInfo currentNode = getNode();
// get it from the connected node if we have one, and go back ca. 4 days // get it from the connected node if we have one
final long restoreHeight = final long restoreHeight =
(currentNode != null) ? currentNode.getHeight() - 2000 : -1; (currentNode != null) ? currentNode.getHeight() : -1;
Wallet newWallet = WalletManager.getInstance() Wallet newWallet = WalletManager.getInstance()
.createWallet(aFile, password, MNEMONIC_LANGUAGE, restoreHeight); .createWallet(aFile, password, MNEMONIC_LANGUAGE, restoreHeight);
return checkAndCloseWallet(newWallet); return checkAndCloseWallet(newWallet);

6
app/src/main/java/com/m2049r/xmrwallet/model/WalletManager.java
View File

@ -24,6 +24,7 @@ import com.m2049r.xmrwallet.util.RestoreHeight;
import java.io.File; import java.io.File;
import java.io.FilenameFilter; import java.io.FilenameFilter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -96,8 +97,11 @@ public class WalletManager {
if (wallet.getStatus().isOk()) { if (wallet.getStatus().isOk()) {
// (Re-)Estimate restore height based on what we know // (Re-)Estimate restore height based on what we know
final long oldHeight = wallet.getRestoreHeight(); final long oldHeight = wallet.getRestoreHeight();
// Go back 4 days if we don't have a precise restore height
Calendar restoreDate = Calendar.getInstance();
restoreDate.add(Calendar.DAY_OF_MONTH, -4);
final long restoreHeight = final long restoreHeight =
(height > -1) ? height : RestoreHeight.getInstance().getHeight(new Date()); (height > -1) ? height : RestoreHeight.getInstance().getHeight(restoreDate.getTime());
wallet.setRestoreHeight(restoreHeight); wallet.setRestoreHeight(restoreHeight);
Timber.d("Changed Restore Height from %d to %d", oldHeight, wallet.getRestoreHeight()); Timber.d("Changed Restore Height from %d to %d", oldHeight, wallet.getRestoreHeight());
wallet.setPassword(password); // this rewrites the keys file (which contains the restore height) wallet.setPassword(password); // this rewrites the keys file (which contains the restore height)