mirror of
https://github.com/cypherstack/stack_wallet.git
synced 2025-01-09 20:29:57 +00:00
fix: eth rescan (and optimise eth txn refreshing)
This commit is contained in:
parent
aac6c0fdb6
commit
968bf390f4
2 changed files with 60 additions and 18 deletions
|
@ -265,17 +265,23 @@ class EthereumWallet extends CoinServiceAPI with WalletCache, WalletDB {
|
||||||
@override
|
@override
|
||||||
Future<FeeObject> get fees => EthereumAPI.getFees();
|
Future<FeeObject> get fees => EthereumAPI.getFees();
|
||||||
|
|
||||||
//Full rescan is not needed for ETH since we have a balance
|
|
||||||
@override
|
@override
|
||||||
Future<void> fullRescan(
|
Future<void> fullRescan(
|
||||||
int maxUnusedAddressGap, int maxNumberOfIndexesToCheck) {
|
int maxUnusedAddressGap,
|
||||||
// TODO: implement fullRescan
|
int maxNumberOfIndexesToCheck,
|
||||||
throw UnimplementedError();
|
) async {
|
||||||
|
await db.deleteWalletBlockchainData(walletId);
|
||||||
|
await _generateAndSaveAddress(
|
||||||
|
(await mnemonicString)!,
|
||||||
|
(await mnemonicPassphrase)!,
|
||||||
|
);
|
||||||
|
await updateBalance();
|
||||||
|
await _refreshTransactions(isRescan: true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<bool> generateNewAddress() {
|
Future<bool> generateNewAddress() {
|
||||||
// TODO: implement generateNewAddress - might not be needed for ETH
|
// not used for ETH
|
||||||
throw UnimplementedError();
|
throw UnimplementedError();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -291,10 +297,10 @@ class EthereumWallet extends CoinServiceAPI with WalletCache, WalletDB {
|
||||||
level: LogLevel.Info,
|
level: LogLevel.Info,
|
||||||
);
|
);
|
||||||
|
|
||||||
//First get mnemonic so we can initialize credentials
|
await _initCredentials(
|
||||||
String privateKey =
|
(await mnemonicString)!,
|
||||||
getPrivateKey((await mnemonicString)!, (await mnemonicPassphrase)!);
|
(await mnemonicPassphrase)!,
|
||||||
_credentials = web3.EthPrivateKey.fromHex(privateKey);
|
);
|
||||||
|
|
||||||
if (getCachedId() == null) {
|
if (getCachedId() == null) {
|
||||||
throw Exception(
|
throw Exception(
|
||||||
|
@ -367,8 +373,24 @@ class EthereumWallet extends CoinServiceAPI with WalletCache, WalletDB {
|
||||||
value: "",
|
value: "",
|
||||||
);
|
);
|
||||||
|
|
||||||
String privateKey = getPrivateKey(mnemonic, "");
|
await _generateAndSaveAddress(mnemonic, "");
|
||||||
|
|
||||||
|
Logging.instance.log("_generateNewWalletFinished", level: LogLevel.Info);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _initCredentials(
|
||||||
|
String mnemonic,
|
||||||
|
String mnemonicPassphrase,
|
||||||
|
) async {
|
||||||
|
String privateKey = getPrivateKey(mnemonic, mnemonicPassphrase);
|
||||||
_credentials = web3.EthPrivateKey.fromHex(privateKey);
|
_credentials = web3.EthPrivateKey.fromHex(privateKey);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _generateAndSaveAddress(
|
||||||
|
String mnemonic,
|
||||||
|
String mnemonicPassphrase,
|
||||||
|
) async {
|
||||||
|
await _initCredentials(mnemonic, mnemonicPassphrase);
|
||||||
|
|
||||||
final address = Address(
|
final address = Address(
|
||||||
walletId: walletId,
|
walletId: walletId,
|
||||||
|
@ -381,8 +403,6 @@ class EthereumWallet extends CoinServiceAPI with WalletCache, WalletDB {
|
||||||
);
|
);
|
||||||
|
|
||||||
await db.putAddress(address);
|
await db.putAddress(address);
|
||||||
|
|
||||||
Logging.instance.log("_generateNewWalletFinished", level: LogLevel.Info);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool _isConnected = false;
|
bool _isConnected = false;
|
||||||
|
@ -649,7 +669,7 @@ class EthereumWallet extends CoinServiceAPI with WalletCache, WalletDB {
|
||||||
if (!needsRefresh) {
|
if (!needsRefresh) {
|
||||||
var allOwnAddresses = await _fetchAllOwnAddresses();
|
var allOwnAddresses = await _fetchAllOwnAddresses();
|
||||||
final response = await EthereumAPI.getEthTransactions(
|
final response = await EthereumAPI.getEthTransactions(
|
||||||
allOwnAddresses.elementAt(0).value,
|
address: allOwnAddresses.elementAt(0).value,
|
||||||
);
|
);
|
||||||
if (response.value != null) {
|
if (response.value != null) {
|
||||||
final allTxs = response.value!;
|
final allTxs = response.value!;
|
||||||
|
@ -985,10 +1005,25 @@ class EthereumWallet extends CoinServiceAPI with WalletCache, WalletDB {
|
||||||
return isValidEthereumAddress(address);
|
return isValidEthereumAddress(address);
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _refreshTransactions() async {
|
Future<void> _refreshTransactions({bool isRescan = false}) async {
|
||||||
String thisAddress = await currentReceivingAddress;
|
String thisAddress = await currentReceivingAddress;
|
||||||
|
|
||||||
final response = await EthereumAPI.getEthTransactions(thisAddress);
|
int firstBlock = 0;
|
||||||
|
|
||||||
|
if (!isRescan) {
|
||||||
|
firstBlock =
|
||||||
|
await db.getTransactions(walletId).heightProperty().max() ?? 0;
|
||||||
|
|
||||||
|
if (firstBlock > 10) {
|
||||||
|
// add some buffer
|
||||||
|
firstBlock -= 10;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final response = await EthereumAPI.getEthTransactions(
|
||||||
|
address: thisAddress,
|
||||||
|
firstBlock: isRescan ? 0 : firstBlock,
|
||||||
|
);
|
||||||
|
|
||||||
if (response.value == null) {
|
if (response.value == null) {
|
||||||
Logging.instance.log(
|
Logging.instance.log(
|
||||||
|
@ -999,6 +1034,11 @@ class EthereumWallet extends CoinServiceAPI with WalletCache, WalletDB {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (response.value!.isEmpty) {
|
||||||
|
// no new transactions found
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
final txsResponse =
|
final txsResponse =
|
||||||
await EthereumAPI.getEthTransactionNonces(response.value!);
|
await EthereumAPI.getEthTransactionNonces(response.value!);
|
||||||
|
|
||||||
|
|
|
@ -47,12 +47,14 @@ class EthereumResponse<T> {
|
||||||
abstract class EthereumAPI {
|
abstract class EthereumAPI {
|
||||||
static String get stackBaseServer => DefaultNodes.ethereum.host;
|
static String get stackBaseServer => DefaultNodes.ethereum.host;
|
||||||
|
|
||||||
static Future<EthereumResponse<List<EthTxDTO>>> getEthTransactions(
|
static Future<EthereumResponse<List<EthTxDTO>>> getEthTransactions({
|
||||||
String address) async {
|
required String address,
|
||||||
|
int firstBlock = 0,
|
||||||
|
}) async {
|
||||||
try {
|
try {
|
||||||
final response = await get(
|
final response = await get(
|
||||||
Uri.parse(
|
Uri.parse(
|
||||||
"$stackBaseServer/export?addrs=$address",
|
"$stackBaseServer/export?addrs=$address&firstBlock=$firstBlock",
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue