Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-11-17 09:47:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Strongly typed used serials list

Browse source
This commit is contained in:
julian 2023-05-16 13:29:48 -06:00
parent 1b92f2b36b
commit d0c53c2673
2 changed files with 48 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/electrumx_rpc/cached_electrumx.dart
View file

@ -188,16 +188,17 @@ class CachedElectrumX {
}
}
Future<List<dynamic>> getUsedCoinSerials({
Future<List<String>> getUsedCoinSerials({
required Coin coin,
int startNumber = 0,
}) async {
try {
List<dynamic>? cachedSerials = DB.instance.get<dynamic>(
final _list = DB.instance.get<dynamic>(
boxName: DB.instance.boxNameUsedSerialsCache(coin: coin),
key: "serials") as List?;
cachedSerials ??= [];
List<String> cachedSerials =
_list == null ? [] : List<String>.from(_list);
final startNumber = cachedSerials.length;
@ -211,8 +212,9 @@ class CachedElectrumX {
);
final serials = await client.getUsedCoinSerials(startNumber: startNumber);
List newSerials = [];
for (var element in (serials["serials"] as List)) {
List<String> newSerials = [];
for (final element in (serials["serials"] as List)) {
if (!isHexadecimal(element as String)) {
newSerials.add(base64ToHex(element));
} else {
@ -222,9 +224,10 @@ class CachedElectrumX {
cachedSerials.addAll(newSerials);
await DB.instance.put<dynamic>(
boxName: DB.instance.boxNameUsedSerialsCache(coin: coin),
key: "serials",
value: cachedSerials);
boxName: DB.instance.boxNameUsedSerialsCache(coin: coin),
key: "serials",
value: cachedSerials,
);
return cachedSerials;
} catch (e, s) {

71
lib/services/coins/firo/firo_wallet.dart
View file

@ -146,24 +146,23 @@ Future<void> executeNative(Map<String, dynamic> arguments) async {
} else if (function == "restore") {
final latestSetId = arguments['latestSetId'] as int;
final setDataMap = arguments['setDataMap'] as Map;
final usedSerialNumbers = arguments['usedSerialNumbers'] as List?;
final usedSerialNumbers = arguments['usedSerialNumbers'] as List<String>;
final mnemonic = arguments['mnemonic'] as String;
final mnemonicPassphrase = arguments['mnemonicPassphrase'] as String;
final coin = arguments['coin'] as Coin;
final network = arguments['network'] as NetworkType?;
if (!(usedSerialNumbers == null || network == null)) {
var restoreData = await isolateRestore(
mnemonic,
mnemonicPassphrase,
coin,
latestSetId,
setDataMap,
usedSerialNumbers,
network,
);
sendPort.send(restoreData);
return;
}
final network = arguments['network'] as NetworkType;
final restoreData = await isolateRestore(
mnemonic,
mnemonicPassphrase,
coin,
latestSetId,
setDataMap,
usedSerialNumbers,
network,
);
sendPort.send(restoreData);
return;
}
Logging.instance.log(
@ -195,7 +194,7 @@ Future<Map<String, dynamic>> isolateRestore(
Coin coin,
int _latestSetId,
Map<dynamic, dynamic> _setDataMap,
List<dynamic> _usedSerialNumbers,
List<String> _usedSerialNumbers,
NetworkType network,
) async {
List<int> jindexes = [];
@ -206,11 +205,7 @@ Future<Map<String, dynamic>> isolateRestore(
var currentIndex = 0;
try {
final usedSerialNumbers = _usedSerialNumbers;
Set<dynamic> usedSerialNumbersSet = {};
for (int ind = 0; ind < usedSerialNumbers.length; ind++) {
usedSerialNumbersSet.add(usedSerialNumbers[ind]);
}
Set<String> usedSerialNumbersSet = _usedSerialNumbers.toSet();
final root = await Bip32Utils.getBip32Root(
mnemonic,
@ -223,9 +218,11 @@ Future<Map<String, dynamic>> isolateRestore(
chain: MINT_INDEX,
index: currentIndex,
);
final mintKeyPair =
await Bip32Utils.getBip32NodeFromRoot(root, _derivePath);
final mintTag = CreateTag(
final bip32.BIP32 mintKeyPair = await Bip32Utils.getBip32NodeFromRoot(
root,
_derivePath,
);
final String mintTag = CreateTag(
Format.uint8listToString(mintKeyPair.privateKey!),
currentIndex,
Format.uint8listToString(mintKeyPair.identifier),
@ -240,13 +237,16 @@ Future<Map<String, dynamic>> isolateRestore(
if (foundCoin.length == 4) {
lastFoundIndex = currentIndex;
if (foundCoin[2] is int) {
final amount = foundCoin[2] as int;
final serialNumber = GetSerialNumber(amount,
Format.uint8listToString(mintKeyPair.privateKey!), currentIndex,
isTestnet: coin == Coin.firoTestNet);
String publicCoin = foundCoin[0] as String;
String txId = foundCoin[3] as String;
bool isUsed = usedSerialNumbersSet.contains(serialNumber);
final int amount = foundCoin[2] as int;
final String serialNumber = GetSerialNumber(
amount,
Format.uint8listToString(mintKeyPair.privateKey!),
currentIndex,
isTestnet: coin == Coin.firoTestNet,
);
final String publicCoin = foundCoin[0] as String;
final String txId = foundCoin[3] as String;
final bool isUsed = usedSerialNumbersSet.contains(serialNumber);
final duplicateCoin = lelantusCoins.firstWhere((element) {
final coin = element.values.first;
return coin.txId == txId &&
@ -4383,8 +4383,11 @@ class FiroWallet extends CoinServiceAPI
}
}
Future<void> _restore(int latestSetId, Map<dynamic, dynamic> setDataMap,
dynamic usedSerialNumbers) async {
Future<void> _restore(
int latestSetId,
Map<dynamic, dynamic> setDataMap,
List<String> usedSerialNumbers,
) async {
final _mnemonic = await mnemonicString;
final _mnemonicPassphrase = await mnemonicPassphrase;
@ -4555,7 +4558,7 @@ class FiroWallet extends CoinServiceAPI
}
}
Future<List<dynamic>> getUsedCoinSerials() async {
Future<List<String>> getUsedCoinSerials() async {
try {
final response = await cachedElectrumXClient.getUsedCoinSerials(
coin: coin,